新单跟进55

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

@@ -215,8 +215,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         // 生成新单编号
         // 生成新单编号
         String commissionBizId = RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode());
         String commissionBizId = RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_COMMISSION.getCode());
         commission.setCommissionBizId(commissionBizId);
         commission.setCommissionBizId(commissionBizId);
-        // 设置默认状态
-        commission.setStatus(CommissionStatusEnum.WAIT.getItemValue());
         // 查询预计来佣
         // 查询预计来佣
         CommissionExpected commissionExpected = queryByCommission(commission);
         CommissionExpected commissionExpected = queryByCommission(commission);
         if (commissionExpected != null) {
         if (commissionExpected != null) {
@@ -250,6 +248,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
                 commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
                 expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
                 expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
             }
             }
+        } else {
+            // 预计来佣不存在，来佣状态设置为 比对失败
+            commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
+            commission.setRemark("预计来佣不存在，来佣状态设置为 比对失败");
         }
         }
     }
     }
 }
 }