新单跟进v2

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

@@ -496,21 +496,23 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (StringUtils.isNotBlank(productLaunchBizId)) {
         if (StringUtils.isNotBlank(productLaunchBizId)) {
             List<ApiExpectedSpeciesListResponse> expectedSpeciesList = queryExpectedSpeciesByFeign(productLaunchBizId);
             List<ApiExpectedSpeciesListResponse> expectedSpeciesList = queryExpectedSpeciesByFeign(productLaunchBizId);
 
 
-            log.info("productLaunchBizId:{}, 查询到的佣金规格列表:{}", productLaunchBizId, expectedSpeciesList);
-
             List<CommissionExpected> commissionExpectedList = new ArrayList<>();
             List<CommissionExpected> commissionExpectedList = new ArrayList<>();
             if (CollUtil.isNotEmpty(expectedSpeciesList)) {
             if (CollUtil.isNotEmpty(expectedSpeciesList)) {
-                // 计算佣金总期数 list 中 endPeriod最大值
-                Integer maxEndPeriod = expectedSpeciesList.stream()
-                        .map(item -> Convert.toInt(item.getEndPeriod()))
-                        .max(Integer::compareTo)
-                        .orElse(0);
-
                 // 根据供款年期匹配规格
                 // 根据供款年期匹配规格
                 List<ApiExpectedSpeciesListResponse> collect = expectedSpeciesList.stream()
                 List<ApiExpectedSpeciesListResponse> collect = expectedSpeciesList.stream()
                         .filter(i -> paymentTerm.equals(i.getPaymentTerm()))
                         .filter(i -> paymentTerm.equals(i.getPaymentTerm()))
                         .collect(Collectors.toList());
                         .collect(Collectors.toList());
 
 
+                if (ObjectUtils.isEmpty(collect)) {
+                    throw new BusinessException(ResultCode.FAIL.getCode(), "未查询到对应供款年期的佣金规格");
+                }
+
+                // 计算佣金总期数 list 中 endPeriod最大值
+                Integer maxEndPeriod = collect.stream()
+                        .map(item -> Convert.toInt(item.getEndPeriod()))
+                        .max(Integer::compareTo)
+                        .orElse(0);
+
                 for (ApiExpectedSpeciesListResponse item : collect) {
                 for (ApiExpectedSpeciesListResponse item : collect) {
                     CommissionExpected commissionExpected = new CommissionExpected();
                     CommissionExpected commissionExpected = new CommissionExpected();
                     commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
                     commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));