push

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -305,13 +305,15 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             vo.setTotalRevenueRatio(BigDecimal.ZERO);
         }
 
-        // 待入账金额（已实现归零逻辑）
+        // 待入账金额
+        // 待入账金额归零 = 已入账来佣比例（实佣率）>= 产品来佣率
         if (commissionRatio != null && paidRatio.compareTo(commissionRatio) >= 0) {
             vo.setPendingAmount(BigDecimal.ZERO);
 //            vo.setPendingRatio(BigDecimal.ZERO);
         } else if (commissionRatio != null) {
 //            vo.setPendingRatio(commissionRatio.subtract(paidRatio));
             if (expected.getExpectedAmount() != null) {
+                //待入账金额 = 预计来佣金额 - 已入账来佣金额
                 vo.setPendingAmount(expected.getExpectedAmount().subtract(paidAmount));
             }
         } else {
@@ -931,11 +933,17 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         // 手动聚合计算
         BigDecimal totalAmount = BigDecimal.ZERO;
         BigDecimal totalPaidAmount = BigDecimal.ZERO;
+        //累计已入账来佣比例（同保单多个入账项目累计的实佣率）
+        BigDecimal totalPaidRatio = BigDecimal.ZERO;
+        //累计来佣比例（同保单多个入账项目累计的产品来佣率）
+        BigDecimal totalCommissionRatio = BigDecimal.ZERO;
         Set<String> policyNoSet = new HashSet<>();
 
         for (CommissionExpected expected : validList) {
             totalAmount = totalAmount.add(ObjectUtils.defaultIfNull(expected.getExpectedAmount(), BigDecimal.ZERO));
             totalPaidAmount = totalPaidAmount.add(ObjectUtils.defaultIfNull(expected.getPaidAmount(), BigDecimal.ZERO));
+            totalPaidRatio = totalPaidRatio.add(ObjectUtils.defaultIfNull(expected.getPaidRatio(), BigDecimal.ZERO));
+            totalCommissionRatio = totalCommissionRatio.add(ObjectUtils.defaultIfNull(expected.getCommissionRatio(), BigDecimal.ZERO));
             if (StringUtils.isNotBlank(expected.getPolicyNo())) {
                 policyNoSet.add(expected.getPolicyNo());
             }
@@ -973,6 +981,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             vo.setPaidAmountRatio(BigDecimal.ZERO);
         }
 
+        // 待入账金额归零 = 已入账来佣比例（累计实佣率）>= 累计产品来佣率
+        if (totalPaidRatio.compareTo(totalCommissionRatio) >= 0){
+            vo.setPendingPaidAmount(BigDecimal.ZERO);
+        }
         vo.setTotalPolicyCount(policyNoSet.size());
         vo.setTotalPremium(totalPremium);
         vo.setFromTotalPremium(fromTotalPremium);