|
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
|
|
+import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
|
|
import com.ydtech.modules.admin.model.vo.AppUserInfoVo;
|
|
@@ -383,13 +384,15 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public HttpResult queryDowngradeTask(String grade, String userId) {
|
|
public HttpResult queryDowngradeTask(String grade, String userId) {
|
|
|
|
|
+ if (StringUtils.equals("1", grade)){
|
|
|
|
|
+ throw new SystemException("已达到最高身份");
|
|
|
|
|
+ }
|
|
|
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, grade);
|
|
|
- if (Objects.isNull( period) || period.getStartDate() == null){
|
|
|
|
|
- return HttpResult.error("时间范围不能为空");
|
|
|
|
|
|
|
+ if (!Objects.isNull( period) && period.getStartDate() != null){
|
|
|
|
|
+ partnerRuleEntity.setAssessmentEndDate(period.getEndDate().split(" ")[0]);
|
|
|
}
|
|
}
|
|
|
- partnerRuleEntity.setAssessmentEndDate(period.getEndDate().split(" ")[0]);
|
|
|
|
|
BigDecimal bf = baseMapper.subordinateMembersInsurancePremiums(userId, grade, period);
|
|
BigDecimal bf = baseMapper.subordinateMembersInsurancePremiums(userId, grade, period);
|
|
|
BigDecimal p = ruleService.getInviteData(userId, grade, period);
|
|
BigDecimal p = ruleService.getInviteData(userId, grade, period);
|
|
|
BigDecimal ownBf = baseMapper.selectOwnSumPremium(userId, period);
|
|
BigDecimal ownBf = baseMapper.selectOwnSumPremium(userId, period);
|