测试查询订单状态和下载电子保单接口

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -78,6 +78,16 @@ public class OrderBase implements Serializable {
      */
     private String agreementId;
 
+    /**
+     * 开始时间(针对紫金保司的订单查询接口)
+     */
+    private String updateTimeBegin;
+
+    /**
+     * 结束时间(针对紫金保司的订单查询接口)
+     */
+    private String updateTimeEnd;
+
     /**
      * 获取保险公司编码
      * @return 保险公司编码

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

@@ -148,15 +148,11 @@ public class RequestComponent {
     /**
      * 设置请求头
      *
-     * @param headers 请求头
+     * @param headers
      * @return Consumer<HttpHeaders>
      */
     public static Consumer<HttpHeaders> setHeaders(HttpHeaders headers) {
         return httpHeaders -> {
-            httpHeaders.add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36");
-            httpHeaders.add(HttpHeaders.ACCEPT, "application/json,text/html,text/json,*/*");
-            httpHeaders.add(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9");
-            httpHeaders.add(HttpHeaders.CACHE_CONTROL, "no-cache");
             if (headers != null) {
                 httpHeaders.addAll(headers);
             }
@@ -303,7 +299,7 @@ public class RequestComponent {
      */
     public <Response> ResponseEntity<Response> post(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
         body = Optional.ofNullable(body).orElse("");
-        //log.info("URL的值：{},body的值：{}", url, body);
+        log.info("URL的值：{},body的值：{}", url, body);
         WebClient webClient = selectNoSSLWebClient();
         try {
             // 创建一个不带Accept-Encoding的请求头，避免服务器返回压缩数据
@@ -318,14 +314,10 @@ public class RequestComponent {
             ResponseEntity<String> rawResponse = webClient.post()
                     .uri(url)
                     .headers(setHeaders(requestHeaders))
-                    .header(HttpHeaders.ACCEPT, "application/json,text/html,text/json,*/*")
-                    .header(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9")
-                    .header(HttpHeaders.CACHE_CONTROL, "no-cache")
                     .body(BodyInserters.fromValue(body))
                     .retrieve()
                     .toEntity(String.class)
                     .block();
-
             if (rawResponse == null) {
                 throw new WebClientResponseException(
                     500,
@@ -380,6 +372,31 @@ public class RequestComponent {
         }
     }
 
+
+    /**
+     * 构造post请求
+     *
+     * @param url
+     * @param body
+     * @param responseClass
+     * @param headers
+     * @return ResponseEntity<Response>
+     * @param <Response>
+     */
+    public <Response> ResponseEntity<Response> postWithMono(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
+        WebClient webClient = selectNoSSLWebClient();
+        return webClient.post()
+                .uri(url)
+                .contentType(MediaType.APPLICATION_JSON)
+                .headers(setHeaders(headers))
+                .bodyValue(body)
+                .retrieve()
+                .toEntity(responseClass)
+                .block();
+    }
+
+
+
     /**
      * 构造post请求
      *

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/OrderOperationLogAspect.java

@@ -102,7 +102,7 @@ public class OrderOperationLogAspect {
                 // 通过 SpEL 提取 入参
                 DownloadPolicyVo downloadPolicyVo = parser.parseExpression(log.orderSpEl()).getValue(context, DownloadPolicyVo.class);
                 result = joinPoint.proceed();
-                this.downloadLog("orderId",result,log);
+                this.downloadLog("1988155511437271040",result,log);
                 break;
             // 同步订单
             case 9:

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -486,6 +486,7 @@ public class UnifyOrderManager {
 
             InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(insOrders.getId());
             orderStatusVo.setInsOrdersPolicy(insOrdersPolicy);
+            // 调用保司服务查询订单状态
             OrderStatusResultVo orderStatusResultVo = orderStatusService.queryOrderState(orderStatusVo);
 
             // 保存状态查询结果
@@ -516,17 +517,21 @@ public class UnifyOrderManager {
     public HttpResult downloadPolicy(@RequestBody DownloadPolicyVo downloadPolicyVo) throws IOException {
         //获取保司实体
         InsOrders insOrders = insOrdersService.getById(downloadPolicyVo.getOrder().getOrdersNo());
+        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
+
         InsOrdersCarInfo carInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
         InsOrdersCosts costs = insOrdersCostsService.getById(insOrders.getId());
         InsOrdersPdfUrl insOrdersPdfUrl = insOrdersPdfUrlService.getPdfUrlByOrderNo(insOrders.getId());
-        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
         downloadPolicyVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));
         downloadPolicyVo.getOrder().setInsuranceCompanyCode(insOrders.getCompanyId());
         QuotationBaseService downloadPolicyService = companyFactory.getDownloadPolicyService(downloadPolicyVo, insOrders);
 
         //如果pdf 查不到数据 就去下载
         if (Objects.isNull(insOrdersPdfUrl)) {
+            //下载电子保单
             DownloadPolicyResultVo downloadPolicyResultVo = downloadPolicyService.downloadPolicy(downloadPolicyVo);
+            log.info("downloadPolicyResultVo对象的值：{}", JSON.toJSONString(downloadPolicyResultVo));
+
             if (Objects.nonNull(downloadPolicyResultVo.getJqUrl()) || Objects.nonNull(downloadPolicyResultVo.getJqFlagUrl()) || Objects.nonNull(downloadPolicyResultVo.getSyUrl()) || Objects.nonNull(downloadPolicyResultVo.getJyUrl())) {
                 insOrdersPdfUrl = new InsOrdersPdfUrl();
                 insOrdersPdfUrl.setOrderNo(insOrders.getId());

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

@@ -250,11 +250,20 @@ public class CompanyFactory {
         return service;
     }
 
+    /**
+     * 根据保司编码获取订单状态请求基类
+     * @param orderStatusVo
+     * @param insOrdersService
+     * @param baseController
+     * @return QuotationBaseService
+     */
     public QuotationBaseService getOrderStatusService(OrderStatusVo orderStatusVo, InsOrdersService insOrdersService, BaseController baseController) {
-
         //设置归属信息
         String token = baseController.getToken();
+        log.info("token的值：{}",token);
         String systemCode = baseController.getAppSystemCode();
+        log.info("systemCode的值：{}",systemCode);
+
         HttpResult<PtlAgreementAttribution> agreementAttribution = platformClient.getAgreementAttribution(orderStatusVo.getOrder()
                 .getAgreementId(), token, systemCode);
         AssertionUtils.isFail(agreementAttribution.getCode() == 500, "获取协议属性失败");

tenant/insurance/quotation-summary/src/test/java/com/jzg/quotation/taikang/crawler/service/TKQuotationBaseServiceImplTest.java

@@ -1,12 +1,9 @@
 package com.jzg.quotation.taikang.crawler.service;
-import com.google.common.collect.Lists;
-
 import com.alibaba.fastjson2.JSONObject;
 import com.jzg.quotation.huanong.crawler.entity.po.HuaNongCrawlerOrder;
 import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerLoginResponse;
 import com.jzg.quotation.huanong.crawler.repository.HuaNongCrawlerOrderRepository;
 import com.jzg.quotation.summary.SummaryQuotationApplication;
-import com.jzg.quotation.taikang.crawler.service.impl.TKQuotationBaseServiceImpl;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.redisson.api.RMap;

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/component/ZiJinCrawlerRequestComponent.java

@@ -335,10 +335,11 @@ public class ZiJinCrawlerRequestComponent {
      */
     public ZiJinCrawlerQueryOrderStatusResponse queryOrderStatus(ZiJinCrawlerQueryOrderStatusRequest ziJinCrawlerQueryOrderStatusRequest, HttpHeaders headers) throws IOException {
         //设置headers
-        HttpHeaders httpHeaders = setHttpHeaders();
+        HttpHeaders httpHeaders = setHttpHeaders1();
+
         String jsonString = JSON.toJSONString(ziJinCrawlerQueryOrderStatusRequest);
-        ResponseEntity<ZiJinCrawlerQueryOrderStatusResponse> responseEntity = requestComponent.post(RequestUrl.QUERY_ORDER_STATUS.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), ziJinCrawlerQueryOrderStatusRequest,
-                ZiJinCrawlerQueryOrderStatusResponse.class, httpHeaders);
+        log.info("ziJinCrawlerQueryOrderStatusRequest请求参数的值：{}", jsonString);
+        ResponseEntity<ZiJinCrawlerQueryOrderStatusResponse> responseEntity = requestComponent.post(RequestUrl.QUERY_ORDER_STATUS.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerQueryOrderStatusResponse.class, httpHeaders);
         return responseEntity.getBody();
     }
 
@@ -400,14 +401,15 @@ public class ZiJinCrawlerRequestComponent {
      * 查询车辆保单列表（下载保单的前一步操作）
      *
      * @param ziJinCrawlerQueryCarPolicyListRequest
-     * @param headers
      * @return ZiJinCrawlerQueryCarPolicyListResponse
      */
-    public ZiJinCrawlerQueryCarPolicyListResponse queryCarPolicyList(ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest, HttpHeaders headers) throws IOException {
+    public ZiJinCrawlerQueryCarPolicyListResponse queryCarPolicyList(ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest) throws IOException {
         //设置headers
-        HttpHeaders httpHeaders = setHttpHeaders();
+        HttpHeaders httpHeaders = setHttpHeaders1();
+
         String jsonString = JSON.toJSONString(ziJinCrawlerQueryCarPolicyListRequest);
-        ResponseEntity<ZiJinCrawlerQueryCarPolicyListResponse> responseEntity = requestComponent.post(RequestUrl.QUERY_CAR_POLICY_LIST.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerQueryCarPolicyListResponse.class, httpHeaders);
+        log.info("ziJinCrawlerQueryCarPolicyListRequest请求参数的值：{}", jsonString);
+        ResponseEntity<ZiJinCrawlerQueryCarPolicyListResponse> responseEntity = requestComponent.postWithMono(RequestUrl.QUERY_CAR_POLICY_LIST.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerQueryCarPolicyListResponse.class, httpHeaders);
         return responseEntity.getBody();
     }
 
@@ -419,10 +421,12 @@ public class ZiJinCrawlerRequestComponent {
      * @param headers 请求头
      * @return ZiJinCrawlerDownloadResponse
      */
-    public ZiJinCrawlerDownloadPolicyResponse electronPolicyIODownload(ZiJinCrawlerDownloadPolicyRequest ziJinCrawlerDownloadPolicyRequest, HttpHeaders headers) throws IOException {
+    public ZiJinCrawlerDownloadPolicyResponse electronPolicyIODownload(ZiJinCrawlerDownloadPolicyRequest ziJinCrawlerDownloadPolicyRequest) throws IOException {
         //设置headers
         HttpHeaders httpHeaders = setHttpHeaders();
+
         String jsonString = JSON.toJSONString(ziJinCrawlerDownloadPolicyRequest);
+        log.info("ziJinCrawlerDownloadPolicyRequest请求参数的值：{}", jsonString);
         ResponseEntity<ZiJinCrawlerDownloadPolicyResponse> responseEntity = requestComponent.post(RequestUrl.ELECTRON_POLICY_IO_DOWNLOAD.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerDownloadPolicyResponse.class, httpHeaders);
         return responseEntity.getBody();
     }
@@ -450,7 +454,7 @@ public class ZiJinCrawlerRequestComponent {
     @NotNull
     private static HttpHeaders setHttpHeaders() throws IOException {
         HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
+        //headers.setContentType(MediaType.APPLICATION_JSON);
         //获取cookie的值
         String cookie = getCookie();
         headers.set("Cookie", cookie);
@@ -478,4 +482,18 @@ public class ZiJinCrawlerRequestComponent {
         headers.set("x-csrf-token", "CrwLEmSfUevAb8PcN7kXff-I");
         return headers;
     }
+
+    @NotNull
+    private HttpHeaders setHttpHeaders1(){
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            String cookie = getCookie();
+            headers.set("Cookie", cookie);
+            headers.set("Authorization", "E1653AC37F6F75C3C3B469BD01C825E5");
+            headers.set("loginToken", "E1653AC37F6F75C3C3B469BD01C825E5");
+            return headers;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerQueryCarPolicyListRequest.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.zijin.crawler.entity.request;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -26,60 +27,70 @@ public class ZiJinCrawlerQueryCarPolicyListRequest implements Serializable {
      * 录入日期-开始日期
      */
     @JsonProperty("inputDateBegin")
+    @JSONField(ordinal = 1)
     private String inputDateBegin;
 
     /**
      * 录入日期-结束日期
      */
     @JsonProperty("inputDateEnd")
+    @JSONField(ordinal = 2)
     private String inputDateEnd;
 
     /**
      * 当前页码（从0开始）
      */
     @JsonProperty("pageNo")
+    @JSONField(ordinal = 3)
     private String pageNo;
 
     /**
      * 每页数量
      */
     @JsonProperty("pageSize")
+    @JSONField(ordinal = 4)
     private String pageSize;
 
     /**
      * 登录机构代码（查询权限所属机构）
      */
     @JsonProperty("loginComCode")
+    @JSONField(ordinal = 5)
     private String loginComCode;
 
     /**
      * 电子保单状态查询开关（1-启用，0-不启用）
      */
     @JsonProperty("elePolicyStatusQuery")
+    @JSONField(ordinal = 6)
     private String elePolicyStatusQuery;
 
     /**
      * 保单状态列表（多状态查询）
      */
     @JsonProperty("policyStatus")
+    @JSONField(ordinal = 7)
     private List<String> policyStatus;
 
     /**
      * 险种编码列表（空数组表示查询所有险种）
      */
     @JsonProperty("riskCodeList")
+    @JSONField(ordinal = 8)
     private List<String> riskCodeList;
 
     /**
      * 已支付且未生效保单查询开关（1-查询已支付但未起保的保单，0-不查询）
      */
     @JsonProperty("paidAndIneffectiveSwitch")
+    @JSONField(ordinal = 9)
     private String paidAndIneffectiveSwitch;
 
     /**
      * 调用系统编码（标识请求来源系统，0201可能代表某个具体业务系统）
      */
     @JsonProperty("invokeSystem")
+    @JSONField(ordinal = 10)
     private String invokeSystem;
 
 }

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerQueryOrderStatusRequest.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.zijin.crawler.entity.request;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -25,48 +26,55 @@ public class ZiJinCrawlerQueryOrderStatusRequest implements Serializable {
      * 订单状态列表（空数组表示查询所有状态）
      */
     @JsonProperty("orderStatus")
+    @JSONField(ordinal = 1)
     private String[] orderStatus;
 
     /**
-     * 订单号
+     * 保司的订单号
      */
     @JsonProperty("orderNo")
+    @JSONField(ordinal = 2)
     private String orderNo;
 
     /**
      * 更新时间-开始日期
      */
     @JsonProperty("updateTimeBegin")
+    @JSONField(ordinal = 3)
     private String updateTimeBegin;
 
     /**
      * 更新时间-结束日期
      */
     @JsonProperty("updateTimeEnd")
+    @JSONField(ordinal = 4)
     private String updateTimeEnd;
 
     /**
      * 当前页码
      */
     @JsonProperty("pageNum")
+    @JSONField(ordinal = 5)
     private Integer pageNum;
 
     /**
      * 每页数量
      */
     @JsonProperty("pageSize")
+    @JSONField(ordinal = 6)
     private Integer pageSize;
 
     /**
      * 产品编码列表（空数组表示查询所有产品）
      */
     @JsonProperty("productCodeList")
+    @JSONField(ordinal = 7)
     private String[] productCodeList;
 
     /**
      * 订单来源
      */
     @JsonProperty("orderOrigin")
+    @JSONField(ordinal = 8)
     private String orderOrigin;
-
 }

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/response/ZiJinCrawlerQueryCarPolicyListResponse.java

@@ -35,10 +35,19 @@ public class ZiJinCrawlerQueryCarPolicyListResponse implements Serializable {
     private String rtnMsg;
 
     /**
-     * 数据对象
+     * 响应数据
      */
     @JsonProperty("data")
-    private PolicyDataInfoDtoList data;
+    private CarPolicyData data;
+
+    @Data
+    public static class CarPolicyData {
+        /**
+         * 保单数据信息DTO列表
+         */
+        @JsonProperty("policyDataInfoDtoList")
+        private PolicyDataInfoDtoList policyDataInfoDtoList;
+    }
 
     // 内部类：保单数据信息列表DTO
     @NoArgsConstructor

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerRequestImpl.java

@@ -321,6 +321,52 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
         }
     }
 
+    /**
+     * 查询订单状态
+     *
+     * @param orderStatusVo
+     * @return OrderStatusResultVo
+     */
+    @Override
+    public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
+        try {
+            AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
+            HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(orderStatusVo.getOrder().getOrdersNo());
+
+            ZiJinCrawlerQueryOrderStatusRequest ziJinCrawlerQueryOrderStatusRequest = new ZiJinCrawlerQueryOrderStatusRequest();
+            // 设置请求参数
+            ziJinCrawlerQueryOrderStatusRequest.setOrderStatus(new String[]{});
+            ziJinCrawlerQueryOrderStatusRequest.setOrderNo(ziJinCrawlerOrder.getOrderNo());
+            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeBegin(orderStatusVo.getOrder().getUpdateTimeBegin());
+            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeEnd(orderStatusVo.getOrder().getUpdateTimeEnd());
+            ziJinCrawlerQueryOrderStatusRequest.setPageNum(1);
+            ziJinCrawlerQueryOrderStatusRequest.setPageSize(10);
+            ziJinCrawlerQueryOrderStatusRequest.setProductCodeList(new String[]{});
+            ziJinCrawlerQueryOrderStatusRequest.setOrderOrigin("KSCD_PROD,FH_PROD,DP_WXMP,DP_ZYB,RENEWAL_PROD,DP_ZNCD,SHHTB_B");
+
+            ZiJinCrawlerQueryOrderStatusResponse ziJinCrawlerQueryOrderStatusResponse = ziJinCrawlerRequestComponent.queryOrderStatus(ziJinCrawlerQueryOrderStatusRequest, headers);
+            log.info("ziJinCrawlerQueryOrderStatusResponse对象的值：{}", JSON.toJSONString(ziJinCrawlerQueryOrderStatusResponse));
+            //获取订单状态
+            String orderStatus = ziJinCrawlerQueryOrderStatusResponse.getData().getContent().get(0).getOrderStatus();
+            log.info("订单状态：{},中文含义：{}", orderStatus, ziJinCrawlerQueryOrderStatusResponse.getData().getContent().get(0).getOrderStatusCN());
+            //将保司返回的订单状态转换为系统定义的订单状态枚举类型
+             InsOrderStatusEnum orderStatusEnum = null;
+            if("5".equals(orderStatus)){
+                orderStatusEnum = InsOrderStatusEnum.valueOf("ORDER_CLOSE");
+                orderStatus = orderStatusEnum.getCode();
+            }
+            OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
+            //将订单状态转换为枚举类型
+            orderStatusResultVo.setOrderStatus(orderStatusEnum);
+            orderStatusResultVo.setOrderStatusStr(orderStatus);
+            return orderStatusResultVo;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
 
     /**
      * 下载保单
@@ -331,15 +377,14 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
     @Override
     public DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo downloadPolicyVo) {
         try {
-            //获取归属信息
-            AttributionInformationVo attributionInformationVo = downloadPolicyVo.getOrder().getAttributionInformationVo();
-            HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
             ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(downloadPolicyVo.getOrder().getOrdersNo());
 
             //1、查询车辆保单列表（下载保单的前一步操作）
-            ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest = setQueryCarPolicyListRequest(downloadPolicyVo.getBeginDate(), downloadPolicyVo.getEndDate(), "");
-            ZiJinCrawlerQueryCarPolicyListResponse ziJinCrawlerQueryCarPolicyListResponse = ziJinCrawlerRequestComponent.queryCarPolicyList(ziJinCrawlerQueryCarPolicyListRequest, headers);
-            List<ZiJinCrawlerQueryCarPolicyListResponse.PolicyContent> content = ziJinCrawlerQueryCarPolicyListResponse.getData().getContent();
+            ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest = setQueryCarPolicyListRequest(downloadPolicyVo.getBeginDate(), downloadPolicyVo.getEndDate(), "2140000601");
+            ZiJinCrawlerQueryCarPolicyListResponse ziJinCrawlerQueryCarPolicyListResponse = ziJinCrawlerRequestComponent.queryCarPolicyList(ziJinCrawlerQueryCarPolicyListRequest);
+            log.info("ziJinCrawlerQueryCarPolicyListResponse响应对象的值：{}", JSON.toJSONString(ziJinCrawlerQueryCarPolicyListResponse));
+
+            List<ZiJinCrawlerQueryCarPolicyListResponse.PolicyContent> content = ziJinCrawlerQueryCarPolicyListResponse.getData().getPolicyDataInfoDtoList().getContent();
             //获取所有的保单号
             List<String> policyNos = content.stream().map(ZiJinCrawlerQueryCarPolicyListResponse.PolicyContent::getPolicyNo).collect(Collectors.toList());
             //获取所有的加密验证码
@@ -349,15 +394,18 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             for (int i = 0; i < policyNos.size(); i++) {
                 policyNoEncryptMap.put(policyNos.get(i), encryptCodes.get(i));
             }
+            log.info("policyNoEncryptMap的值：{}",policyNoEncryptMap);
             //2、下载保单
             ZiJinCrawlerDownloadPolicyRequest ziJinCrawlerDownloadPolicyRequest = new ZiJinCrawlerDownloadPolicyRequest();
 
             DownloadPolicyResultVo downloadPolicyResultVo = new DownloadPolicyResultVo();
             // 下载交强险保单
             if (StringUtils.hasLength(ziJinCrawlerOrder.getCiPolicyNo())) {
+                log.info("开始下载交强险保单：{}",ziJinCrawlerOrder.getCiPolicyNo());
                 ziJinCrawlerDownloadPolicyRequest.setPolicyNo(ziJinCrawlerOrder.getCiPolicyNo());
                 ziJinCrawlerDownloadPolicyRequest.setEncrypt(policyNoEncryptMap.get(ziJinCrawlerOrder.getCiPolicyNo()));
-                ZiJinCrawlerDownloadPolicyResponse ziJinCrawlerDownloadPolicyResponse = ziJinCrawlerRequestComponent.electronPolicyIODownload(ziJinCrawlerDownloadPolicyRequest, headers);
+                ZiJinCrawlerDownloadPolicyResponse ziJinCrawlerDownloadPolicyResponse = ziJinCrawlerRequestComponent.electronPolicyIODownload(ziJinCrawlerDownloadPolicyRequest);
+                log.info("ziJinCrawlerDownloadPolicyResponse响应对象的值：{}", JSON.toJSONString(ziJinCrawlerDownloadPolicyResponse));
                 // 设置交强险标志地址
                 downloadPolicyResultVo.setJqFlagUrl(ziJinCrawlerDownloadPolicyResponse.getData().getElePolicyDownloadInfoDtoList().get(0).getDownloadPath());
                 // 设置交强险保单地址
@@ -366,9 +414,12 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
 
             // 下载商业险保单
             if (StringUtils.hasLength(ziJinCrawlerOrder.getBiPolicyNo())) {
+                log.info("开始下载商业险保单：{}",ziJinCrawlerOrder.getBiPolicyNo());
                 ziJinCrawlerDownloadPolicyRequest.setPolicyNo(ziJinCrawlerOrder.getBiPolicyNo());
                 ziJinCrawlerDownloadPolicyRequest.setEncrypt(policyNoEncryptMap.get(ziJinCrawlerOrder.getBiPolicyNo()));
-                ZiJinCrawlerDownloadPolicyResponse ziJinCrawlerDownloadPolicyResponse = ziJinCrawlerRequestComponent.electronPolicyIODownload(ziJinCrawlerDownloadPolicyRequest, headers);
+                ZiJinCrawlerDownloadPolicyResponse ziJinCrawlerDownloadPolicyResponse = ziJinCrawlerRequestComponent.electronPolicyIODownload(ziJinCrawlerDownloadPolicyRequest);
+                log.info("ziJinCrawlerDownloadPolicyResponse响应对象的值：{}", JSON.toJSONString(ziJinCrawlerDownloadPolicyResponse));
+
                 //设置驾意险保单地址
                 downloadPolicyResultVo.setJyUrl(ziJinCrawlerDownloadPolicyResponse.getData().getElePolicyDownloadInfoDtoList().get(2).getDownloadPath());
                 // 设置商业险保单地址
@@ -382,43 +433,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
     }
 
 
-    /**
-     * 查询订单状态
-     *
-     * @param orderStatusVo
-     * @return OrderStatusResultVo
-     */
-    @Override
-    public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
-        try {
-            AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
-            HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-            ZiJinCrawlerOrder boHaiCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(orderStatusVo.getOrder().getOrdersNo());
-
-            ZiJinCrawlerQueryOrderStatusRequest ziJinCrawlerQueryOrderStatusRequest = new ZiJinCrawlerQueryOrderStatusRequest();
-            // 设置请求参数
-            ziJinCrawlerQueryOrderStatusRequest.setOrderStatus(new String[]{});
-            ziJinCrawlerQueryOrderStatusRequest.setOrderNo(orderStatusVo.getOrder().getOrdersNo());
-            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeBegin("");
-            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeEnd("");
-            ziJinCrawlerQueryOrderStatusRequest.setPageNum(1);
-            ziJinCrawlerQueryOrderStatusRequest.setPageSize(10);
-            ziJinCrawlerQueryOrderStatusRequest.setProductCodeList(new String[]{});
-            ziJinCrawlerQueryOrderStatusRequest.setOrderOrigin("KSCD_PROD,FH_PROD,DP_WXMP,DP_ZYB,RENEWAL_PROD,DP_ZNCD,SHHTB_B");
 
-            ZiJinCrawlerQueryOrderStatusResponse ziJinCrawlerQueryOrderStatusResponse = ziJinCrawlerRequestComponent.queryOrderStatus(ziJinCrawlerQueryOrderStatusRequest, headers);
-            log.info("查询订单状态响应：{}", JSON.toJSONString(ziJinCrawlerQueryOrderStatusResponse));
-            //获取订单状态
-            String orderStatus = ziJinCrawlerQueryOrderStatusResponse.getData().getContent().get(0).getOrderStatus();
-            log.info("订单状态：{},中文含义：{}", orderStatus, ziJinCrawlerQueryOrderStatusResponse.getData().getContent().get(0).getOrderStatusCN());
-            OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
-            orderStatusResultVo.setOrderStatusStr(orderStatus);
-            return orderStatusResultVo;
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
 
     /**
      * 设置查询车险保单列表请求参数

tenant/insurance/quotation-zijin/src/main/resources/js/content.js

@@ -1 +1 @@
-___content ="yU9BReHOscOXziWWhuqWhEqSBLoiQjCA8uMCSeot5IObZ2_xeZU_IxDNkxes4zy7iLvJ5op_p9fNnOQIgHzdvgmbfcRukr_7dWNH24nBKtuDBoMce8pxa.weiRD5CfFUObheFUO5KJvivd.f60rivIHilfox1lQ4a1s7w7dkLtxsfA0.tt6RdgqUai.wvN5s89hy9_EvXjE";
+___content ="dXa0UnQNdekLRE1Oy9ZtSINKqg_W8PGq7NaV3IwX7cTZ1qVwXTTqny0jFVQTc8l3EOj_ec4bTuzB9Q.wuoVrvvRx33iroOZoe.XRBlUQvg6hdvqDJY7midp_w2.sfiTC4X.ovFfLRk.0eoSfCVp6SF57wwGs30adiYO7k5zYinX08Qqv14Vg8odw_EpIQKA104Q4dGsmlUL";