|
@@ -389,7 +389,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
|
|
|
}
|
|
}
|
|
|
PartnerRuleEntity partnerRuleEntity = ruleService.selectByGrade(grade);
|
|
PartnerRuleEntity partnerRuleEntity = ruleService.selectByGrade(grade);
|
|
|
partnerRuleEntity.setStrategyArray(null);
|
|
partnerRuleEntity.setStrategyArray(null);
|
|
|
- CommissionValidityPeriod period = ruleService.getCommissionValidityPeriod(partnerRuleEntity.getCycle(), userId, grade);
|
|
|
|
|
|
|
+ CommissionValidityPeriod period = ruleService.getCommissionValidityPeriod(partnerRuleEntity.getCycle(), userId, String.valueOf(Integer.valueOf(grade) - 1));
|
|
|
if (!Objects.isNull( period) && period.getStartDate() != null){
|
|
if (!Objects.isNull( period) && period.getStartDate() != null){
|
|
|
partnerRuleEntity.setAssessmentEndDate(period.getEndDate().split(" ")[0]);
|
|
partnerRuleEntity.setAssessmentEndDate(period.getEndDate().split(" ")[0]);
|
|
|
}
|
|
}
|