push

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionService.java

@@ -70,5 +70,5 @@ public interface CommissionService extends IService<Commission> {
      */
     BigDecimal queryCommissionExchangeRate(String policyNo, Integer commissionPeriod);
 
-
+    Long queryCount(String commissionExpectedBizId);
 }

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

@@ -880,17 +880,22 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                             .divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
             );
             commissionExpected.setPremium(policy.getPaymentPremium());
+            //查询实际来用数据量
+            Long count = commissionService.queryCount(commissionExpected.getCommissionExpectedBizId());
             //已入账比例
             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");
+            if (count > 0){
+                //判断下面的前提是必须有实际的数据
+                //已入账比例 >= 预计入账比例 -> 入账状态置为完成入账。否则部分入账
+                if (paidRatio.compareTo(commissionRatio) >= 0) {
+                    //完成入账
+                    commissionExpected.setStatus("1");
+                }else {
+                    //部分入账
+                    commissionExpected.setStatus("2");
+                }
             }
         } else {
             commissionExpected.setExpectedAmount(

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

@@ -1262,6 +1262,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         return commissionRecord.getExchangeRate();
     }
 
+    @Override
+    public Long queryCount(String commissionExpectedBizId) {
+        return this.baseMapper.selectCount(new LambdaQueryWrapper<Commission>()
+                .eq(Commission::getCommissionExpectedBizId,commissionExpectedBizId)
+                .eq(Commission::getIsDeleted,0)
+        );
+    }
+
 
     /**
      * 查询列表