新单跟进58

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionController.java

@@ -137,7 +137,13 @@ public class ApiCommissionController {
             String commissionName = commission.getCommissionName();
 
             CommissionExpected expected = getCommissionExpected(expectedList, policyNo, commissionPeriod, commissionName);
-            commissionService.compareWithExpected(commission, expected);
+            if (expected != null) {
+                commissionService.compareWithExpected(commission, expected);
+            } else {
+                // 预计来佣不存在，来佣状态设置为 比对失败
+                commission.setStatus("2");
+                commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
+            }
         }
 
         // 保存来佣数据
@@ -184,8 +190,8 @@ public class ApiCommissionController {
     @Operation(summary = "创建保单来佣")
     @PostMapping("/add")
     public Result<Boolean> addCommission(@RequestBody CommissionAddRequest customerAddRequest, HttpServletRequest request) {
-        if (customerAddRequest == null) {
-            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
+        if (customerAddRequest == null || StringUtils.isBlank(customerAddRequest.getPolicyNo())) {
+            return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "保单号不能为空");
         }
         return Result.success(commissionService.addCommission(customerAddRequest));
     }

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

@@ -151,6 +151,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             CommissionExpected commissionExpected = new CommissionExpected();
             BeanUtils.copyProperties(addDto, commissionExpected);
 
+            // 校验参数
+            validCommissionExpected(commissionExpected, true);
+
             if (StringUtils.isBlank(addDto.getCommissionExpectedBizId())) {
                 // 生成新单编号
                 commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));

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

@@ -103,6 +103,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             // 对比预计来佣
             compareWithExpected(commission, commissionExpected);
             commissionExpectedService.updateById(commissionExpected);
+        } else {
+            // 预计来佣不存在，来佣状态设置为 比对失败
+            commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
+            commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
         }
 
         // 获取当前登录用户
@@ -221,7 +225,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             // 对比预计来佣
             compareWithExpected(commission, commissionExpected);
             commissionExpectedService.updateById(commissionExpected);
+        } else {
+            // 预计来佣不存在，来佣状态设置为 比对失败
+            commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
+            commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
         }
+
         commission.setCreatorId(loginUserId);
         commission.setCreateTime(new Date());
         commission.setUpdaterId(loginUserId);
@@ -248,10 +257,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
                 expected.setStatus(CommissionExpectedStatusEnum.PARTIAL.getItemValue());
             }
-        } else {
-            // 预计来佣不存在，来佣状态设置为 比对失败
-            commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
-            commission.setRemark("预计来佣不存在，来佣状态设置为 比对失败");
         }
     }
 }