|
@@ -766,7 +766,7 @@ public class SupplyChainController extends BaseController {
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
- String[] headers = {"所属人","商品ID", "商品名称", "商品封面", "佣金率","达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率","未发货数"};
|
|
|
+ String[] headers = {"所属人", "商品ID", "商品名称", "商品封面", "佣金率", "达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -1012,8 +1012,33 @@ public class SupplyChainController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @GetMapping("/userItemTotal")
|
|
|
+ @ApiOperation(value = "认领商品列表汇总")
|
|
|
+ public JSONObject userItemTotal(
|
|
|
+ @ApiParam("userId") @RequestParam(value = "userId", required = false) Long userId,
|
|
|
+ @ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
+ @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate
|
|
|
+ ) {
|
|
|
+ Map<String, Object> requestMap = new HashMap<>();
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
+ requestMap.put("userId", userId);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(orderStartDate)) {
|
|
|
+ Long start = DateUtils.getStartLongTime(orderStartDate);
|
|
|
+ requestMap.put("start", start);
|
|
|
+ }
|
|
|
+ if (!Check.isNull(orderEndDate)) {
|
|
|
+ Long end = DateUtils.getEndLongTime(orderEndDate);
|
|
|
+ requestMap.put("end", end);
|
|
|
+ }
|
|
|
+ JSONObject returnJson = supplyChainService.userItemTotal(requestMap);
|
|
|
+ return returnJson;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 商品认领汇总
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/itemBindSummary")
|