push

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

@@ -877,6 +877,18 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                             .divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
             );
             commissionExpected.setPremium(policy.getPaymentPremium());
+            //已入账比例
+            BigDecimal paidRatio = ObjectUtils.defaultIfNull(commissionExpected.getPaidRatio(), BigDecimal.ZERO);
+            //预计入账比例（保单产品来佣金率）
+            BigDecimal commissionRatio = ObjectUtils.defaultIfNull(commissionExpected.getCommissionRatio(), BigDecimal.ZERO);
+            //已入账比例 >= 预计入账比例 -> 入账状态置为完成入账。否则部分入账
+            if (paidRatio.compareTo(commissionRatio) >= 0) {
+                //完成入账
+                commissionExpected.setStatus("1");
+            }else {
+                //部分入账
+                commissionExpected.setStatus("2");
+            }
         } else {
             commissionExpected.setExpectedAmount(
                     commissionExpectedUpdateRequest.getAmount()