新增应收

f066401c · jianan · b68f25f7 · f066401c
Commit f066401c authored Apr 21, 2026 by jianan
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 12 deletions

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+25 -12

No files found.
--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
@@ -280,6 +280,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                commission.setReconciliationCompany(policy.getReconciliationCompany());
                commission.setReconciliationCompanyCode(policy.getReconciliationCompanyCode());
                commission.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId());
+                // 本次入账比例
+                commission.setCurrentCommissionRatio(
+                        calculateCurrentCommissionRatio(
+                                commission.getPremium(),
+                                commission.getAmount(),
+                                commission.getCurrency(),
+                                commission.getExchangeRate(),
+                                commission.getPolicyCurrency()
+                        )
+                );
            }
            // 匹配预计来佣记录
            CommissionExpected expected = findExpectedFromList(commission, commissionExpectedList);
@@ -287,9 +297,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
                commission.setReceivableNo(expected.getReceivableNo());
                commission.setTotalPeriod(expected.getTotalPeriod());
-                // 本次入账比例
-                commission.setCurrentCommissionRatio(calculateCurrentCommissionRatio(
-                        commission.getPremium(), commission.getAmount(), commission.getCurrency(), commission.getExchangeRate(), expected));
            } else {
                commission.setRemark("未查询到预计来佣记录");
                commission.setStatus(CommissionStatusEnum.MATCH_FAILED.getItemValue());
@@ -399,7 +406,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                        requestAmount,
                        commissionUpdateRequest.getCurrency(),
                        commissionUpdateRequest.getExchangeRate(),
-                        commissionExpected);
+                        commission.getPolicyCurrency());
                commission.setCurrentCommissionRatio(currentCommissionRatio);
            }
        }
@@ -750,7 +757,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        return this.getOne(new QueryWrapper<Commission>().eq("commission_biz_id", commissionBizId));
    }
-    public BigDecimal calculateCurrentCommissionRatio(String premium, BigDecimal amount, String currentCurrency, BigDecimal exchangeRate, CommissionExpected commissionExpected) {
+    public BigDecimal calculateCurrentCommissionRatio(String premium, BigDecimal amount, String currentCurrency, BigDecimal exchangeRate, String policyCurrency) {
        if (ObjectUtils.isEmpty(premium)) {
            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "保单保费不能为空");
        }
@@ -760,11 +767,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        if (ObjectUtils.isEmpty(exchangeRate)) {
            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "当前结算汇率不能为空");
        }
-        // 获取保单币种
-        String currency = commissionExpected.getPolicyCurrency();
        // 如果当前入账币种等于保单币种，直接计算来佣比例
-        if (StringUtils.equalsIgnoreCase(currentCurrency, currency)) {
+        if (StringUtils.equalsIgnoreCase(currentCurrency, policyCurrency)) {
            return amount.divide(new BigDecimal(premium), 4, RoundingMode.HALF_UP)
                    .multiply(new BigDecimal(100));
        } else {
@@ -853,6 +858,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                        commission.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
                        commission.setPremium(Convert.toStr(policy.getPaymentPremium()));
                        commission.setPolicyCurrency(policy.getCurrency());
+                        // 本次入账比例
+                        commission.setCurrentCommissionRatio(calculateCurrentCommissionRatio(
+                                commission.getPremium(),
+                                commission.getAmount(),
+                                commission.getCurrency(),
+                                commission.getExchangeRate(),
+                                commission.getPolicyCurrency())
+                        );
                    } else {
                        throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "保单不存在, policyNo: " + request.getPolicyNo());
                    }
@@ -862,10 +875,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            }
            // 关联预计来佣信息
            CommissionExpected expected = getCommissionExpectedBizIdBatch(request, policyNoSet, commission);
-            if (expected != null && "R".equals(expected.getCommissionBizType())) {
+            if (expected != null) {
-                // 本次入账比例
+                commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
-                commission.setCurrentCommissionRatio(calculateCurrentCommissionRatio(
+                commission.setReceivableNo(expected.getReceivableNo());
-                        commission.getPremium(), commission.getAmount(), commission.getCurrency(), commission.getExchangeRate(), expected));
+                commission.setTotalPeriod(expected.getTotalPeriod());
            }
            commissionList.add(commission);