代理人app开发

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerRuleServiceImpl.java

@@ -221,7 +221,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
 
 
     private VerifyData extractCommonLogic(String userId, String grade) {
-        PartnerRuleEntity partnerRuleEntity = validateGradeAndFetchRuleEntity(grade);
+        PartnerRuleEntity partnerRuleEntity = validateGradeAndFetchRuleEntity(StringUtils.equals("4",grade) ? String.valueOf(Integer.valueOf(grade) +1) :grade);
         if (partnerRuleEntity == null) {
             throw new SystemException("合作伙伴规则实体不能为空");
         }

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -388,8 +388,11 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
             throw new SystemException("已达到最高身份");
         }
         PartnerRuleEntity partnerRuleEntity = ruleService.selectByGrade(grade);
+        if (StringUtils.equals("5",grade)){
+            grade = String.valueOf(Integer.valueOf(grade) - 1);
+        }
         partnerRuleEntity.setStrategyArray(null);
-        CommissionValidityPeriod period = ruleService.getCommissionValidityPeriod(partnerRuleEntity.getCycle(), userId, String.valueOf(Integer.valueOf(grade) - 1));
+        CommissionValidityPeriod period = ruleService.getCommissionValidityPeriod(partnerRuleEntity.getCycle(), userId,grade);
         if (!Objects.isNull( period) && period.getStartDate() != null){
             partnerRuleEntity.setAssessmentEndDate(period.getEndDate().split(" ")[0]);
         }