Skip to content

Y
yd-csf
Commit a6da7617 by jianan
Options

前端对接问题修复75

parent 99fc1fd7
Showing with 23 additions and 10 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java
...@@ -372,6 +372,9 @@ public class ApiCommissionController { ...@@ -372,6 +372,9 @@ public class ApiCommissionController {
} }
// 更新来佣记录 // 更新来佣记录
Result.success(commissionService.updateCommission(commissionUpdateRequest)); Result.success(commissionService.updateCommission(commissionUpdateRequest));
} catch (BusinessException e) {
log.error("更新来佣记录时，业务异常", e);
return Result.fail(ErrorCode.OPERATION_ERROR.getCode(), e.getMessage());
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
log.error("更新来佣记录时，获取锁被中断", e); log.error("更新来佣记录时，获取锁被中断", e);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -291,6 +291,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -291,6 +291,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
if (commission == null) { if (commission == null) {
throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "未找到该来佣记录"); throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "未找到该来佣记录");
} }
if (StringUtils.isNotBlank(commission.getPolicyNo())) {
Policy policy = policyService.lambdaQuery().eq(Policy::getPolicyNo, commission.getPolicyNo()).one();
if (policy == null) {
throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "保单不存在:" + commission.getPolicyNo());
}
}
BigDecimal amount = commission.getAmount(); BigDecimal amount = commission.getAmount();
BigDecimal requestAmount = commissionUpdateRequest.getAmount(); BigDecimal requestAmount = commissionUpdateRequest.getAmount();
...@@ -729,16 +735,20 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -729,16 +735,20 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
// 入账业务id // 入账业务id
commission.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode())); commission.setCommissionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode()));
// 关联业务id // 关联业务id
if (MapUtils.isNotEmpty(policyMap)) { if ("R".equals(request.getCommissionBizType())) {
Policy policy = policyMap.get(request.getPolicyNo()); if (MapUtils.isNotEmpty(policyMap)) {
if (policy != null) { Policy policy = policyMap.get(request.getPolicyNo());
commission.setReconciliationCompany(policy.getReconciliationCompany()); if (policy != null) {
commission.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId()); commission.setReconciliationCompany(policy.getReconciliationCompany());
commission.setProductLaunchBizId(policy.getProductLaunchBizId()); commission.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId());
commission.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId()); commission.setProductLaunchBizId(policy.getProductLaunchBizId());
commission.setPremium(Convert.toStr(policy.getPaymentPremium())); commission.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
// 本次入账比例 commission.setPremium(Convert.toStr(policy.getPaymentPremium()));
commission.setCurrentCommissionRatio(commission.calculateCurrentPaidRatio()); // 本次入账比例
commission.setCurrentCommissionRatio(commission.calculateCurrentPaidRatio());
} else {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "保单不存在, policyNo: " + request.getPolicyNo());
}
} }
} }
// 关联预计来佣信息 // 关联预计来佣信息
......
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