合伙人BUG修改

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

@@ -702,7 +702,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
             level.setLockingState("1");
             if (null != partnerUser.getUpgradeTime()) {
                 PartnerRuleEntity ruleEntity = ruleService.selectByGrade(String.valueOf(partnerUser.getGrade()));
-                level.setExpiryDate(new SimpleDateFormat("yyyy-MM-dd").format(PartnerDateUtils.addDays(partnerUser.getUpgradeTime(), Integer.valueOf(ruleEntity.getKhDays()))));
+                if (Objects.nonNull(partnerUser.getUpgradeTime())){
+                    level.setExpiryDate(new SimpleDateFormat("yyyy-MM-dd").format(PartnerDateUtils.addDays(partnerUser.getUpgradeTime(), Integer.valueOf(ruleEntity.getKhDays()))));
+                }
             }
             level.setProportional(proportional(String.valueOf(partnerUser.getGrade()), partnerUser.getUserId()));
         }
@@ -729,7 +731,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
             level.setZeroDays("99");
         }
         PartnerRuleEntity rule = ruleService.selectByGrade(String.valueOf(partnerUser.getGrade() + 1));
-        level.setUnlockDeadline(new SimpleDateFormat("yyyy-MM-dd").format(PartnerDateUtils.addDays(partnerUser.getUpgradeTime(), Integer.valueOf(rule.getCycle().getFixedDays()))));
+        if (Objects.nonNull(partnerUser.getUpgradeTime())){
+            level.setUnlockDeadline(new SimpleDateFormat("yyyy-MM-dd").format(PartnerDateUtils.addDays(partnerUser.getUpgradeTime(), Integer.valueOf(rule.getCycle().getFixedDays()))));
+        }
         Integer grade = partnerUser.getGrade();
         // 检查升级条件
         boolean verified = ruleService.verifyUpgradeConditions(partnerUser.getUserId(), String.valueOf(grade));

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

@@ -957,29 +957,14 @@ SELECT
 
 
     <select id="assessment" resultType="java.lang.Integer">
-        WITH target_user AS (
         SELECT
-        info.id AS jzg_info_id,
-        sa.partner_review_time
-        FROM sys_user_jzg_info info
-        INNER JOIN sys_user_jzg_info_salesman sa
-        ON sa.sys_user_jzg_info_id = info.id
-        WHERE
-        sa.type_attr = 3
-        AND sa.partner_status = 3
-        AND info.id = #{userId}
-        )
-        SELECT
-        COUNT(1) AS total_count
+        COUNT( 1 ) AS total_count
         FROM
         partner_user u
-        INNER JOIN target_user tu
-        ON u.referrer_id = tu.jzg_info_id
-        WHERE
-        u.grade = #{grade}
---         AND u.user_id != tu.jzg_info_id
+        LEFT JOIN sys_user_jzg_info_salesman sa ON sa.sys_user_jzg_info_id = u.user_id
+        WHERE sa.type_attr = 3 AND sa.partner_status = 3 AND u.grade = #{grade} AND u.referrer_id = #{userId}
         <if test="period.startDate != null and period.endDate != null">
-            AND tu.partner_review_time BETWEEN #{period.startDate} AND #{period.endDate}
+            AND sa.partner_review_time BETWEEN #{period.startDate} AND #{period.endDate}
         </if>
     </select>