合伙人BUG修改

partner/src/main/java/com/jzg/entity/param/PartnerKickbackChangeParam.java

@@ -19,6 +19,9 @@ public class PartnerKickbackChangeParam extends PageRequest {
     @Schema(description = "工号")
     private String userId;
 
+    @Schema(description = "用户等级")
+    private String grade;
+
     @Schema(description = "用户等级")
     private String userGrade;
 

partner/src/main/java/com/jzg/service/Impl/PartnerKickbackChangeImpl.java

@@ -42,8 +42,8 @@ public class PartnerKickbackChangeImpl extends ServiceImpl<PartnerKickbackChange
         if (StringUtils.isNotBlank(changeParam.getUserId())){
             wrapper.like("c.user_id",changeParam.getUserId());
         }
-        if (StringUtils.isNotBlank(changeParam.getUserGrade())){
-            wrapper.eq("c.user_grade",changeParam.getUserGrade());
+        if (StringUtils.isNotBlank(changeParam.getGrade())){
+            wrapper.eq("c.user_grade",changeParam.getGrade());
         }
         List<String> changeTimes = changeParam.getChangeTimes();
         if (CollectionUtil.isNotEmpty(changeTimes)){

partner/src/main/java/com/jzg/service/Impl/PartnerPremiumDetailsServiceImpl.java

@@ -62,7 +62,7 @@ public class PartnerPremiumDetailsServiceImpl extends ServiceImpl<PartnerPremium
         log.info("查询佣金明细:detailsParam=[{}]", JSONUtil.toJsonStr(detailsParam));
         QueryWrapper<PartnerPremiumDetails> queryWrapper = new QueryWrapper<>();
 
-        queryWrapper.like(StringUtils.isNotBlank(detailsParam.getUserName()), "u.`name`",detailsParam.getUserName());
+        queryWrapper.like(StringUtils.isNotBlank(detailsParam.getUserName()), "info.`name`",detailsParam.getUserName());
         queryWrapper.like(StringUtils.isNotBlank(detailsParam.getMobile()), "u.mobile",detailsParam.getMobile());
         queryWrapper.like(StringUtils.isNotBlank(detailsParam.getUserId()), "d.user_id",detailsParam.getUserId());
         queryWrapper.like(StringUtils.isNotBlank(detailsParam.getOrderno()), "d.orderno",detailsParam.getOrderno());

partner/src/main/resources/mapper/PartnerUserMapper.xml

@@ -15,7 +15,7 @@
             info.create_by,
             info.create_time,
             d.`name` deptName,
-            (SELECT sa.partner_status  FROM sys_user_jzg_info_salesman sa WHERE sa.type_attr = 3 AND sa.sys_user_jzg_info_id = info.id) AS `status`,
+            sa.partner_status AS `status`,
             info.referrer_id,
             referrer.`name` AS referrerName,
             info.leader_id,
@@ -76,9 +76,11 @@
             LEFT JOIN sys_user_jzg_info referrer ON referrer.id = info.referrer_id
             LEFT JOIN sys_user_jzg_info leader ON leader.id = info.leader_id
             LEFT JOIN sys_user referrerMobile ON referrerMobile.id = referrer.user_id
+            LEFT JOIN sys_user_jzg_info_salesman sa ON  sa.sys_user_jzg_info_id = db.user_id
             <where>
-                <if test="queryVo.isEnable != null and queryVo.isEnable != ''">
-                    and info.status = #{queryVo.status}
+                sa.type_attr = 3
+                <if test="queryVo.status != null and queryVo.status != ''">
+                    and sa.partner_status = #{queryVo.status}
                 </if>
                 <if test="queryVo.deptId != null and queryVo.deptId != ''">
                     and db.dept_id = #{queryVo.deptId}