Skip to content

Y
yd-csf
Commit 795a3d4a by jianan
Options

新单跟进121

parent 6002147a
Showing with 14 additions and 10 deletions
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -130,15 +130,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -130,15 +130,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commission.setUpdateTime(new Date()); commission.setUpdateTime(new Date());
// 查询预计来佣 // 查询预计来佣
CommissionExpected commissionExpected = queryByCommission(commission); CommissionExpected commissionExpected;
if (commissionExpected != null) { try {
commissionExpected = queryByCommission(commission);
// 对比预计来佣 // 对比预计来佣
compareWithExpected(commission.getPremium(), commission, commissionExpected); compareWithExpected(commission.getPremium(), commission, commissionExpected);
commissionExpectedService.updateById(commissionExpected); commissionExpectedService.updateById(commissionExpected);
} else { } catch (Exception e) {
// 预计来佣不存在，来佣状态设置为 比对失败 // 预计来佣不存在，来佣状态设置为 比对失败
commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue()); commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
commission.setRemark("未找到当前来佣对应的预计来佣，比对失败"); commission.setRemark(e.getMessage());
} }
return this.updateById(commission); return this.updateById(commission);
} }
...@@ -223,8 +224,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -223,8 +224,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
queryWrapper.eq("currency", commission.getCurrency()); queryWrapper.eq("currency", commission.getCurrency());
CommissionExpected one = commissionExpectedService.getOne(queryWrapper); CommissionExpected one = commissionExpectedService.getOne(queryWrapper);
if (ObjectUtils.isEmpty(one)) { if (ObjectUtils.isEmpty(one)) {
log.info("未找到当前来佣对应的预计来佣，policy_no：{}, commission_name：{}, commission_period：{}, currency：{}", String errorMsg = String.format("未找到当前来佣对应的预计来佣，policy_no：%s, commission_name：%s, commission_period：%s, currency：%s",
commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency()); commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency());
throw new BusinessException(ResultCode.NULL_ERROR.getCode(), errorMsg);
} }
return one; return one;
} }
...@@ -437,15 +439,17 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -437,15 +439,17 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
} }
} }
// 查询预计来佣 // 查询预计来佣
CommissionExpected commissionExpected = queryByCommission(commission); // 查询预计来佣
if (commissionExpected != null) { CommissionExpected commissionExpected;
try {
commissionExpected = queryByCommission(commission);
// 对比预计来佣 // 对比预计来佣
compareWithExpected(commissionAddRequest.getPremium(), commission, commissionExpected); compareWithExpected(commission.getPremium(), commission, commissionExpected);
commissionExpectedService.updateById(commissionExpected); commissionExpectedService.updateById(commissionExpected);
} else { } catch (Exception e) {
// 预计来佣不存在，来佣状态设置为 比对失败 // 预计来佣不存在，来佣状态设置为 比对失败
commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue()); commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
commission.setRemark("未找到当前来佣对应的预计来佣，比对失败"); commission.setRemark(e.getMessage());
} }
commission.setCreatorId(loginUserId); commission.setCreatorId(loginUserId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment