push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -237,11 +237,23 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         if (policyFollow != null) {
         if (policyFollow != null) {
             ApiAnnouncementCommissionRatioListRequest ratioListRequest = new ApiAnnouncementCommissionRatioListRequest();
             ApiAnnouncementCommissionRatioListRequest ratioListRequest = new ApiAnnouncementCommissionRatioListRequest();
             ratioListRequest.setEffectiveDate(policyFollow.getEffectiveDate());
             ratioListRequest.setEffectiveDate(policyFollow.getEffectiveDate());
-            ratioListRequest.setPaymentTerm(policyFollow.getIssueNumber().toString());
+            ratioListRequest.setPaymentTerm(policyFollow.getIssueNumber().toString()); // 保留原有过滤条件（可根据业务决定是否需要）
             ratioListRequest.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
             ratioListRequest.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
             Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = ratioFeignClient.list(ratioListRequest);
             Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = ratioFeignClient.list(ratioListRequest);
             if (listResult != null && !CollectionUtils.isEmpty(listResult.getData())) {
             if (listResult != null && !CollectionUtils.isEmpty(listResult.getData())) {
-                paymentTerm = listResult.getData().size();
+                // 取 endPeriod 的最大值作为总期数
+                paymentTerm = listResult.getData().stream()
+                        .map(item -> {
+                            try {
+                                return Integer.parseInt(item.getEndPeriod()); // 将字符串转为整数
+                            } catch (NumberFormatException e) {
+                                // 若转换失败，记录日志并返回0，避免影响最大值计算
+                                log.warn("endPeriod 格式错误: {}", item.getEndPeriod());
+                                return 0;
+                            }
+                        })
+                        .max(Integer::compareTo)
+                        .orElse(0); // 若无有效值，默认0
             }
             }
         }
         }