|
@@ -62,6 +62,23 @@ public class JiaoYangReportController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @GetMapping("/getTypeData")
|
|
|
+ @ApiOperation(value = "商品列表")
|
|
|
+ public JSONObject getTypeData(String orderStartDate, String orderEndDate) throws ParseException, InterruptedException {
|
|
|
+
|
|
|
+ Long start = DateUtils.strDateTimsToInt(orderStartDate);
|
|
|
+ Long end = DateUtils.strDateTimsToInt(orderEndDate);
|
|
|
+ JSONObject data = jiaoYangReportService.getTypeData(start, end);
|
|
|
+ // Thread.sleep(5000);
|
|
|
+
|
|
|
+ JSONObject json = new JSONObject();
|
|
|
+ json.put("code", 200);
|
|
|
+ json.put("msg", "更新数据成功");
|
|
|
+ json.put("success", true);
|
|
|
+ json.put("data", data);
|
|
|
+ return json;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 获取授权商品列表
|
|
|
*
|
|
@@ -606,7 +623,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
@ApiParam("商品ID") @RequestParam(value = "itemId", required = false) String itemId, Long userId) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation_manager".equals(roleId) || "jy_out_operation".equals(roleId)) {
|
|
|
+ if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation_manager".equals(roleId) || "jy_out_operation".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -658,7 +675,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
@ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate, Long userId) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
String roleId = sysRoleService.getRoleBYUserId(userId);
|
|
|
- if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
+ if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId) || "jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
List<Long> userIds = new ArrayList<>();
|
|
|
if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
@@ -783,7 +800,7 @@ public class JiaoYangReportController extends BaseController {
|
|
|
} else {
|
|
|
userIds.add(userId);
|
|
|
}
|
|
|
- promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
+ promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
|
|
|
if (Check.isNull(promoterIds)) {
|
|
|
return returnJson;
|
|
|
}
|