push

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

@@ -28,6 +28,7 @@ import com.yd.csf.service.dto.BeneficiaryDto;
 import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
+import com.yd.insurance.base.feign.client.insurancecompany.ApiInsuranceCompanyFeignClient;
 import com.yd.oss.feign.client.ApiExcelFeignClient;
 import com.yd.oss.feign.client.ApiPdfFeignClient;
 import com.yd.oss.feign.enums.TemplateTypeEnum;
@@ -94,6 +95,9 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
     private ApiProductLaunchFeignClient apiProductLaunchFeignClient;
 
     @Autowired
+    private ApiInsuranceCompanyFeignClient apiInsuranceCompanyFeignClient;
+
+    @Autowired
     private RedisUtil redisUtil;
 
     /**
@@ -386,12 +390,16 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
             response.setApiAppointmentInfoDto(apiAppointmentInfoDto);
 
             //设置产品计划主信息
+            //调用 convertExcelPlanName 获取产品ID映射
+            List<ApiConvertExcelPlanNameDto> convertList = convertExcelPlanName(appointmentDto);
             ApiProductPlanInfoDto apiProductPlanInfoDto = new ApiProductPlanInfoDto();
             ApiProductPlanMainInfoDto apiProductPlanMainInfoDto = new ApiProductPlanMainInfoDto();
             apiProductPlanMainInfoDto = ApiExcelImportAppointmentDto.buildApiProductPlanMainInfoDto(appointmentDto,apiProductPlanMainInfoDto,dictTypeResponses);
-            apiProductPlanInfoDto.setApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
             //设置产品附加计划（附加险列表）
             List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList = ApiExcelImportAppointmentDto.buildApiProductPlanAdditionalInfoDto(appointmentDto.getAdditionalDtoList(),dictTypeResponses);
+            settingProductId(apiProductPlanMainInfoDto,apiProductPlanAdditionalInfoDtoList,convertList);
+
+            apiProductPlanInfoDto.setApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
             apiProductPlanInfoDto.setApiProductPlanAdditionalInfoDtoList(apiProductPlanAdditionalInfoDtoList);
             response.setApiProductPlanInfoDto(apiProductPlanInfoDto);
 
@@ -425,6 +433,35 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
         }
     }
 
+    public void settingProductId(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto,
+                                 List<ApiProductPlanAdditionalInfoDto> apiProductPlanAdditionalInfoDtoList,
+                                 List<ApiConvertExcelPlanNameDto> convertList) {
+        if (!CollectionUtils.isEmpty(convertList)) {
+            ApiConvertExcelPlanNameDto convertDto = convertList.get(0); // 只有一个元素
+
+            // 2. 更新主计划信息中的 productLaunchBizId
+            if (StringUtils.isNotBlank(convertDto.getMainPlanId())) {
+                apiProductPlanMainInfoDto.setProductLaunchBizId(convertDto.getMainPlanId());
+                // 也可以将产品名称设置为原始名称（或转换后的名称）
+                apiProductPlanMainInfoDto.setProductLaunchMainName(convertDto.getMainPlanName());
+            }
+
+            // 3. 更新附加计划列表中的 productLaunchBizId（假设有附加险列表）
+            if (!CollectionUtils.isEmpty(apiProductPlanAdditionalInfoDtoList)) {
+                // 第一个附加险
+                if (apiProductPlanAdditionalInfoDtoList.size() >= 1 && StringUtils.isNotBlank(convertDto.getAddPlanId1())) {
+                    apiProductPlanAdditionalInfoDtoList.get(0).setProductLaunchBizId(convertDto.getAddPlanId1());
+                    apiProductPlanAdditionalInfoDtoList.get(0).setProductLaunchName(convertDto.getAddPlanName1());
+                }
+                // 第二个附加险
+                if (apiProductPlanAdditionalInfoDtoList.size() >= 2 && StringUtils.isNotBlank(convertDto.getAddPlanId2())) {
+                    apiProductPlanAdditionalInfoDtoList.get(1).setProductLaunchBizId(convertDto.getAddPlanId2());
+                    apiProductPlanAdditionalInfoDtoList.get(1).setProductLaunchName(convertDto.getAddPlanName2());
+                }
+            }
+        }
+    }
+
     /**
      * 远程调用feign-根据Excel解析的数据-转换产品计划名称和ID
      * @param appointmentDto