caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复分销申请逻辑

Browse Source
This commit is contained in:
lele0521 2024-03-07 11:23:50 +08:00
parent a31a9fdfbd
commit f0765a6627
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
View File

@ -80,23 +80,25 @@ public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Dis
//如果分销员非空并未审核则提示用户请等待，如果分销员为拒绝状态则重新提交申请 //如果分销员非空并未审核则提示用户请等待，如果分销员为拒绝状态则重新提交申请
if (Optional.ofNullable(distribution).isPresent()) { if (Optional.ofNullable(distribution).isPresent()) {
if (distribution.getDistributionStatus().equals(DistributionStatusEnum.APPLY.name())) { switch (DistributionStatusEnum.valueOf(distribution.getDistributionStatus())) {
throw new ServiceException(ResultCode.DISTRIBUTION_IS_APPLY); case REFUSE:
} else if (distribution.getDistributionStatus().equals(DistributionStatusEnum.REFUSE.name())) { case RETREAT:
distribution.setDistributionStatus(DistributionStatusEnum.APPLY.name()); distribution.setDistributionStatus(DistributionStatusEnum.APPLY.name());
BeanUtil.copyProperties(distributionApplyDTO, distribution); BeanUtil.copyProperties(distributionApplyDTO, distribution);
this.updateById(distribution); this.updateById(distribution);
return distribution; return distribution;
default:
throw new ServiceException(ResultCode.DISTRIBUTION_IS_APPLY);
} }
}else{
//如果未申请分销员则新增进行申请
//获取当前登录用户
Member member = memberService.getUserInfo();
//新建分销员
distribution = new Distribution(member.getId(), member.getNickName(), distributionApplyDTO);
//添加分销员
this.save(distribution);
} }
//如果未申请分销员则新增进行申请
//获取当前登录用户
Member member = memberService.getUserInfo();
//新建分销员
distribution = new Distribution(member.getId(), member.getNickName(), distributionApplyDTO);
//添加分销员
this.save(distribution);
return distribution; return distribution;
} }