新单跟进141

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

@@ -78,6 +78,21 @@ public class CommissionAsyncService {
     }
     }
 
 
     private void doCompareBatch(CommissionExpected commissionExpected, List<Commission> existingCommissions) {
     private void doCompareBatch(CommissionExpected commissionExpected, List<Commission> existingCommissions) {
+        // 校验参数
+        boolean  validFlag = false;
+        for (Commission existingCommission : existingCommissions) {
+            if (existingCommission.getTotalPeriod().compareTo(commissionExpected.getTotalPeriod()) != 0) {
+                existingCommission.setRemark("来佣总期数与预计来佣总期数不一致");
+                existingCommission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
+                validFlag = true;
+            }
+        }
+        // 参数校验未通过，更新后，不执行后续计算
+        if (!validFlag) {
+            commissionService.updateBatchById(existingCommissions);
+            return;
+        }
+
         // region 计算预计来佣属性
         // region 计算预计来佣属性
 
 
         // 统计已入账金额、已入账比例
         // 统计已入账金额、已入账比例
@@ -175,6 +190,13 @@ public class CommissionAsyncService {
     }
     }
 
 
     private void doCompare(List<Commission> existingCommissions, CommissionExpected commissionExpected, Commission commission) {
     private void doCompare(List<Commission> existingCommissions, CommissionExpected commissionExpected, Commission commission) {
+        // 校验参数
+        if (commission.getTotalPeriod().compareTo(commissionExpected.getTotalPeriod()) != 0) {
+            commission.setRemark("来佣总期数与预计来佣总期数不一致");
+            commissionService.updateById(commission);
+            return;
+        }
+
         // region 计算预计来佣属性
         // region 计算预计来佣属性
 
 
         // 统计已入账金额、已入账比例
         // 统计已入账金额、已入账比例