Sfoglia il codice sorgente

骄阳新增角色

yumeng 1 anno fa
parent
commit
e5e092c4cd

+ 28 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouPromoterController.java

@@ -144,6 +144,33 @@ public class KuaishouPromoterController extends BaseController {
         return getDataTable(list);
     }
 
+
+    //查询骄阳达人商务列表
+    @GetMapping("/jyExpertBusiness")
+    @ApiOperation(value = "查询骄阳达人商务列表")
+    public JSONObject jyExpertBusiness() {
+        JSONObject jsonObject = new JSONObject();
+        List<JSONObject> list = kuaishouPromoterService.jyExpertBusiness();
+        jsonObject.put("code",200);
+        jsonObject.put("success",true);
+        jsonObject.put("data",list);
+        return jsonObject;
+    }
+
+
+    //查询骄阳达人导师列表
+    @GetMapping("/jyExpertMentorList")
+    @ApiOperation(value = "查询骄阳达人导师列表")
+    public JSONObject jyExpertMentorList() {
+        JSONObject jsonObject = new JSONObject();
+        List<JSONObject> list = kuaishouPromoterService.jyExpertMentorList();
+        jsonObject.put("code",200);
+        jsonObject.put("success",true);
+        jsonObject.put("data",list);
+        return jsonObject;
+    }
+
+
     /**
      * 获取快手达人 信息详细信息
      */
@@ -275,6 +302,7 @@ public class KuaishouPromoterController extends BaseController {
         return toAjax(kuaishouPromoterService.updateKuaishouPromoter(kuaishouPromoter));
     }
 
+
     @Autowired
     ISysUserService sysUserService;
 

+ 6 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/JYKuaishouPromoter.java

@@ -200,6 +200,12 @@ public class JYKuaishouPromoter {
     @Transient
     private String ruleName;
 
+
+    private Long expertMentorId;
+    private String expertMentorName;
+    private Long expertBusinessId;
+    private String expertBusinessName;
+
     public JYKuaishouPromoter() {
     }
 

+ 7 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouPromoterMapper.java

@@ -32,7 +32,9 @@ public interface KuaishouPromoterMapper {
                                                                 @Param("promoterNickName") String promoterNickName,
                                                                 @Param("mediaId") String mediaId,
                                                                 @Param("type") String type,
-                                                                @Param("parameter") String parameter, @Param("orderBy") String orderBy);
+                                                                @Param("parameter") String parameter, @Param("orderBy") String orderBy,
+                                                                @Param("expertMentorId") Long expertMentorId, @Param("expertBusinessId") Long expertBusinessId
+    );
 
     /**
      * 新增快手达人 信息
@@ -129,6 +131,10 @@ public interface KuaishouPromoterMapper {
 
     JSONObject selectKuaishouRulePromoterById(@Param("promoterId") Long promoterId);
 
+    List<JSONObject> jyExpertMentorList();
+
+    List<JSONObject> jyExpertBusiness();
+
     List<JYKuaishouPromoter> getMiaogousiInfoFailInfo();
 
     void updateMiaogousiKuaishouPromoterByPromoterId(KuaishouPromoter kuaishouPromoter);

+ 5 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouPromoterService.java

@@ -26,7 +26,6 @@ public interface IKuaishouPromoterService {
     /**
      * 查询快手达人 信息列表
      *
-     * @param kuaishouPromoter 快手达人 信息
      * @return 快手达人 信息集合
      */
     public List<KuaishouPromoter> selectKuaishouPromoterList(Long userId, String promoterId, String promoterNickName, String mediaId, String parameter, String orderBy, Long bdUserId);
@@ -94,4 +93,9 @@ public interface IKuaishouPromoterService {
     Result deleteKuaishouPromoterById3(Long id, Long userId);
 
     JSONObject selectKuaishouRulePromoterById(Long promoterId);
+
+    List<JSONObject> jyExpertMentorList();
+
+    List<JSONObject> jyExpertBusiness();
+
 }

+ 52 - 5
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouPromoterServiceImpl.java

@@ -132,6 +132,8 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
         String roleKey = sysUserService.getRoleKeyByUserId(userId);
         List<Long> userList = new ArrayList<>();
         //角色:管理员和骄阳管理员可以看到所有的达人信息
+        Long expertMentorId = null;
+        Long expertBusinessId = null;
         if ("admin".equals(roleKey) || "jy_admnin".equals(roleKey)) {
             userList = null;
         } else if ("jy_bd_manage".equals(roleKey) || "jy_scissors_manage".equals(roleKey) || "jy_out_operation_manager".equals(roleKey)) {
@@ -141,6 +143,14 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
         } else if ("jy_bd".equals(roleKey) || "jy_scissors".equals(roleKey) || "jy_out_operation".equals(roleKey)) {
             // 骄阳渠道、骄阳-剪手 可以看到自己创建的达人信息
             userList = Arrays.asList(userId);
+        } else if ("jy_expert_mentor".equals(roleKey) || "jy_expert_business".equals(roleKey)) {
+            if ("jy_expert_mentor".equals(roleKey)) {
+                expertMentorId = userId;
+            }
+            if ("jy_expert_business".equals(roleKey)) {
+                expertBusinessId = userId;
+            }
+
         } else {
             return Collections.emptyList();
         }
@@ -163,7 +173,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             orderBy = "desc";
         }
         PageUtils.startPage();
-        List<JYKuaishouPromoter> list = kuaishouPromoterMapper.selectKuaishouPromoterList3(userList, promoterId, promoterNickName, mediaId, type, parameter, orderBy);
+        List<JYKuaishouPromoter> list = kuaishouPromoterMapper.selectKuaishouPromoterList3(userList, promoterId, promoterNickName, mediaId, type, parameter, orderBy, expertMentorId, expertBusinessId);
         list.forEach(ent -> {
             JSONObject follow = kuaishouPromoterMapper.getFollowUpRecordsByUserId(ent.getPromoterId(), ent.getUserId());
             ent.setFollowUpRecord(Check.isNull(follow) ? "-" : follow.getString("txt"));
@@ -244,7 +254,6 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
     /**
      * 新增快手达人 信息
      *
-     * @param  快手达人 信息
      */
     @Override
     public JSONObject insertKuaishouPromoter(KuaishouPromoter promoter) {
@@ -537,8 +546,21 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
         if (Check.isNotNull(sysUser)) {
             promoter.setUserName(sysUser.getNickName());
         }
+        if (!Check.isNull(promoter.getExpertBusinessId())) {
+            SysUser businessUser = sysUserService.selectUserById(promoter.getExpertBusinessId());
+            if (!Check.isNull(businessUser)) {
+                promoter.setExpertBusinessName(businessUser.getNickName());
+            }
+        }
+
+        if (!Check.isNull(promoter.getExpertMentorId())) {
+            SysUser mentorUser = sysUserService.selectUserById(promoter.getExpertMentorId());
+            if (!Check.isNull(mentorUser)) {
+                promoter.setExpertMentorName(mentorUser.getNickName());
+            }
+        }
         kuaishouPromoterMapper.insertKuaishouPromoter3(promoter);
-        editPromoter3(promoter.getId(), promoter.getMediaId(), promoter.getPromoterId(), true);
+        //    editPromoter3(promoter.getId(), promoter.getMediaId(), promoter.getPromoterId(), true);
         result.put("code", 200);
         result.put("msg", "success");
         return result;
@@ -717,8 +739,21 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
      * @return 结果
      */
     @Override
-    public int updateKuaishouPromoter3(JYKuaishouPromoter kuaishouPromoter) {
-        return kuaishouPromoterMapper.updateKuaishouPromoter3(kuaishouPromoter);
+    public int updateKuaishouPromoter3(JYKuaishouPromoter promoter) {
+
+        if (!Check.isNull(promoter.getExpertBusinessId())) {
+            SysUser businessUser = sysUserService.selectUserById(promoter.getExpertBusinessId());
+            if (!Check.isNull(businessUser)) {
+                promoter.setExpertBusinessName(businessUser.getNickName());
+            }
+        }
+        if (!Check.isNull(promoter.getExpertMentorId())) {
+            SysUser mentorUser = sysUserService.selectUserById(promoter.getExpertMentorId());
+            if (!Check.isNull(mentorUser)) {
+                promoter.setExpertMentorName(mentorUser.getNickName());
+            }
+        }
+        return kuaishouPromoterMapper.updateKuaishouPromoter3(promoter);
     }
 
     /**
@@ -786,6 +821,18 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
     }
 
     @Override
+    public List<JSONObject> jyExpertMentorList() {
+        return kuaishouPromoterMapper.jyExpertMentorList();
+    }
+
+    @Override
+    public List<JSONObject> jyExpertBusiness() {
+        return kuaishouPromoterMapper.jyExpertBusiness();
+    }
+
+
+
+    @Override
     public AjaxResult getPromoterInfo(String promoterId) {
         AjaxResult ajaxResult = null;
         try {

+ 98 - 7
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -468,6 +468,7 @@ public class JiaoYangReportController extends BaseController {
         Map<String, Object> requestMap = new HashMap<>();
 
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        List<Long> promoterIds = new ArrayList<>();
         if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
             List<Long> userIds = new ArrayList<>();
             if ("jy_out_operation_manager".equals(roleId)) {
@@ -476,7 +477,18 @@ public class JiaoYangReportController extends BaseController {
             } else {
                 userIds.add(userId);
             }
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            if (Check.isNull(promoterIds)) {
+                return getDataTable(new ArrayList<JSONObject>());
+            }
+            requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
             if (Check.isNull(promoterIds)) {
                 return getDataTable(new ArrayList<JSONObject>());
             }
@@ -520,6 +532,7 @@ public class JiaoYangReportController extends BaseController {
                                Long userId) throws IOException {
         Map<String, Object> requestMap = new HashMap<>();
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        List<Long> promoterIds = new ArrayList<>();
         if ("jy_out_operation".equals(roleId) || "jy_out_operation_manager".equals(roleId)) {
             List<Long> userIds = new ArrayList<>();
             if ("jy_out_operation_manager".equals(roleId)) {
@@ -528,7 +541,18 @@ public class JiaoYangReportController extends BaseController {
             } else {
                 userIds.add(userId);
             }
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            if (Check.isNull(promoterIds)) {
+                return;
+            }
+            requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
             if (Check.isNull(promoterIds)) {
                 return;
             }
@@ -584,10 +608,12 @@ public class JiaoYangReportController extends BaseController {
                     export.add(0);
                 }
                 export.add(data.getString("userName"));
+                export.add(data.getString("expertMentorName"));
+                export.add(data.getString("expertBusinessName"));
                 exportList.add(export);
             }
         }
-        String[] headers = {"达人ID", "达人名称", "订单数", "有效单数", "有效率", "付款金额", "有效付款金额", "发货数", "未发货数", "发货率", "绑定人"};
+        String[] headers = {"达人ID", "达人名称", "订单数", "有效单数", "有效率", "付款金额", "有效付款金额", "发货数", "未发货数", "发货率", "绑定人", "导师", "商务"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -805,7 +831,21 @@ public class JiaoYangReportController extends BaseController {
                 return returnJson;
             }
             requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
+            if (Check.isNull(promoterIds)) {
+                return returnJson;
+            }
+            requestMap.put("promoterIds", promoterIds);
+
         }
+
+
         if (dateType == 0) {
             if (!Check.isNull(orderStartDate)) {
                 Long start = DateUtils.strDateToInt(orderStartDate); //当天开始时间
@@ -872,6 +912,7 @@ public class JiaoYangReportController extends BaseController {
         Map<String, Object> requestMap = new HashMap<>();
         JSONObject returnJson = new JSONObject();
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        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)) {
@@ -880,7 +921,19 @@ 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;
+            }
+            requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
             if (Check.isNull(promoterIds)) {
                 return returnJson;
             }
@@ -921,6 +974,7 @@ public class JiaoYangReportController extends BaseController {
         JSONObject returnJson = new JSONObject();
 
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        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)) {
@@ -929,11 +983,23 @@ 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;
             }
             requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
+            if (Check.isNull(promoterIds)) {
+                return returnJson;
+            }
+            requestMap.put("promoterIds", promoterIds);
+
         }
         if (dateType == 0) {
             if (!Check.isNull(orderStartDate)) {
@@ -1086,6 +1152,7 @@ public class JiaoYangReportController extends BaseController {
             Long userId) {
         Map<String, Object> requestMap = new HashMap<>();
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        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)) {
@@ -1094,11 +1161,23 @@ public class JiaoYangReportController extends BaseController {
             } else {
                 userIds.add(userId);
             }
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
             if (Check.isNull(promoterIds)) {
                 return new ArrayList<>();
             }
             requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            }
+            if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
+            if (Check.isNull(promoterIds)) {
+                return new ArrayList<>();
+            }
+            requestMap.put("promoterIds", promoterIds);
+
         }
         String nowDate = DateUtils.getNowDateStr();
         Long start = null;
@@ -1141,6 +1220,7 @@ public class JiaoYangReportController extends BaseController {
     ) {
         Map<String, Object> requestMap = new HashMap<>();
         String roleId = sysRoleService.getRoleBYUserId(userId);
+        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)) {
@@ -1149,11 +1229,22 @@ public class JiaoYangReportController extends BaseController {
             } else {
                 userIds.add(userId);
             }
-            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            if (Check.isNull(promoterIds)) {
+                return new JSONObject();
+            }
+            requestMap.put("promoterIds", promoterIds);
+        } else if ("jy_expert_business".equals(roleId) || "jy_expert_mentor".equals(roleId)) {
+            if ("jy_expert_business".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByBusinessId(userId);
+            } else if ("jy_expert_mentor".equals(roleId)) {
+                promoterIds = jiaoYangReportService.getPromoterIdsByMentorId(userId);
+            }
             if (Check.isNull(promoterIds)) {
                 return new JSONObject();
             }
             requestMap.put("promoterIds", promoterIds);
+
         }
         String nowDate = DateUtils.getNowDateStr();
         String thisCycleEnd = null; // 当前时段结束日期

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/mapper/JiaoYangReportMapper.java

@@ -63,4 +63,8 @@ public interface JiaoYangReportMapper {
     void deleteAuthItem();
 
     JSONObject getTypeData(@Param("start") Long start, @Param("end") Long end);
+
+    List<Long> getPromoterIdsByBusinessId(@Param("userId") Long userId);
+
+    List<Long> getPromoterIdsByMentorId(@Param("userId") Long userId);
 }

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/IJiaoYangReportService.java

@@ -61,4 +61,8 @@ public interface IJiaoYangReportService {
     void deleteAuthItem();
 
     JSONObject getTypeData(Long start, Long end);
+
+    List<Long> getPromoterIdsByBusinessId(Long userId);
+
+    List<Long> getPromoterIdsByMentorId(Long userId);
 }

+ 10 - 0
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/impl/JiaoYangReportServiceImpl.java

@@ -211,4 +211,14 @@ public class JiaoYangReportServiceImpl implements IJiaoYangReportService {
     public JSONObject getTypeData(Long start, Long end) {
         return jiaoYangReportMapper.getTypeData(start, end);
     }
+
+    @Override
+    public List<Long> getPromoterIdsByBusinessId(Long userId) {
+        return jiaoYangReportMapper.getPromoterIdsByBusinessId(userId);
+    }
+
+    @Override
+    public List<Long> getPromoterIdsByMentorId(Long userId) {
+        return jiaoYangReportMapper.getPromoterIdsByMentorId(userId);
+    }
 }

+ 41 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml

@@ -144,6 +144,10 @@
         t1.phone,
         t1.consignee,
         t1.promoter_address,
+        t1.expert_mentor_id,
+        t1.expert_mentor_name,
+        t1.expert_business_id,
+        t1.expert_business_name,
         if(t1.media_id = 1, t1.total_sale,t3.total_sale ) as 'total_sale',
         if(t1.media_id = 1, t1.fans_number,t3.fans_number ) as 'fans_number',
         if(t1.media_id = 1, t1.avg_video_sales,t3.avg_video_sales ) as 'avg_video_sales',
@@ -194,6 +198,15 @@
             <if test="type != null  and type != ''">
                 and t1.type = #{type}
             </if>
+            <if test="expertMentorId != null  and expertMentorId != ''">
+                and t1.expert_mentor_id = #{expertMentorId}
+            </if>
+
+            <if test="expertBusinessId != null  and expertBusinessId != ''">
+                and t1.expert_business_id = #{expertBusinessId}
+            </if>
+
+
         </where>
         order by ${parameter} ${orderBy}
     </select>
@@ -518,6 +531,10 @@
             <if test="phone != null">phone,</if>
             <if test="consignee != null">consignee,</if>
             <if test="promoterAddress != null">promoter_address,</if>
+            <if test="expertMentorId != null">expert_mentor_id,</if>
+            <if test="expertMentorName != null">expert_mentor_name,</if>
+            <if test="expertBusinessId != null">expert_business_id,</if>
+            <if test="expertBusinessName != null">expert_business_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -538,6 +555,10 @@
             <if test="phone != null">#{phone},</if>
             <if test="consignee != null">#{consignee},</if>
             <if test="promoterAddress != null">#{promoterAddress},</if>
+            <if test="expertMentorId != null">#{expertMentorId},</if>
+            <if test="expertMentorName != null">#{expertMentorName},</if>
+            <if test="expertBusinessId != null">#{expertBusinessId},</if>
+            <if test="expertBusinessName != null">#{expertBusinessName},</if>
         </trim>
     </insert>
 
@@ -604,6 +625,10 @@
             <if test="categoryRequirement != null">category_requirement = #{categoryRequirement},</if>
             <if test="avgVideoSales != null">avg_video_sales = #{avgVideoSales},</if>
             <if test="videoSales != null">video_sales = #{videoSales},</if>
+            <if test="expertMentorId != null">expert_mentor_id = #{expertMentorId},</if>
+            <if test="expertMentorName != null">expert_mentor_name = #{expertMentorName},</if>
+            <if test="expertBusinessId != null">expert_business_id = #{expertBusinessId},</if>
+            <if test="expertBusinessName != null">expert_business_name = #{expertBusinessName},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
@@ -932,6 +957,22 @@ where promoter_id = #{promoterId}
 group by promoter_id
 
     </select>
+    <select id="jyExpertMentorList" resultType="com.alibaba.fastjson.JSONObject">
+        select t3.user_id as 'userId', t3.nick_name as 'userName',t3.status as 'status'
+        from sys_user_role t1
+                 left join sys_role t2 on t1.role_id = t2.role_id
+                 left join sys_user t3 on t1.user_id = t3.user_id
+        where t2.role_key = 'jy_expert_mentor'
+        order by t3.create_time desc
+    </select>
+    <select id="jyExpertBusiness" resultType="com.alibaba.fastjson.JSONObject">
+        select t3.user_id as 'userId', t3.nick_name as 'userName',t3.status as 'status'
+        from sys_user_role t1
+                 left join sys_role t2 on t1.role_id = t2.role_id
+                 left join sys_user t3 on t1.user_id = t3.user_id
+        where t2.role_key = 'jy_expert_business'
+        order by t3.create_time desc
+    </select>
 
 
     <insert id="addPromotersCount">

+ 16 - 1
ruixuan-live/src/main/resources/mapper/jiaoyang/JiaoYangReportMapper.xml

@@ -119,7 +119,9 @@
         tt.video_count as 'videoCount',
         tt.video_show as 'videoShow',
         ttt.type as 'type',
-        ttt.user_name as 'userName'
+        ttt.user_name as 'userName',
+        ttt.expert_mentor_name as 'expertMentorName',
+        ttt.expert_business_name as 'expertBusinessName'
         from (
         select clip_user_id as 'promoterId',
         clip_nick_name as 'promoterNickName',
@@ -886,6 +888,19 @@
                                                   where `type` = 1
                                                   group by promoter_id)) t2
     </select>
+    <select id="getPromoterIdsByBusinessId" resultType="java.lang.Long" parameterType="java.lang.Long">
+        select promoter_id
+        from jy_kuaishou_promoter
+        where expert_business_id = #{userId}
+        group by promoter_id
+
+    </select>
+    <select id="getPromoterIdsByMentorId" resultType="java.lang.Long" parameterType="java.lang.Long">
+        select promoter_id
+        from jy_kuaishou_promoter
+        where expert_mentor_id = #{userId}
+        group by promoter_id
+    </select>
 
 
 </mapper>