瀏覽代碼

分销经理角色

yumeng 1 年之前
父節點
當前提交
9e07e0ed69

+ 2 - 4
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouPromoterServiceImpl.java

@@ -134,7 +134,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
         //角色:管理员和骄阳管理员可以看到所有的达人信息
         if ("admin".equals(roleKey) || "jy_admnin".equals(roleKey)) {
             userList = null;
-        } else if ("jy_bd_manage".equals(roleKey) || "jy_scissors_manage".equals(roleKey)) {
+        } else if ("jy_bd_manage".equals(roleKey) || "jy_scissors_manage".equals(roleKey) || "jy_out_operation_manager".equals(roleKey)) {
             // 骄阳渠道经理、骄阳剪手经理 可以看到自己创建的以及自己部门人员的达人信息
             Long deptId = deptService.getDeptIdByUserId(userId);
             userList = deptService.getDeptUserListByDeptId(deptId);
@@ -244,7 +244,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
     /**
      * 新增快手达人 信息
      *
-     * @param kuaishouPromoter 快手达人 信息
+     * @param  快手达人 信息
      */
     @Override
     public JSONObject insertKuaishouPromoter(KuaishouPromoter promoter) {
@@ -256,12 +256,10 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             result.put("msg", "该数据已存在,请重新输入");
             return result;
         }
-
         //  如果 达人ID是字母 并且 媒体是快手,说明操作失误,媒体改为抖音
         if (!isNumeric(promoter.getPromoterId()) && "2".equals(promoter.getMediaId())) {
             promoter.setMediaId("1");
         }
-
 //        if ("2".equals(promoter.getMediaId())) {
         // 快手、抖音 同一达人ID 不能绑定到多个渠道角色用户上
         String roleKey = sysUserService.getRoleKeyByUserId(promoter.getUserId());

+ 20 - 45
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -450,10 +450,10 @@ public class JiaoYangReportController extends BaseController {
 
         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)) {
+        String roleId = sysRoleService.getRoleBYUserId(userId);
+        if ("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)) {
+            if ("jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -464,20 +464,7 @@ public class JiaoYangReportController extends BaseController {
                 return getDataTable(new ArrayList<JSONObject>());
             }
             requestMap.put("promoterIds", promoterIds);
-        }*/
-
-
-        String roleId = sysRoleService.getRoleBYUserId(userId);
-        if ("jy_out_operation".equals(roleId)) {
-            List<Long> userIds = new ArrayList<>();
-            userIds.add(userId);
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
-            if (Check.isNull(promoterIds)) {
-                return getDataTable(new ArrayList<JSONObject>());
-            }
-            requestMap.put("promoterIds", promoterIds);
         }
-
         if (!Check.isNull(orderStartDate)) {
             Long start = DateUtils.strDateToInt(orderStartDate);
             requestMap.put("start", start);
@@ -515,11 +502,10 @@ public class JiaoYangReportController extends BaseController {
                                @ApiParam("类型") @RequestParam(value = "type", required = false) Long type,
                                Long userId) throws IOException {
         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)) {
+        String roleId = sysRoleService.getRoleBYUserId(userId);
+        if ("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)) {
+            if ("jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -527,17 +513,6 @@ public class JiaoYangReportController extends BaseController {
             }
             List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
             if (Check.isNull(promoterIds)) {
-                return getDataTable(new ArrayList<JSONObject>());
-            }
-            requestMap.put("promoterIds", promoterIds);
-        }*/
-
-        String roleId = sysRoleService.getRoleBYUserId(userId);
-        if ("jy_out_operation".equals(roleId)) {
-            List<Long> userIds = new ArrayList<>();
-            userIds.add(userId);
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
-            if (Check.isNull(promoterIds)) {
                 return;
             }
             requestMap.put("promoterIds", promoterIds);
@@ -631,9 +606,9 @@ 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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -683,9 +658,9 @@ 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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -799,9 +774,9 @@ 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)) {
+        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> userIds = new ArrayList<>();
-            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -878,9 +853,9 @@ 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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -927,9 +902,9 @@ 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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -1092,9 +1067,9 @@ public class JiaoYangReportController extends BaseController {
             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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {
@@ -1147,9 +1122,9 @@ public class JiaoYangReportController extends BaseController {
     ) {
         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)) {
+        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)) {
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
                 Long deptId = sysDeptService.getDeptIdByUserId(userId);
                 userIds = sysDeptService.getDeptUserListByDeptId(deptId);
             } else {