소스 검색

分销经理角色

yumeng 1 년 전
부모
커밋
d60a52729a
1개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

+ 5 - 3
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -774,7 +774,8 @@ public class JiaoYangReportController extends BaseController {
         JSONObject returnJson = new JSONObject();
 
         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".equals(roleId)) {
+        List<Long> promoterIds = new ArrayList<>();
+        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);
@@ -782,7 +783,7 @@ public class JiaoYangReportController extends BaseController {
             } else {
                 userIds.add(userId);
             }
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+             promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
             if (Check.isNull(promoterIds)) {
                 return returnJson;
             }
@@ -805,6 +806,8 @@ public class JiaoYangReportController extends BaseController {
                 Long nowDate = DateUtils.strDateToInt(orderStartDate);
                 Long yesDate = DateUtils.strDateToInt(DateUtils.getAnotherDay("yyyy-MM-dd", orderStartDate, -1)); // 昨日日期
                 Map<String, Object> ratioMap = new HashMap<>();
+
+                requestMap.put("promoterIds", promoterIds);
                 ratioMap.put("nowDate", nowDate);
 
                 ratioMap.put("yesDate", yesDate);
@@ -851,7 +854,6 @@ public class JiaoYangReportController extends BaseController {
     ) {
         Map<String, Object> requestMap = new HashMap<>();
         JSONObject returnJson = new JSONObject();
-
         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)) {
             List<Long> userIds = new ArrayList<>();