修改了合并遇到的问题

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/component/BoHaiCrawlerRequestComponent.java

@@ -353,8 +353,8 @@ public class BoHaiCrawlerRequestComponent {
      * @param headers                请求头
      * @return BoHaiCrawlerCarResponse 车型列表
      */
-    public BoHaiCrawlerCarResponse car(BoHaiCrawlerCarRequest boHaiCrawlerCarRequest, HttpHeaders headers) {
-        return executeRequest(RequestType.ENCRYPTED, RequestUrl.CAR, boHaiCrawlerCarRequest, BoHaiCrawlerCarResponse.class, headers);
+    public BoHaiCrawlerCarApiResponse car(BoHaiCrawlerCarRequest boHaiCrawlerCarRequest, HttpHeaders headers) {
+        return executeRequest(RequestType.ENCRYPTED, RequestUrl.CAR, boHaiCrawlerCarRequest, BoHaiCrawlerCarApiResponse.class, headers);
     }
 
     /**
@@ -375,8 +375,8 @@ public class BoHaiCrawlerRequestComponent {
      * @param headers
      * @return BoHaiCrawlerQuotationResponse
      */
-    public BoHaiCrawlerQuotationResponse quotation(BoHaiCrawlerQuotationRequest2 boHaiCrawlerQuotationRequest2, HttpHeaders headers) {
-        return executeRequest(RequestType.ENCRYPTED, RequestUrl.PRICE, boHaiCrawlerQuotationRequest2, BoHaiCrawlerQuotationResponse.class, headers);
+    public BoHaiCrawlerQuotationResponse2 quotation(BoHaiCrawlerQuotationRequest2 boHaiCrawlerQuotationRequest2, HttpHeaders headers) {
+        return executeRequest(RequestType.ENCRYPTED, RequestUrl.PRICE, boHaiCrawlerQuotationRequest2, BoHaiCrawlerQuotationResponse2.class, headers);
     }
 
     /**
@@ -482,7 +482,7 @@ public class BoHaiCrawlerRequestComponent {
         //分类代码（重要）
         batchInfo.setAppCode("CXCB_TB");
         batchInfo.setAppName("车险投保资料");
-        batchInfo.setBusiNo(boHaiCrawlerImageUploadRequest.getOrderNo());
+        batchInfo.setBusiNo(boHaiCrawlerImageUploadRequest.getBaseParam().getOrderNo());
 
         // 构建页面列表
         List<BoHaiCrawlerImageUploadSubmitRequest.PageInfo> pagelist = new ArrayList<>();

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson2.JSON;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.config.WebClientConfig;
+import com.jzg.quotation.commons.entity.CookiesRequest;
 import com.jzg.quotation.commons.utils.RequestObjectConversion;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -219,6 +220,15 @@ public class RequestComponent {
         webClient.post().uri(url).headers(setHeaders(headers)).body(BodyInserters.fromValue(body)).retrieve();
     }
 
+    public <Response> ResponseEntity<Response> chengTaiGet(String url, Object initDataRequest,ParameterizedTypeReference<Response> bodyTypeReference, HttpHeaders headers) {
+        return webClient.get()
+                .uri(url)
+                .headers(setHeaders(headers))
+                .retrieve()
+                .toEntity(bodyTypeReference)
+                .block();
+    }
+
     /**
      * 异步GET 请求 不需要处理结果
      *
@@ -292,6 +302,39 @@ public class RequestComponent {
         return get(url, param, description, responseClass, new HttpHeaders());
     }
 
+    /**
+     * 太平洋请求加cookie
+     * @param url
+     * @param body
+     * @param headers
+     * @param cookiesRequest
+     * @return
+     */
+    public <Response> ResponseEntity<Response> postCookie(String url, String body, Class<Response> responseClass, HttpHeaders headers, CookiesRequest cookiesRequest) {
+        if (log.isDebugEnabled()) {
+            log.debug("request body is {}", body);
+        }
+        System.out.println("request body is {"+body+"}");
+        body = Optional.ofNullable(body).orElse("");
+        WebClient webClient = selectWebClient(url);
+        try {
+            return webClient.post()
+                    .uri(url)
+                    .headers(setHeaders(headers))
+                    .cookie("route",cookiesRequest.getRoute())
+                    .cookie("JSESSIONID", cookiesRequest.getJsessionId())
+                    .body(BodyInserters.fromValue(body))
+                    .retrieve()
+                    .toEntity(responseClass)
+                    .block();
+        } catch (WebClientResponseException e) {
+            // 如果服务端返回非2xx状态码
+            System.err.println("状态码: " + e.getRawStatusCode());
+            System.err.println("响应体: " + e.getResponseBodyAsString());
+            throw e;
+        }
+    }
+
     /**
      * 构造post请求
      *
@@ -722,6 +765,20 @@ public class RequestComponent {
         return formData(url, multiValueMap, responseClass, headers);
     }
 
+    public <Response> ResponseEntity<Response> formData(String url, Object body, ParameterizedTypeReference<Response> bodyTypeReference, HttpHeaders headers) {
+        WebClient webClient = selectWebClient(url);
+        MultiValueMap<String, Object> multiValueMap = RequestObjectConversion.convertMultiValueMap(body);
+        return webClient.post()
+                .uri(url)
+                .headers(RequestComponent.setHeaders(headers))
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                .body(BodyInserters.fromMultipartData(multiValueMap))
+                .retrieve()
+                .toEntity(bodyTypeReference).doOnNext(responseBody -> System.out.println("响应内容: " + responseBody.getBody()))
+                .block();
+
+    }
+
     /**
      * 下载文件处理
      *

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -26,6 +26,7 @@ import com.jzg.quotation.summary.factory.decorator.quote.QuoteRestrictDecorator;
 import com.jzg.quotation.summary.service.*;
 import io.minio.MinioClient;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class CompanyFactory {
 
     @Autowired