Przeglądaj źródła

华泰报价调试

xuqiang 1 rok temu
rodzic
commit
82111d3e3c
32 zmienionych plików z 199 dodań i 114 usunięć
  1. 20 13
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/build/HuaTaiApiQuoteResultsVoBuild.java
  2. 2 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/component/HuaTaiRequestApiComponent.java
  3. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/constant/TimeConstants.java
  4. 6 0
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/entity/HuaTaiApiOrder.java
  5. 63 4
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/entity/request/HuaTaiSubmitRequest.java
  6. 33 14
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/service/Impl/HuaTaiApiRequestImpl.java
  7. 2 5
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/build/HuaTaiCrawlerQuoteResultsVoBuild.java
  8. 10 10
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/component/HtCrawlerRequestComponent.java
  9. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/constant/HtRequestConstant.java
  10. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/constant/enums/RequestUrl.java
  11. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/HtCrawlerConfigureParameters.java
  12. 2 2
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerCarQueryRequest.java
  13. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerGerUploadUrlRequest.java
  14. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerLoginRequest.java
  15. 2 3
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerQuoteRequest.java
  16. 4 4
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerSaveOneStepRequest.java
  17. 2 2
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerUploadUrlRequest.java
  18. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerCarQueryResponse.java
  19. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerGerUploadUrlResponse.java
  20. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerLoginResponse.java
  21. 1 3
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerQuoteResponse.java
  22. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/dto/LoginDTO.java
  23. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/po/HtCrawlerOrder.java
  24. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/properties/HuaTaiCrawlerProperties.java
  25. 2 2
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/repository/HtCrawlerOrderRepository.java
  26. 2 2
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/HtCrawlerOrderService.java
  27. 2 3
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/HuaTaiCrawlerRequest.java
  28. 4 4
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HtCrawlerOrderServiceImpl.java
  29. 17 22
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HuaTaiCrawlerRequestImpl.java
  30. 1 1
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/util/HuaTaiCryptUtil.java
  31. 1 7
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java
  32. 11 0
      tenant/insurance/quotation-summary/src/main/resources/application.yaml

+ 20 - 13
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/build/HuaTaiApiQuoteResultsVoBuild.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.huatai.api.build;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
@@ -27,9 +28,10 @@ public class HuaTaiApiQuoteResultsVoBuild {
         quoteResultsVo.setBiRiskInfoVo(buildBiRiskInfoVo(quotedPriceResponse));
         // 商业险险种信息
         HuaTaiQuotedPriceResponse.ContractDto biContractDto = getBiContractDto(quotedPriceResponse);
-        List<KindInfoVo> kindInfoVo = buildKindInfoVo(quoteVo.getKindInfoVo(), biContractDto.getCoverage());
-        quoteResultsVo.setKindInfoVo(kindInfoVo);
-
+        if (ObjectUtil.isNotNull(biContractDto)){
+            List<KindInfoVo> kindInfoVo = buildKindInfoVo(quoteVo.getKindInfoVo(), biContractDto.getCoverage());
+            quoteResultsVo.setKindInfoVo(kindInfoVo);
+        }
         // 交强保费 车船税 商业保费
         buildPremium(quoteResultsVo, quotedPriceResponse);
         return quoteResultsVo;
@@ -43,10 +45,11 @@ public class HuaTaiApiQuoteResultsVoBuild {
     public static RiskInfoVo buildBiRiskInfoVo(HuaTaiQuotedPriceResponse quotedPriceResponse) {
         RiskInfoVo riskInfoVo = new RiskInfoVo();
         HuaTaiQuotedPriceResponse.ContractDto biContractDto = getBiContractDto(quotedPriceResponse);
-        riskInfoVo.setRiskCode(biContractDto.getContractMain().getRiskCode());
-        riskInfoVo.setStartDate(biContractDto.getContractMain().getValidDate());
-        riskInfoVo.setEndDate(biContractDto.getContractMain().getExpiryDate());
-
+        if (ObjectUtil.isNotNull(biContractDto) && ObjectUtil.isNotNull(biContractDto.getContractMain())){
+            riskInfoVo.setRiskCode(biContractDto.getContractMain().getRiskCode());
+            riskInfoVo.setStartDate(biContractDto.getContractMain().getValidDate());
+            riskInfoVo.setEndDate(biContractDto.getContractMain().getExpiryDate());
+        }
         return riskInfoVo;
     }
 
@@ -94,12 +97,16 @@ public class HuaTaiApiQuoteResultsVoBuild {
     private static void buildPremium(QuoteResultsVo quoteResultsVo, HuaTaiQuotedPriceResponse quotedPriceResponse) {
         HuaTaiQuotedPriceResponse.ContractDto biContractDto = getBiContractDto(quotedPriceResponse);
         HuaTaiQuotedPriceResponse.ContractDto ciContractDto = getCiContractDto(quotedPriceResponse);
-        // 设置交强险保费
-        quoteResultsVo.setCiPremium(String.valueOf(ciContractDto.getContractMain().getTotalPremium()));
-        // 设置车船税
-        quoteResultsVo.setVvTax(String.valueOf(ciContractDto.getTax().getSumTax()));
+        if (ObjectUtil.isNotNull(ciContractDto)){
+            // 设置交强险保费
+            quoteResultsVo.setCiPremium(String.valueOf(ciContractDto.getContractMain().getTotalPremium()));
+            // 设置车船税
+            quoteResultsVo.setVvTax(String.valueOf(ciContractDto.getTax().getSumTax()));
+        }
         // 设置商业险保费
-        quoteResultsVo.setBiPremium(String.valueOf(biContractDto.getContractMain().getTotalPremium()));
+        if (ObjectUtil.isNotNull(biContractDto)){
+            quoteResultsVo.setBiPremium(String.valueOf(biContractDto.getContractMain().getTotalPremium()));
+        }
         // 设置非车险(驾意险)保费,暂时无数据
 
     }
@@ -128,7 +135,7 @@ public class HuaTaiApiQuoteResultsVoBuild {
         List<HuaTaiQuotedPriceResponse.ContractDto> contractDtos = quotedPriceResponse.getBusinessData().getContract();
         for (HuaTaiQuotedPriceResponse.ContractDto contractDto : contractDtos) {
             HuaTaiQuotedPriceResponse.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
-            if (HuaTaiRiskCode.R_1002.equals(contractMain.getRiskCode())) {
+            if (HuaTaiRiskCode.R_1002.getCode().equals(contractMain.getRiskCode())) {
                 result = contractDto;
             }
         }

+ 2 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/component/HuaTaiRequestApiComponent.java

@@ -86,7 +86,8 @@ public class HuaTaiRequestApiComponent {
 //        InsuranceLog.infoLog(InsuranceEnum.HTIC.getPinyin(), "\n\t---------> 加密后的参数:{}", jsonString);
         HttpEntity<String> httpEntity = new HttpEntity<>(jsonString, httpHeaders);
         //----加密endding------------
-        ResponseEntity<String> response = requestComponent.objectPost(url, httpEntity, String.class);
+        //ResponseEntity<String> response = requestComponent.objectPost(url, httpEntity, String.class);
+        ResponseEntity<String> response = restTemplate.postForEntity(url, httpEntity, String.class);
         String body = response.getBody();
 
 //        InsuranceLog.infoLog(InsuranceEnum.HTIC.getPinyin(), "\n\t---------> 解密前的参数:{}", body);

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/constant/TimeConstants.java

@@ -13,5 +13,5 @@ public class TimeConstants {
 
     public static final String START_TIME = "00:00:00";
 
-    public static final String END_TIME = "23:59:59";
+    public static final String END_TIME = "00:00:00";
 }

+ 6 - 0
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/entity/HuaTaiApiOrder.java

@@ -1,7 +1,9 @@
 package com.jzg.quotation.huatai.api.entity;
 
+import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
+import com.jzg.commons.entity.vo.PersonAreaVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,6 +23,10 @@ public class HuaTaiApiOrder {
     @Id
     private String id;
 
+    private CarInfoVo carInfo;
+
+    private PersonAreaVo personAreaVo;
+
     /**
      * 交互唯一订单 OrderBase类的ordersNo
      */

+ 63 - 4
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/entity/request/HuaTaiSubmitRequest.java

@@ -2,11 +2,13 @@ package com.jzg.quotation.huatai.api.entity.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.jzg.commons.constants.InsuranceRisk;
-import com.jzg.quotation.commons.constant.InsuranceTypeCorrespondence;
+import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
+import com.jzg.quotation.commons.constant.InsuranceTypeCorrespondence;
 import com.jzg.quotation.huatai.api.constant.HuaTaiTransCode;
 import com.jzg.quotation.huatai.api.constant.TimeConstants;
+import com.jzg.quotation.huatai.api.constant.enums.HuaTaiRiskCode;
 import com.jzg.quotation.huatai.api.entity.HuaTaiApiOrder;
 import com.jzg.quotation.huatai.api.entity.HuaTaiBaseRequestHead;
 import com.jzg.quotation.huatai.api.entity.HuaTaiConfigureParameters;
@@ -15,12 +17,14 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -54,6 +58,7 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
                                HuaTaiConfigureParameters huaTaiConfigureParameters, List<InsHuataiContributingVo> engageList) {
         this.businessData = new BusinessDataDto(huaTaiApiOrder, huaTaiConfigureParameters, engageList);
         this.loginCom = huaTaiConfigureParameters.getComCode();
+        this.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
     }
 
     @AllArgsConstructor
@@ -76,12 +81,19 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
         //  销售信息
         @JSONField(name = "saleInfo")
         private SaleInfoDto saleInfo;
+        //  投保车辆信息
+        @JSONField(name = "insuredObject")
+        private InsuredObjectDto insuredObject;
 
         public BusinessDataDto(HuaTaiApiOrder huaTaiApiOrder,
                                HuaTaiConfigureParameters huaTaiConfigureParameters, List<InsHuataiContributingVo> engageList) {
             List<RiskInfoVo> riskList = new ArrayList<>();
-            riskList.add(huaTaiApiOrder.getBiRiskInfoVo());
-            riskList.add(huaTaiApiOrder.getCiRiskInfoVo());
+            if (ObjectUtils.anyNotNull(huaTaiApiOrder.getBiRiskInfoVo())){
+                riskList.add(huaTaiApiOrder.getBiRiskInfoVo());
+            }
+            if (ObjectUtils.anyNotNull(huaTaiApiOrder.getCiRiskInfoVo())){
+                riskList.add(huaTaiApiOrder.getCiRiskInfoVo());
+            }
             CustomerInfoVo ownerInfo = huaTaiApiOrder.getOwnersInfo();
 
             CustomerInfoVo policyHolderInfo = huaTaiApiOrder.getPolicyHolderInfo();
@@ -95,6 +107,8 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
             this.customer = new CustomerDto().getCustomers(ownerInfo, policyHolderInfo, insuredPersonInfo, huaTaiConfigureParameters);
             //销售信息
             this.saleInfo = new SaleInfoDto(huaTaiConfigureParameters);
+            // 投保车辆信息
+            this.insuredObject = new InsuredObjectDto(huaTaiApiOrder.getCarInfo());
 
         }
     }
@@ -187,7 +201,7 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
         private String remark;
 
         public ContractMainDto(RiskInfoVo riskInfoVo, HuaTaiApiOrder huaTaiApiOrder) {
-            if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
+            if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode()) || HuaTaiRiskCode.R_1002.getCode().equals(riskInfoVo.getRiskCode())) {
                 this.contractNo = huaTaiApiOrder.getJqApplyNo();
                 this.totalPremium = Double.parseDouble(huaTaiApiOrder.getJqPremium());
                 this.validDate = riskInfoVo.getStartDate();
@@ -409,6 +423,9 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
 
 
         public CustomerDto(CustomerInfoVo customerInfoVo, String role, HuaTaiConfigureParameters huaTaiConfigureParameters, CustomerInfoVo ownerInfo) {
+            this.province = customerInfoVo.getProvinceCode();
+            this.city = customerInfoVo.getCityCode();
+            this.district = customerInfoVo.getCountyCode();
             this.identifyNumber = customerInfoVo.getIdentifyNumber();
             this.identifyType = "01";
             this.name = customerInfoVo.getName();
@@ -446,6 +463,48 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
     }
 
 
+    @NoArgsConstructor
+    @Data
+    public static class InsuredObjectDto implements Serializable {
+        @JSONField(name = "policyCar")
+        private PolicyCarDto policyCar;
+
+        public InsuredObjectDto(CarInfoVo carInfoVo) {
+            this.policyCar = new PolicyCarDto(carInfoVo);
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PolicyCarDto implements Serializable {
+
+            // Y 验车状态(1-未验车;2-免验车;4-已验车)
+            @JSONField(name = "CarCheckStatus")
+            private String carCheckStatus;
+
+            // CY  验车人(已验车必传)
+            @JSONField(name = "CarChecker")
+            private String carChecker;
+
+            // CY  验车时间(已验车必传)(格式:YYYY-MM-DD HH24:MI:SS)
+            @JSONField(name = "CarCheckTime")
+            private Date carCheckTime;
+
+            // CY 验车记录(已验车必传)
+            @JSONField(name = "CarCheckRecord")
+            private String carCheckRecord;
+
+            // N 车况(0-好;1-中;2-差)
+            @JSONField(name = "VehicleCondition")
+            private String vehicleCondition;
+
+            public PolicyCarDto(CarInfoVo carInfoVo) {
+                this.carCheckStatus = "2";
+                this.vehicleCondition = "0";
+            }
+        }
+    }
+
+
     @AllArgsConstructor
     @NoArgsConstructor
     @Data

+ 33 - 14
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/service/Impl/HuaTaiApiRequestImpl.java

@@ -1,5 +1,9 @@
 package com.jzg.quotation.huatai.api.service.Impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.jzg.commons.constants.dict.InsOrderStatusEnum;
+import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.quotation.commons.entity.vo.aggregated.*;
@@ -21,6 +25,7 @@ import com.jzg.quotation.huatai.api.entity.vo.InsHuataiContributingVo;
 import com.jzg.quotation.huatai.api.service.HuaTaiApiOrderService;
 import com.jzg.quotation.huatai.api.service.HuaTaiApiRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +37,7 @@ import java.util.List;
  * @author: shenwd
  * @date: 2025/3/10 09:24
  **/
+@Slf4j
 @Service(value = InsuranceCode.INSURANCE_HTIC)
 @RequiredArgsConstructor
 public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
@@ -78,37 +84,51 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
                 actualValueResponse = huataiRequestApiComponent.actualValue(huaTaiActualValueRequest, HuaTaiActualValueResponse.class, parameters.getInsuredCode());
         }
         //组装报价参数
+        AccidentalDrivingVo accidentalDrivingVo = new AccidentalDrivingVo();
+        List<AccidentalDrivingVo> accidentalDrivings = quoteVo.getAccidentalDrivings();
+        if (CollectionUtil.isNotEmpty(accidentalDrivings)){
+             accidentalDrivingVo = accidentalDrivings.get(0);
+        }
+
         HuaTaiQuotedPriceRequest quotedPriceRequest = new HuaTaiQuotedPriceRequest(quoteVo, fullCarDataDto, actualValueResponse,
-                quoteVo.getAccidentalDrivings().get(0), parameters);
+                accidentalDrivingVo, parameters);
         quotedPriceRequest.setHead(baseRequestHead);
         //调用报价接口
         HuaTaiQuotedPriceResponse quotedPriceResponse = huataiRequestApiComponent.quotedPrice(quotedPriceRequest,
                 HuaTaiQuotedPriceResponse.class,  parameters.getInsuredCode());
-
+        if (ObjectUtil.isNotNull(quotedPriceResponse) && !quotedPriceResponse.getHead().getReturnCode().equals("0")){
+            log.error("报价失败,返回信息:{}", quotedPriceResponse.getHead().getReturnMessage());
+            throw new SystemException("报价失败");
+        }
         QuoteResultsVo quoteResultsVo = HuaTaiApiQuoteResultsVoBuild.buildQuoteResultsVo(orderBase.getOrdersNo(), quoteVo, quotedPriceResponse);
         //数据保存到mongodb,后续接口需要的数据
         HuaTaiApiOrder huaTaiApiOrder = new HuaTaiApiOrder();
+        huaTaiApiOrder.setCarInfo(carInfoVo);
         huaTaiApiOrder.setOrdersNo(orderBase.getOrdersNo());
         //设置商业险数据
         HuaTaiQuotedPriceResponse.ContractDto biContractDto = HuaTaiApiQuoteResultsVoBuild.getBiContractDto(quotedPriceResponse);
-        huaTaiApiOrder.setSyQuerySequenceNo(biContractDto.getPlatFormMessage().getQuerySequenceNo());
-        huaTaiApiOrder.setSyApplyNo(biContractDto.getContractMain().getContractNo());
-        huaTaiApiOrder.setSyPremium(String.valueOf(biContractDto.getContractMain().getTotalPremium()));
+        if (ObjectUtil.isNotNull(biContractDto)){
+            huaTaiApiOrder.setSyQuerySequenceNo(biContractDto.getPlatFormMessage().getQuerySequenceNo());
+            huaTaiApiOrder.setSyApplyNo(biContractDto.getContractMain().getContractNo());
+            huaTaiApiOrder.setSyPremium(String.valueOf(biContractDto.getContractMain().getTotalPremium()));
+
+        }
 
         //设置交强险数据
         HuaTaiQuotedPriceResponse.ContractDto ciContractDto = HuaTaiApiQuoteResultsVoBuild.getCiContractDto(quotedPriceResponse);
-        huaTaiApiOrder.setJqQuerySequenceNo(ciContractDto.getPlatFormMessage().getQuerySequenceNo());
-        huaTaiApiOrder.setJqApplyNo(ciContractDto.getContractMain().getContractNo());
-        huaTaiApiOrder.setJqPremium(String.valueOf(ciContractDto.getContractMain().getTotalPremium()));
-
+        if (ObjectUtil.isNotNull(ciContractDto)){
+            huaTaiApiOrder.setJqQuerySequenceNo(ciContractDto.getPlatFormMessage().getQuerySequenceNo());
+            huaTaiApiOrder.setJqApplyNo(ciContractDto.getContractMain().getContractNo());
+            huaTaiApiOrder.setJqPremium(String.valueOf(ciContractDto.getContractMain().getTotalPremium()));
+        }
         huaTaiApiOrder.setOwnersInfo(quoteVo.getOwnersInfo());
         huaTaiApiOrder.setPolicyHolderInfo(quoteVo.getPolicyHolderInfo());
         huaTaiApiOrder.setInsuredPersonInfo(quoteVo.getInsuredPersonInfo());
-        huaTaiApiOrder.setCiRiskInfoVo(quoteResultsVo.getCiRiskInfoVo());
-        huaTaiApiOrder.setBiRiskInfoVo(quoteResultsVo.getBiRiskInfoVo());
-
-        huaTaiApiOrderService.save(huaTaiApiOrder);
+        huaTaiApiOrder.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());
+        huaTaiApiOrder.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
 
+        HuaTaiApiOrder save = huaTaiApiOrderService.save(huaTaiApiOrder);
+        quoteResultsVo.setQuoteStatus(StringUtils.isNotBlank(save.getId()) ? InsOrderStatusEnum.WAIT_AUDIT :InsOrderStatusEnum. QUOTE_FAIL);
         return quoteResultsVo;
     }
 
@@ -128,7 +148,6 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
         List<InsHuataiContributingVo> engageList = new ArrayList<>();//报价接口未返回特约信息
         HuaTaiApiOrder huaTaiApiOrder = huaTaiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         HuaTaiSubmitRequest submitRequest = new HuaTaiSubmitRequest(huaTaiApiOrder, huaTaiParameters, engageList);
-        submitRequest.setHead(new HuaTaiBaseRequestHead(huaTaiParameters));
         HuaTaiSubmitResponse submitResponse = huataiRequestApiComponent.submit(submitRequest, HuaTaiSubmitResponse.class, huaTaiParameters.getInsuredCode());
 
         if ("-1".equals(submitResponse.getHead().getReturnCode())) {

+ 2 - 5
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/build/HuaTaiCrawlerQuoteResultsVoBuild.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/build/HuaTaiCrawlerQuoteResultsVoBuild.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.build;
+package com.jzg.quotation.huatai.crawler.build;
 
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
@@ -6,11 +6,8 @@ import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.huatai.api.constant.enums.ContractEnum;
-import com.jzg.quotation.huatai.api.constant.enums.HuaTaiRiskCode;
-import com.jzg.quotation.huatai.api.entity.response.HuaTaiQuotedPriceResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

+ 10 - 10
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/component/HtCrawlerRequestComponent.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/component/HtCrawlerRequestComponent.java

@@ -1,18 +1,18 @@
-package com.jzg.quote.huatai.crawler.component;
+package com.jzg.quotation.huatai.crawler.component;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.constant.CacheConstant;
-import com.jzg.quote.huatai.crawler.constant.HtRequestConstant;
-import com.jzg.quote.huatai.crawler.constant.enums.RequestUrl;
-import com.jzg.quote.huatai.crawler.entity.Request.*;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerGerUploadUrlResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerLoginResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
-import com.jzg.quote.huatai.crawler.properties.HuaTaiCrawlerProperties;
-import com.jzg.quote.huatai.crawler.util.HuaTaiCryptUtil;
+import com.jzg.quotation.huatai.crawler.constant.HtRequestConstant;
+import com.jzg.quotation.huatai.crawler.constant.enums.RequestUrl;
+import com.jzg.quotation.huatai.crawler.entity.Request.*;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerGerUploadUrlResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerLoginResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
+import com.jzg.quotation.huatai.crawler.properties.HuaTaiCrawlerProperties;
+import com.jzg.quotation.huatai.crawler.util.HuaTaiCryptUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/constant/HtRequestConstant.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/constant/HtRequestConstant.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.constant;
+package com.jzg.quotation.huatai.crawler.constant;
 
 /**
  * @description: 华泰财险 常量

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/constant/enums/RequestUrl.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/constant/enums/RequestUrl.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.constant.enums;
+package com.jzg.quotation.huatai.crawler.constant.enums;
 
 import com.jzg.quotation.commons.standard.CrawlerRequestUrlStandard;
 import lombok.AllArgsConstructor;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/HtCrawlerConfigureParameters.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/HtCrawlerConfigureParameters.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity;
+package com.jzg.quotation.huatai.crawler.entity;
 
 import com.jzg.quotation.commons.standard.ConfigureParameters;
 import lombok.Data;

+ 2 - 2
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerCarQueryRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerCarQueryRequest.java

@@ -1,10 +1,10 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
 
 import com.alibaba.fastjson.JSON;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.quote.huatai.crawler.util.HuaTaiCryptUtil;
+import com.jzg.quotation.huatai.crawler.util.HuaTaiCryptUtil;
 import lombok.Data;
 
 import java.io.Serial;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerGerUploadUrlRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerGerUploadUrlRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
 import lombok.Data;
 

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerLoginRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerLoginRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
 import lombok.Data;
 

+ 2 - 3
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerQuoteRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerQuoteRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,7 @@ import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.VehicleAndVesselTaxVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
-import com.jzg.quote.huatai.crawler.util.HuaTaiCryptUtil;
+import com.jzg.quotation.huatai.crawler.util.HuaTaiCryptUtil;
 import lombok.Data;
 
 import java.io.Serial;

+ 4 - 4
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerSaveOneStepRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerSaveOneStepRequest.java

@@ -1,12 +1,12 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.quote.huatai.crawler.constant.HtRequestConstant;
-import com.jzg.quote.huatai.crawler.entity.HtCrawlerConfigureParameters;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
+import com.jzg.quotation.huatai.crawler.constant.HtRequestConstant;
+import com.jzg.quotation.huatai.crawler.entity.HtCrawlerConfigureParameters;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
 import lombok.Data;
 
 import java.io.Serial;

+ 2 - 2
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Request/HtCrawlerUploadUrlRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Request/HtCrawlerUploadUrlRequest.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.huatai.crawler.entity.Request;
+package com.jzg.quotation.huatai.crawler.entity.Request;
 
-import com.jzg.quote.huatai.crawler.constant.HtRequestConstant;
+import com.jzg.quotation.huatai.crawler.constant.HtRequestConstant;
 import lombok.Data;
 
 import java.io.Serial;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Response/HtCrawlerCarQueryResponse.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerCarQueryResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Response;
+package com.jzg.quotation.huatai.crawler.entity.Response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.commons.filter.CarModelsFilter;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Response/HtCrawlerGerUploadUrlResponse.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerGerUploadUrlResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Response;
+package com.jzg.quotation.huatai.crawler.entity.Response;
 
 import lombok.Data;
 

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Response/HtCrawlerLoginResponse.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerLoginResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.Response;
+package com.jzg.quotation.huatai.crawler.entity.Response;
 
 /**
  * @description:

+ 1 - 3
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/Response/HtCrawlerQuoteResponse.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/Response/HtCrawlerQuoteResponse.java

@@ -1,9 +1,7 @@
-package com.jzg.quote.huatai.crawler.entity.Response;
+package com.jzg.quotation.huatai.crawler.entity.Response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quote.huatai.crawler.entity.Request.HtCrawlerQuoteRequest;
 import lombok.Data;
-import org.bouncycastle.cms.PasswordRecipientId;
 
 import java.io.Serial;
 import java.io.Serializable;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/dto/LoginDTO.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/dto/LoginDTO.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.dto;
+package com.jzg.quotation.huatai.crawler.entity.dto;
 
 import com.jzg.quotation.commons.entity.vo.base.LoginBase;
 import lombok.Data;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/entity/po/HtCrawlerOrder.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/entity/po/HtCrawlerOrder.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.entity.po;
+package com.jzg.quotation.huatai.crawler.entity.po;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/properties/HuaTaiCrawlerProperties.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/properties/HuaTaiCrawlerProperties.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.properties;
+package com.jzg.quotation.huatai.crawler.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 2
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/repository/HtCrawlerOrderRepository.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/repository/HtCrawlerOrderRepository.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.huatai.crawler.repository;
+package com.jzg.quotation.huatai.crawler.repository;
 
-import com.jzg.quote.huatai.crawler.entity.po.HtCrawlerOrder;
+import com.jzg.quotation.huatai.crawler.entity.po.HtCrawlerOrder;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Query;
 

+ 2 - 2
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/service/HtCrawlerOrderService.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/HtCrawlerOrderService.java

@@ -1,6 +1,6 @@
-package com.jzg.quote.huatai.crawler.service;
+package com.jzg.quotation.huatai.crawler.service;
 
-import com.jzg.quote.huatai.crawler.entity.po.HtCrawlerOrder;
+import com.jzg.quotation.huatai.crawler.entity.po.HtCrawlerOrder;
 
 /**
  * @description: 华泰财险 mongodb中操作数据

+ 2 - 3
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/service/HuaTaiCrawlerRequest.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/HuaTaiCrawlerRequest.java

@@ -1,8 +1,7 @@
-package com.jzg.quote.huatai.crawler.service;
+package com.jzg.quotation.huatai.crawler.service;
 
-import com.jzg.quotation.commons.entity.vo.base.LoginBase;
 import com.jzg.quotation.commons.service.QuotationCrawlerBaseService;
-import com.jzg.quote.huatai.crawler.entity.dto.LoginDTO;
+import com.jzg.quotation.huatai.crawler.entity.dto.LoginDTO;
 
 /**
  * @description: 华泰爬虫报价请求接口

+ 4 - 4
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/service/Impl/HtCrawlerOrderServiceImpl.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HtCrawlerOrderServiceImpl.java

@@ -1,8 +1,8 @@
-package com.jzg.quote.huatai.crawler.service.Impl;
+package com.jzg.quotation.huatai.crawler.service.Impl;
 
-import com.jzg.quote.huatai.crawler.entity.po.HtCrawlerOrder;
-import com.jzg.quote.huatai.crawler.repository.HtCrawlerOrderRepository;
-import com.jzg.quote.huatai.crawler.service.HtCrawlerOrderService;
+import com.jzg.quotation.huatai.crawler.entity.po.HtCrawlerOrder;
+import com.jzg.quotation.huatai.crawler.repository.HtCrawlerOrderRepository;
+import com.jzg.quotation.huatai.crawler.service.HtCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 17 - 22
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/service/Impl/HuaTaiCrawlerRequestImpl.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HuaTaiCrawlerRequestImpl.java

@@ -1,6 +1,5 @@
-package com.jzg.quote.huatai.crawler.service.Impl;
+package com.jzg.quotation.huatai.crawler.service.Impl;
 
-import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
@@ -11,35 +10,31 @@ import com.jzg.quotation.commons.entity.vo.base.LoginBase;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
-import com.jzg.quote.huatai.crawler.build.HuaTaiCrawlerQuoteResultsVoBuild;
-import com.jzg.quote.huatai.crawler.component.HtCrawlerRequestComponent;
-import com.jzg.quote.huatai.crawler.constant.HtRequestConstant;
-import com.jzg.quote.huatai.crawler.entity.HtCrawlerConfigureParameters;
-import com.jzg.quote.huatai.crawler.entity.Request.HtCrawlerCarQueryRequest;
-import com.jzg.quote.huatai.crawler.entity.Request.HtCrawlerGerUploadUrlRequest;
-import com.jzg.quote.huatai.crawler.entity.Request.HtCrawlerQuoteRequest;
-import com.jzg.quote.huatai.crawler.entity.Request.HtCrawlerSaveOneStepRequest;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerGerUploadUrlResponse;
-import com.jzg.quote.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
-import com.jzg.quote.huatai.crawler.entity.dto.LoginDTO;
-import com.jzg.quote.huatai.crawler.entity.po.HtCrawlerOrder;
-import com.jzg.quote.huatai.crawler.service.HtCrawlerOrderService;
-import com.jzg.quote.huatai.crawler.service.HuaTaiCrawlerRequest;
-import com.jzg.quote.huatai.crawler.util.HuaTaiCryptUtil;
+import com.jzg.quotation.huatai.crawler.build.HuaTaiCrawlerQuoteResultsVoBuild;
+import com.jzg.quotation.huatai.crawler.component.HtCrawlerRequestComponent;
+import com.jzg.quotation.huatai.crawler.constant.HtRequestConstant;
+import com.jzg.quotation.huatai.crawler.entity.HtCrawlerConfigureParameters;
+import com.jzg.quotation.huatai.crawler.entity.Request.HtCrawlerCarQueryRequest;
+import com.jzg.quotation.huatai.crawler.entity.Request.HtCrawlerGerUploadUrlRequest;
+import com.jzg.quotation.huatai.crawler.entity.Request.HtCrawlerQuoteRequest;
+import com.jzg.quotation.huatai.crawler.entity.Request.HtCrawlerSaveOneStepRequest;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerCarQueryResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerGerUploadUrlResponse;
+import com.jzg.quotation.huatai.crawler.entity.Response.HtCrawlerQuoteResponse;
+import com.jzg.quotation.huatai.crawler.entity.dto.LoginDTO;
+import com.jzg.quotation.huatai.crawler.entity.po.HtCrawlerOrder;
+import com.jzg.quotation.huatai.crawler.service.HtCrawlerOrderService;
+import com.jzg.quotation.huatai.crawler.service.HuaTaiCrawlerRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
-import java.net.http.HttpRequest;
-import java.util.List;
-
 /**
  * @description: 华泰财险 爬虫报价
  * @author: shenwd
  * @date: 2025/4/15 08:56
  **/
-@Service(value = InsuranceCode.INSURANCE_HTIC)
+@Service(value = InsuranceCode.INSURANCE_HYIC)
 @RequiredArgsConstructor
 public class HuaTaiCrawlerRequestImpl implements HuaTaiCrawlerRequest {
     private final HtCrawlerRequestComponent htCrawlerRequestComponent;

+ 1 - 1
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/crawler/util/HuaTaiCryptUtil.java → tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/util/HuaTaiCryptUtil.java

@@ -1,4 +1,4 @@
-package com.jzg.quote.huatai.crawler.util;
+package com.jzg.quotation.huatai.crawler.util;
 
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.crypto.Mode;

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

@@ -13,7 +13,6 @@ import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.po.SysUploadFiles;
-import com.jzg.commons.entity.vo.PersonAreaVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
@@ -31,16 +30,11 @@ import com.jzg.quotation.summary.mapper.SysUploadFilesMapper;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import io.minio.MinioClient;
-import io.minio.ObjectWriteResponse;
-import io.minio.PutObjectArgs;
-import io.minio.errors.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.io.IOUtils;
-import org.simpleframework.xml.ElementArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -201,7 +195,7 @@ public class UnifyOrderManager {
 
         // 生成订单
         String ordersNo = insOrdersService.generateOrders(quoteVo,companyName);
-
+        quoteVo.getOrder().setOrdersNo(ordersNo);
         // 报价
         QuoteResultsVo quoteResultsVo = quoteService.quote(quoteVo);
 

+ 11 - 0
tenant/insurance/quotation-summary/src/main/resources/application.yaml

@@ -131,6 +131,17 @@ guoren:
     interfacePwd: $2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te
     iftest: N
 
+# 华泰
+huatai:
+  api:
+    sourceCode: '016'
+    baseUrl: https://gears.pc.ehuatai.com:9040/interFaces/common/AutoInsuranceQuotation.do
+    selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBOtXf1T/no13LOuy5ti+/d+SADHns8hAv3+LjhDFsQRbHk3tHhnUNX7I8b25576AVmgraefS7jnpyB299f58PK8WkWZN+UB6pcyEpktrtqOnKcaQSTbkQzaseCW4sCRdoea0alzSXUuXC2FN0pHAE3JkT07e5doX3IHas2GJAkwIDAQAB
+    selfPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAME61d/VP+ejXcs67Lm2L7935IAMeezyEC/f4uOEMWxBFseTe0eGdQ1fsjxvbnnvoBWaCtp59LuOenIHb31/nw8rxaRZk35QHqlzISmS2u2o6cpxpBJNuRDNqx4JbiwJF2h5rRqXNJdS5cLYU3SkcATcmRPTt7l2hfcgdqzYYkCTAgMBAAECgYAwAAWRDNBLInHyQjj8CR3jWk0Q4giHq7oJqnwaOIRud9zIxwIgym3ZXKRSDvxKnhQOSa3Yh+MblFEmcmJnsoQ4OedLq7FVOw1eur/nw6jMcROT6ZiP512ZGgKZI1OdkQDpjCqM9Vg1brrFuGdV2RwI9ak2bjKbi7vs6slvd4r3AQJBAOqU+5xkyuaupg9cO/7TIxMgnTQH8W7IC1uDcx3f28QdkP+udJYfU/n1dYyGuhkW66KVANSqz4dsrEiAmfhvydECQQDS304+LEvPi4j8YmNlOXrs1o8H0tPB69svC9ER2YbrTjZf49XvY9fuor11XAprXZhBp8yvJu07FuRWilrQ8FkjAkEAop1qmqzIdweE+ErxECJfQygtsd77v9cPAH5sM752Q0pXtNbD3TmUZkeBGExg/3mDGW5/Z+2M9Y0hFRWJJs6fsQJAO11mV5Z82Tb9H6BLPyoJczeMGLW/q65MjFgVSaMlmoTwRdqMVdKT7bifAbUhscwtmv40X3LkAmiVa8+TdZLUZQJACu2NgPZkw6gjKCZf5xOfvKaC3PqKlhPghq+ypyutzTih9y81+EBJ25emLWNcd5BtIZ/AXmr3UUiGg0zX4s5njA==
+    huaTaiPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYyF2SBNzLOP5N5fFW2T2eQ5+iaI5wVpsedu+UY290TVuG152tkdtSuTXsx+8BKnd79/PF966/2aSP4EUm7vD9kvQUnX2EDUiMooorGvDTRxoHNXFGqOtxdMiUOuqx19HwNb4gOXZ1WdjWJwSmqC6ZP6OgxKIotCHJwe826Q/w8wIDAQAB
+    huaTaiKey: e1YF83DYB8sj7gEr8M
+    key: kFl5aiHALbZ6TMTqQDxghMMC
+    tokenUrl: https://vehpxy.pc.ehuatai.com/testsign
 # 渤海财险
 bohai:
   api: