新单跟进v2

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

@@ -486,6 +486,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (effectiveDate == null) {
         if (effectiveDate == null) {
             throw new BusinessException("保单生效日期不能为空");
             throw new BusinessException("保单生效日期不能为空");
         }
         }
+        Object paymentTerm = policy.getPaymentTerm();
+        if (paymentTerm == null) {
+            throw new BusinessException("保单供款年期不能为空");
+        }
         //查询redis缓存的字典列表信息
         //查询redis缓存的字典列表信息
         List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
         List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
 
 
@@ -499,7 +503,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                         .max(Integer::compareTo)
                         .max(Integer::compareTo)
                         .orElse(0);
                         .orElse(0);
 
 
-                for (ApiExpectedSpeciesListResponse item : expectedSpeciesList) {
+                // 根据供款年期匹配规格
+                List<ApiExpectedSpeciesListResponse> collect = expectedSpeciesList.stream()
+                        .filter(i -> paymentTerm.equals(i.getPaymentTerm()))
+                        .collect(Collectors.toList());
+
+                for (ApiExpectedSpeciesListResponse item : collect) {
                     CommissionExpected commissionExpected = new CommissionExpected();
                     CommissionExpected commissionExpected = new CommissionExpected();
                     commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
                     commissionExpected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
                     commissionExpected.setReceivableNo(receivableService.generateReceivableNo("R", reconciliationCompanyCode, reconciliationCompany));
                     commissionExpected.setReceivableNo(receivableService.generateReceivableNo("R", reconciliationCompanyCode, reconciliationCompany));