|
|
@@ -73,9 +73,13 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
|
|
|
//如果为未结算则删除业绩提成表与业绩提成规则表的信息
|
|
|
if (commissionDto.getSettlementStatus() == 0){
|
|
|
//如果是取消结算，业绩表肯定有值
|
|
|
- baseMapper.deleteById(commission.getId());
|
|
|
+ Commission cm = baseMapper.selectOne(Wrappers.<Commission>query().lambda().eq(Commission::getContractId,commission.getContractId()));
|
|
|
+ if(ObjectUtil.isEmpty(cm)){
|
|
|
+ throw new ServiceException("数据异常,当前没有业绩提成数据,不能取消结算");
|
|
|
+ }
|
|
|
+ baseMapper.deleteById(cm.getId());
|
|
|
commissionRuleService.remove(Wrappers.<CommissionRule>lambdaQuery()
|
|
|
- .eq(CommissionRule::getCommissionId,commission.getId())
|
|
|
+ .eq(CommissionRule::getCommissionId,cm.getId())
|
|
|
);
|
|
|
}else if (commissionDto.getSettlementStatus() == 1){
|
|
|
saveOrUpdate(commissionDto);
|
caozj