Skip to content

Y
yd-csf
Commit d6e17773 by jianan
Options

出账检核-增加币种57

parent b9d79ec0
Showing with 19 additions and 8 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
...@@ -1049,6 +1049,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -1049,6 +1049,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
expectedFortune.setUpdaterId(authUserDto.getUserBizId()); expectedFortune.setUpdaterId(authUserDto.getUserBizId());
expectedFortune.setCreateTime(now); expectedFortune.setCreateTime(now);
expectedFortune.setUpdateTime(now); expectedFortune.setUpdateTime(now);
// 是否拆分
expectedFortune.setIsPart(0);
if ("R".equals(expectedFortuneDto.getFortuneBizType())) { if ("R".equals(expectedFortuneDto.getFortuneBizType())) {
Policy policy = policyMap.get(expectedFortuneDto.getPolicyNo()); Policy policy = policyMap.get(expectedFortuneDto.getPolicyNo());
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java
...@@ -384,27 +384,35 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune> ...@@ -384,27 +384,35 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
// 校验发佣记录状态 // 校验发佣记录状态
StringBuilder validateMsg = new StringBuilder(); StringBuilder validateMsg = new StringBuilder();
for (Fortune fortune : fortuneList) { for (Fortune fortune : fortuneList) {
// 统一加一个换行符开始
validateMsg.append("\n");
if (StringUtils.isNotBlank(fortune.getFortuneAccountBizId())) { if (StringUtils.isNotBlank(fortune.getFortuneAccountBizId())) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已发薪资，不能重复生成薪资记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：已发薪资，不能重复生成;");
} }
if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.WAIT.getItemValue())) { if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.WAIT.getItemValue())) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("待出账状态不能直接改为'可出账, 检核完成'，不能生成出账记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：待出账状态不能直接改为'可出账, 检核完成'");
} }
if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) { if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已完成出账，不能生成出账记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：已完成出账;");
} }
if (fortune.getActualPayoutDate() == null) { if (fortune.getActualPayoutDate() == null) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("未设置出账年月（实），不能生成出账记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：未设置出账年月（实）");
} }
if (ObjectUtils.isEmpty(fortune.getPayoutCurrency())) { if (ObjectUtils.isEmpty(fortune.getPayoutCurrency())) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("未设置发放币种，不能生成出账记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：未设置发放币种");
} }
if (ObjectUtils.isEmpty(fortune.getPayoutAmount())) { if (ObjectUtils.isEmpty(fortune.getPayoutAmount())) {
validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("未设置发放币种金额，不能生成出账记录; "); validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("：未设置发放币种金额");
} }
} }
if (StringUtils.isNotBlank(validateMsg.toString())) { if (StringUtils.isNotBlank(validateMsg.toString())) {
throw new BusinessException(ResultCode.FAIL.getCode(), validateMsg.toString()); // 去掉最开头的那个多余的换行符
String finalMsg = validateMsg.toString();
if (finalMsg.startsWith("\n")) {
finalMsg = finalMsg.substring(1);
}
throw new BusinessException(ResultCode.FAIL.getCode(), finalMsg);
} }
if (CollUtil.isNotEmpty(fortuneList)) { if (CollUtil.isNotEmpty(fortuneList)) {
...@@ -809,12 +817,13 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune> ...@@ -809,12 +817,13 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
.set(ExpectedFortune::getPayableNo, payableNo) .set(ExpectedFortune::getPayableNo, payableNo)
.eq(ExpectedFortune::getId, expectedFortune.getId()) .eq(ExpectedFortune::getId, expectedFortune.getId())
.update(); .update();
// 关联应付款编号
fortune.setPayableNo(payableNo);
} else { } else {
// 如果有预计出账记录，提示去应付款管理页面修改金额，而不是在出账页面新增 // 如果有预计出账记录，提示去应付款管理页面修改金额，而不是在出账页面新增
throw new BusinessException(ResultCode.FAIL.getCode(), fortuneAddRequest.getFortuneName() + " 已存在应付记录，请在应付款管理页面修改金额"); throw new BusinessException(ResultCode.FAIL.getCode(), fortuneAddRequest.getFortuneName() + " 已存在应付记录，请在应付款管理页面修改金额");
} }
fortune.setPayableNo(expectedFortune.getPayableNo());
fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId()); fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
fortune.setPolicyCurrency(expectedFortune.getPolicyCurrency()); fortune.setPolicyCurrency(expectedFortune.getPolicyCurrency());
fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100)); fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
......
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