update:

1. 大家财险报价流程梳理

commons/src/main/java/com/jzg/commons/entity/quote/vo/CarInfoVo.java

@@ -250,6 +250,10 @@ public class CarInfoVo implements Serializable {
         return v;
     }
 
+    public String getLimitLoad() {
+        return StringUtils.hasLength(limitLoad) ? limitLoad : "0";
+    }
+
     /**
      * 排量（单位：升(L)，能源种类为燃油时必传
      */

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/component/DaJiaCrawlerRequestComponent.java

@@ -255,6 +255,18 @@ public class DaJiaCrawlerRequestComponent {
         return request(RequestUrl.SAVE, request, DaJiaCrawlerSaveResponse.class, headers);
     }
 
+    /**
+     * 初始化数据
+     *
+     * @param request 初始化数据
+     * @param headers 请求头
+     * @return 初始化数据响应
+     */
+    public DaJiaCrawlerInitDataResponse initData(DaJiaCrawlerInitDataRequest request, HttpHeaders headers) {
+        ResponseEntity<DaJiaCrawlerInitDataResponse> responseEntity = requestComponent.objectPost(RequestUrl.INIT_DATA.getRequestUrl(daJiaCrawlerProperties.getVhlUrl()), request, DaJiaCrawlerInitDataResponse.class, headers);
+        return responseEntity.getBody();
+    }
+
     /**
      * 上传标志
      *

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/constant/enums/RequestUrl.java

@@ -21,10 +21,12 @@ public enum RequestUrl implements CrawlerRequestUrlStandard {
     COMPANIES("/companies", "承保机构"),
     CHANNEL_PACKAGES("/default/package/list", "渠道套餐"),
     // 报价
-    PRICE("price", "报价"),
-    SAVE("save", "保存订单"),
     CAR("car", "车型查询"),
     ACTUAL_VALUE("actualvalue", "计算折旧价格"),
+    PRICE("price", "报价"),
+    SAVE("save", "保存订单"),
+    INIT_DATA("imp/web/page/init_data", "初始化数据"),
+
     //上传影像
     UPLOAD_SIGNS("imp/web/file/upload_signs", "上传标志"),
     UPLOAD("imp/web/file/upload", "上传"),

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/DaJiaCrawlerInitDataRequest.java

@@ -0,0 +1,70 @@
+package com.jzg.quotation.dajia.crawler.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.dajia.crawler.entity.request.quote.BusinessInsuranceDTO;
+import com.jzg.quotation.dajia.crawler.entity.request.quote.CompulsoryInsuranceDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.util.StringUtils;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@NoArgsConstructor
+@Data
+public class DaJiaCrawlerInitDataRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7696042732582461206L;
+
+    @JsonProperty("businessType")
+    private String businessType;
+
+    @JsonProperty("businessNo")
+    private String businessNo;
+
+    @JsonProperty("busiInfoList")
+    private List<BusiInfoListDTO> busiInfoList;
+
+    public DaJiaCrawlerInitDataRequest(CompulsoryInsuranceDTO compulsoryInsurance, BusinessInsuranceDTO businessInsurance) {
+        this.businessType = "XKCXT";
+        this.businessNo = businessNo;
+        this.busiInfoList = new ArrayList<>();
+        // 交强险
+        Optional.ofNullable(compulsoryInsurance)
+                .map(CompulsoryInsuranceDTO::getProductInfo)
+                .map(CompulsoryInsuranceDTO.ProductInfoDTO::getPolicyNo)
+                .filter(StringUtils::hasLength)
+                .ifPresent(x->{
+                    this.busiInfoList.add(new BusiInfoListDTO(x, "proNoE", "交强险投保单号"));
+                });
+        Optional.ofNullable(businessInsurance)
+                .map(BusinessInsuranceDTO::getProductInfo)
+                .map(BusinessInsuranceDTO.ProductInfoDTO::getPolicyNo)
+                .filter(StringUtils::hasLength)
+                .ifPresent(x->{
+                    this.busiInfoList.add(new BusiInfoListDTO(x, "proNoB", "商业险投保单号"));
+                });
+    }
+
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Data
+    public static class BusiInfoListDTO {
+
+        @JsonProperty("bussNo")
+        private String bussNo;
+
+        @JsonProperty("bussType")
+        private String bussType;
+
+        @JsonProperty("bussName")
+        private String bussName;
+
+    }
+
+}

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/DaJiaCrawlerSaveRequest.java

@@ -2,10 +2,12 @@ package com.jzg.quotation.dajia.crawler.entity.request;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.dajia.crawler.entity.request.quote.*;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerPriceResponse;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.util.ObjectUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -90,11 +92,20 @@ public class DaJiaCrawlerSaveRequest implements Serializable {
     @JsonProperty("operatorCode")
     private String operatorCode;
 
-    public DaJiaCrawlerSaveRequest(DaJiaCrawlerPriceResponse crawlerPriceResponse, String operatorCode) {
+    public DaJiaCrawlerSaveRequest(DaJiaCrawlerPriceResponse crawlerPriceResponse, String operatorCode, QuoteVo quoteVo) {
         this.applicantInfo = crawlerPriceResponse.getApplicantInfo();
-        this.businessInsurance = crawlerPriceResponse.getBusinessInsurance();
+        if (!ObjectUtils.isEmpty(quoteVo.getBiRiskInfoVo())) {
+            this.businessInsurance = crawlerPriceResponse.getBusinessInsurance();
+        }else {
+            this.businessInsurance = new BusinessInsuranceDTO();
+        }
         this.checkCarInfomation = crawlerPriceResponse.getCheckCarInfomation();
-        this.compulsoryInsurance = crawlerPriceResponse.getCompulsoryInsurance();
+
+        if (!ObjectUtils.isEmpty(quoteVo.getCiRiskInfoVo())) {
+            this.compulsoryInsurance = crawlerPriceResponse.getCompulsoryInsurance();
+        }else {
+            this.compulsoryInsurance = new CompulsoryInsuranceDTO();
+        }
         this.driveInsurance = crawlerPriceResponse.getDriveInsurance();
         this.jabFamilyDriveInsurance = crawlerPriceResponse.getJabFamilyDriveInsurance();
         this.rqbFamilyDriveInsurance = crawlerPriceResponse.getRqbFamilyDriveInsurance();

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/quote/CheckCarInfomationDTO.java

@@ -54,7 +54,7 @@ public class CheckCarInfomationDTO implements Serializable {
         this.inspectionResult = "";
         this.damagedSite = "";
         this.inspectionTime = "";
-        this.noInspectReason = "";
-        this.checkStatus = "";
+        this.noInspectReason = "383001";
+        this.checkStatus = "0";
     }
 }

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/quote/CompulsoryInsuranceDTO.java

@@ -11,7 +11,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@NoArgsConstructor
 @Data
 public class CompulsoryInsuranceDTO {
 
@@ -47,6 +46,14 @@ public class CompulsoryInsuranceDTO {
         this.specialInfos = List.of();
     }
 
+    public CompulsoryInsuranceDTO() {
+        this.coefficientInfo = new CoefficientInfoDTO();
+        this.carShipTax = new CarShipTaxDTO();
+        this.itemKinds = List.of();
+        this.productInfo = new ProductInfoDTO();
+        this.specialInfos = List.of();
+    }
+
     @NoArgsConstructor
     @Data
     public static class ProductInfoDTO {

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/quote/DriveInsuranceDTO.java

@@ -25,6 +25,11 @@ public class DriveInsuranceDTO implements Serializable {
     @JsonProperty("itemKinds")
     private List<ItemKindsDTO> itemKinds;
 
+    public DriveInsuranceDTO() {
+        this.productInfo = new ProductInfoDTO();
+        this.itemKinds = new ArrayList<>();
+    }
+
     public DriveInsuranceDTO(List<AccidentalDrivingVo> accidentalDrivings) {
         if (!CollectionUtils.isEmpty(accidentalDrivings)) {
             AccidentalDrivingVo accidentalDrivingVo = accidentalDrivings.get(0);

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/quote/VehicleInfoDTO.java

@@ -211,7 +211,7 @@ public class VehicleInfoDTO {
                           DaJiaCrawlerActualValueResponse daJiaCrawlerActualValueResponse,
                           String ownerName) {
         this.pureRange = "";
-        this.approvedLoad = car.getVehicleTonnage();
+        this.approvedLoad = carInfoVo.getLimitLoad();
         this.brand = car.getVehicleName();
         this.brandName = car.getVehicleId();
         this.buyCarDate = "";

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/response/DaJiaCrawlerInitDataResponse.java

@@ -0,0 +1,175 @@
+package com.jzg.quotation.dajia.crawler.entity.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class DaJiaCrawlerInitDataResponse implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7012502024760048805L;
+
+    @JsonProperty("code")
+    private String code;
+
+    @JsonProperty("message")
+    private String message;
+
+    @JsonProperty("data")
+    private DataDTO data;
+
+    @NoArgsConstructor
+    @Data
+    public static class DataDTO implements Serializable {
+
+        @Serial
+        private static final long serialVersionUID = -8706490072836830895L;
+
+        @JsonProperty("app")
+        private AppDTO app;
+
+        @JsonProperty("businessType")
+        private BusinessTypeDTO businessType;
+
+        @JsonProperty("transferConfig")
+        private List<TransferConfigDTO> transferConfig;
+
+        @NoArgsConstructor
+        @Data
+        public static class AppDTO  implements Serializable  {
+
+            @Serial
+            private static final long serialVersionUID = -442538458569530930L;
+
+            @JsonProperty("businessNo")
+            private String businessNo;
+
+            @JsonProperty("appName")
+            private String appName;
+
+            @JsonProperty("appId")
+            private String appId;
+
+            @JsonProperty("businessType")
+            private String businessType;
+
+            @JsonProperty("busiInfoList")
+            private List<BusiInfoListDTO> busiInfoList;
+
+            @NoArgsConstructor
+            @Data
+            public static class BusiInfoListDTO  implements Serializable  {
+
+                @Serial
+                private static final long serialVersionUID = -5238688197616100006L;
+
+                @JsonProperty("bussNo")
+                private String bussNo;
+
+                @JsonProperty("bussType")
+                private String bussType;
+
+                @JsonProperty("bussName")
+                private String bussName;
+            }
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class BusinessTypeDTO implements Serializable  {
+
+            @Serial
+            private static final long serialVersionUID = -5207296415917323496L;
+
+            @JsonProperty("id")
+            private String id;
+
+            @JsonProperty("name")
+            private String name;
+
+            @JsonProperty("appId")
+            private String appId;
+
+            @JsonProperty("defaulted")
+            private Boolean defaulted;
+
+            @JsonProperty("fileCount")
+            private Integer fileCount;
+
+            @JsonProperty("children")
+            private List<ChildrenDTO> children;
+
+            @NoArgsConstructor
+            @Data
+            public static class ChildrenDTO implements Serializable  {
+
+                @Serial
+                private static final long serialVersionUID = 6640654291319567423L;
+
+                @JsonProperty("id")
+                private String id;
+
+                @JsonProperty("name")
+                private String name;
+
+                @JsonProperty("fileCount")
+                private Integer fileCount;
+
+            }
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class TransferConfigDTO implements Serializable  {
+            @Serial
+            private static final long serialVersionUID = -8299761853834329874L;
+
+            @JsonProperty("iconL")
+            private String iconL;
+            @JsonProperty("compress")
+            private Boolean compress;
+            @JsonProperty("icon")
+            private String icon;
+            @JsonProperty("scale")
+            private Double scale;
+            @JsonProperty("pid")
+            private Integer pid;
+            @JsonProperty("delFlag")
+            private String delFlag;
+            @JsonProperty("look")
+            private Boolean look;
+            @JsonProperty("fileCompressSize")
+            private Integer fileCompressSize;
+            @JsonProperty("quality")
+            private Double quality;
+            @JsonProperty("createBy")
+            private String createBy;
+            @JsonProperty("encryption")
+            private Boolean encryption;
+            @JsonProperty("fileSize")
+            private Integer fileSize;
+            @JsonProperty("name")
+            private String name;
+            @JsonProperty("id")
+            private String id;
+            @JsonProperty("businessType")
+            private String businessType;
+            @JsonProperty("contentType")
+            private String contentType;
+            @JsonProperty("remarks")
+            private String remarks;
+            @JsonProperty("fileType")
+            private String fileType;
+            @JsonProperty("createDate")
+            private Long createDate;
+            @JsonProperty("status")
+            private String status;
+        }
+    }
+}

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/response/DaJiaCrawlerPriceResponse.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.dajia.crawler.entity.request.quote.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -36,7 +38,7 @@ public class DaJiaCrawlerPriceResponse {
     private DriveInsuranceDTO driveInsurance;
 
     @JsonProperty("motorDriveInsurance")
-    private String motorDriveInsurance;
+    private Object motorDriveInsurance;
 
     @JsonProperty("checkCarInfomation")
     private CheckCarInfomationDTO checkCarInfomation;
@@ -57,7 +59,7 @@ public class DaJiaCrawlerPriceResponse {
     private ExceptionCodeDTO exceptionCode;
 
     @JsonProperty("deliveryVO")
-    private String deliveryVO;
+    private Object deliveryVO;
 
     @JsonProperty("incrementVO")
     private IncrementVODTO incrementVO;
@@ -66,10 +68,10 @@ public class DaJiaCrawlerPriceResponse {
     private String increasedValueMsg;
 
     @JsonProperty("jabFamilyDriveInsurance")
-    private String jabFamilyDriveInsurance;
+    private Object jabFamilyDriveInsurance;
 
     @JsonProperty("rqbFamilyDriveInsurance")
-    private String rqbFamilyDriveInsurance;
+    private Object rqbFamilyDriveInsurance;
 
     @JsonProperty("reInsureVo")
     private String reInsureVo;
@@ -78,19 +80,19 @@ public class DaJiaCrawlerPriceResponse {
     private String chdDivisorVoList;
 
     @JsonProperty("jkFamilyDriveInsurance")
-    private String jkFamilyDriveInsurance;
+    private Object jkFamilyDriveInsurance;
 
     @JsonProperty("yyDriveInsurance")
-    private String yyDriveInsurance;
+    private Object yyDriveInsurance;
 
     @JsonProperty("hyDriveInsurance")
-    private String hyDriveInsurance;
+    private Object hyDriveInsurance;
 
     @JsonProperty("jkhosDriveInsurance")
-    private String jkhosDriveInsurance;
+    private Object jkhosDriveInsurance;
 
     @JsonProperty("jyChargeDriveInsurance")
-    private String jyChargeDriveInsurance;
+    private Object jyChargeDriveInsurance;
 
     @NoArgsConstructor
     @Data
@@ -111,4 +113,55 @@ public class DaJiaCrawlerPriceResponse {
         private String incrementList;
     }
 
+    private Object emptyToObject(Object str) {
+        if(ObjectUtils.isEmpty(str) || !StringUtils.hasLength(str.toString())) {
+            return new Object();
+        }
+        return str;
+    }
+
+    public DriveInsuranceDTO getDriveInsurance() {
+        if(ObjectUtils.isEmpty(driveInsurance) || !StringUtils.hasLength(driveInsurance.toString())) {
+            return new DriveInsuranceDTO();
+        }
+        return driveInsurance;
+    }
+
+    public Object getDeliveryVO() {
+        return emptyToObject(deliveryVO);
+    }
+
+    public Object getMotorDriveInsurance() {
+        return emptyToObject(motorDriveInsurance);
+    }
+
+    public Object getJabFamilyDriveInsurance() {
+        return emptyToObject(jabFamilyDriveInsurance);
+    }
+
+    public Object getRqbFamilyDriveInsurance() {
+        return emptyToObject(rqbFamilyDriveInsurance);
+    }
+
+    public Object getJyChargeDriveInsurance() {
+        return emptyToObject(jyChargeDriveInsurance);
+    }
+
+    public Object getJkhosDriveInsurance() {
+        return emptyToObject(jkhosDriveInsurance);
+    }
+
+    public Object getHyDriveInsurance() {
+        return emptyToObject(hyDriveInsurance);
+    }
+
+    public Object getYyDriveInsurance() {
+        return emptyToObject(yyDriveInsurance);
+    }
+
+    public Object getJkFamilyDriveInsurance() {
+        return emptyToObject(jkFamilyDriveInsurance);
+    }
+
+
 }

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/service/impl/DaJiaCrawlerQuoteProcessServiceImpl.java

@@ -61,6 +61,10 @@ public class DaJiaCrawlerQuoteProcessServiceImpl implements DaJiaCrawlerQuotePro
         }
         HttpHeaders headers = new HttpHeaders();
         headers.set(HttpHeaders.AUTHORIZATION, authorization);
+        headers.set("sec-ch-ua", "\"Not)A;Brand\";v=\"24\", \"Chromium\";v=\"116\"");
+        headers.set("sec-ch-ua-mobile", "?0");
+        headers.set("sec-ch-ua-platform", "\"Windows\"");
+        headers.set("source", "0");
         return headers;
     }
 

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/service/impl/DaJiaCrawlerRequestImpl.java

@@ -72,8 +72,12 @@ public class DaJiaCrawlerRequestImpl implements DaJiaCrawlerRequest {
         DaJiaCrawlerPriceRequest daJiaCrawlerPriceRequest = new DaJiaCrawlerPriceRequest(quoteVo, listDTO, daJiaCrawlerActualValueResponse, proposalInfoDTO, userCode, daJiaCrawlerCarResponse.getChannelOrderNo());
         DaJiaCrawlerPriceResponse crawlerPriceResponse = daJiaCrawlerRequestComponent.price(daJiaCrawlerPriceRequest, headers);
         // 3.1 订单保存
-        DaJiaCrawlerSaveRequest daJiaCrawlerSaveRequest = new DaJiaCrawlerSaveRequest(crawlerPriceResponse, userCode);
+        DaJiaCrawlerSaveRequest daJiaCrawlerSaveRequest = new DaJiaCrawlerSaveRequest(crawlerPriceResponse, userCode, quoteVo);
         DaJiaCrawlerSaveResponse daJiaCrawlerSaveResponse = daJiaCrawlerRequestComponent.save(daJiaCrawlerSaveRequest, headers);
+
+        DaJiaCrawlerInitDataRequest daJiaCrawlerInitDataRequest = new DaJiaCrawlerInitDataRequest(daJiaCrawlerSaveResponse.getCompulsoryInsurance(), daJiaCrawlerSaveResponse.getBusinessInsurance());
+        DaJiaCrawlerInitDataResponse daJiaCrawlerInitDataResponse = daJiaCrawlerRequestComponent.initData(daJiaCrawlerInitDataRequest, headers);
+
         // 3.2 缓存数据
         daJiaCrawlerCacheComponent.cacheDaJiaCrawlerSaveResponse(daJiaCrawlerSaveResponse, quoteVo.getOrder()
                 .getOrdersNo());

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

@@ -206,11 +206,12 @@ public class UnifyOrderManager {
         if (CollUtil.isNotEmpty(quoteVo.getKindInfoVo())) {
             QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
         }
-        // 报价
-        QuoteResultsVo quoteResultsVo = quoteService.quote(quoteVo);
 
         // 生成订单
         String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
+
+        // 报价
+        QuoteResultsVo quoteResultsVo = quoteService.quote(quoteVo);
         quoteVo.getOrder().setOrdersNo(ordersNo);
         quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());
         quoteResultsVo.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());