合伙人bug修改

src/main/java/com/ydtech/modules/partner/CalculateCommissionUtils.java

@@ -173,12 +173,10 @@ public class CalculateCommissionUtils {
             return period;
         } else if (StringUtils.equals("2", rules.getValidityPeriod())) {
             if (isAfterNDays(assessmentTime, rules.getFixedDays())) {
-                if (isAfterNDays(assessmentTime, rules.getFixedDays() * 2)) {
-                    partnerUserMapper.updateAssessmentTimeByDate(userId, new Date());
-                } else {
-                    Date date = addDays(assessmentTime, rules.getFixedDays());
-                    partnerUserMapper.updateAssessmentTimeByDate(userId, date);
-                }
+                Date date = addDays(assessmentTime, rules.getFixedDays());
+                partnerUserMapper.updateAssessmentTimeByDate(userId, date);
+                period.setStartDate(dateFormat.format(date));
+                period.setEndDate(dateFormat.format(addDays(date, rules.getFixedDays())));
             } else {
                 period.setStartDate(dateFormat.format(assessmentTime));
                 period.setEndDate(dateFormat.format(addDays(assessmentTime, rules.getFixedDays())));
@@ -204,7 +202,11 @@ public class CalculateCommissionUtils {
                 .atZone(ZoneId.systemDefault())
                 .toLocalDateTime();
         LocalDateTime newLocalDate = localDate.plusDays(days);
-        return Date.from(newLocalDate.atZone(ZoneId.systemDefault()).toInstant());
+        LocalDateTime endOfDay = newLocalDate.withHour(23)
+                .withMinute(59)
+                .withSecond(59)
+                .withNano(999_999_999);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
     }
 
     public static Set<String> getUserIdList(String userId) {

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

@@ -244,7 +244,7 @@ select grade,grade_name from  partner_rule
         </if>
         <if test="grade == 3">
             SELECT
-            ifnull((SELECT count(1) FROM partner_user WHERE grade = 4 and referrer_id = #{params.userId}),) v1,
+            ifnull((SELECT count(1) FROM partner_user WHERE grade = 4 and referrer_id = #{params.userId}),0) v1,
             ifnull((
                 SELECT COUNT(1) FROM partner_user WHERE referrer_id IN (
                 SELECT user_id FROM partner_user WHERE grade = 4 and referrer_id = #{params.userId} )