新单跟进121

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

@@ -130,15 +130,16 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         commission.setUpdateTime(new Date());
 
         // 查询预计来佣
-        CommissionExpected commissionExpected = queryByCommission(commission);
-        if (commissionExpected != null) {
+        CommissionExpected commissionExpected;
+        try {
+            commissionExpected = queryByCommission(commission);
             // 对比预计来佣
             compareWithExpected(commission.getPremium(), commission, commissionExpected);
             commissionExpectedService.updateById(commissionExpected);
-        } else {
+        } catch (Exception e) {
             // 预计来佣不存在，来佣状态设置为 比对失败
             commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
-            commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
+            commission.setRemark(e.getMessage());
         }
         return this.updateById(commission);
     }
@@ -223,8 +224,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         queryWrapper.eq("currency", commission.getCurrency());
         CommissionExpected one = commissionExpectedService.getOne(queryWrapper);
         if (ObjectUtils.isEmpty(one)) {
-            log.info("未找到当前来佣对应的预计来佣，policy_no：{}, commission_name：{}, commission_period：{}, currency：{}",
+            String errorMsg = String.format("未找到当前来佣对应的预计来佣，policy_no：%s, commission_name：%s, commission_period：%s, currency：%s",
                     commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency());
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), errorMsg);
         }
         return one;
     }
@@ -437,15 +439,17 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             }
         }
         // 查询预计来佣
-        CommissionExpected commissionExpected = queryByCommission(commission);
-        if (commissionExpected != null) {
+        // 查询预计来佣
+        CommissionExpected commissionExpected;
+        try {
+            commissionExpected = queryByCommission(commission);
             // 对比预计来佣
-            compareWithExpected(commissionAddRequest.getPremium(), commission, commissionExpected);
+            compareWithExpected(commission.getPremium(), commission, commissionExpected);
             commissionExpectedService.updateById(commissionExpected);
-        } else {
+        } catch (Exception e) {
             // 预计来佣不存在，来佣状态设置为 比对失败
             commission.setStatus(CommissionStatusEnum.COMPARE_FAIL.getItemValue());
-            commission.setRemark("未找到当前来佣对应的预计来佣，比对失败");
+            commission.setRemark(e.getMessage());
         }
 
         commission.setCreatorId(loginUserId);