Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

Qchen 1 жил өмнө
parent
commit
d917b7cb9d
10 өөрчлөгдсөн 578 нэмэгдсэн , 310 устгасан
  1. 0 3
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java
  2. 33 4
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/TimeProcessing.java
  3. 14 17
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java
  4. 2 2
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerRequestComponent.java
  5. 1 1
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/constant/enums/RequestUrl.java
  6. 1 1
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequestRequest.java
  7. 3 4
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerPrecisionServiceSearchRequest.java
  8. 469 234
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequestRequest.java
  9. 35 32
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerSaveRequestRequest.java
  10. 20 12
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

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

@@ -2,12 +2,10 @@ package com.jzg.quotation.commons.component;
 
 
 import com.alibaba.fastjson2.JSON;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.utils.RequestObjectConversion;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.MDC;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
@@ -191,7 +189,6 @@ public class RequestComponent {
         if (log.isDebugEnabled()) {
             log.debug("request body is {}", body);
         }
-        System.out.println(body);
         body = Optional.ofNullable(body).orElse("");
         return webClient.post()
                 .uri(url)

+ 33 - 4
tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/TimeProcessing.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.Period;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -35,10 +36,15 @@ public final class TimeProcessing {
 
     public static final long ONE = 1L;
 
-    public static LocalDateTime parse(String date) {
+    public static LocalDateTime parseDateTime(String date) {
         return LocalDateTime.parse(date, DATE_TIME_FORMATTER);
     }
 
+    public static LocalDate parseDate(String date) {
+        return LocalDate.parse(date, DATE_FORMATTER);
+    }
+
+
     /**
      * 时间格式转换
      * yyyy-MM-dd 转 yyyy-MM-dd HH:mm:ss
@@ -54,6 +60,10 @@ public final class TimeProcessing {
         return LocalDateTime.of(LocalDate.parse(date, DATE_FORMATTER), LocalTime.MAX).format(DATE_TIME_FORMATTER);
     }
 
+    public static String dateTimeToDate(String dateTime){
+        return LocalDateTime.parse(dateTime, DATE_TIME_FORMATTER).format(DATE_FORMATTER);
+    }
+
     /**
      * 一年以后减1秒得时间
      *
@@ -67,17 +77,17 @@ public final class TimeProcessing {
     /**
      * 一年以后得时间
      *
-     * @param startDate 开始时间
+     * @param date 开始时间
      * @return 结束时间
      */
     public static LocalDateTime plusOneYear(String date) {
-        return parse(date).plusYears(ONE);
+        return parseDateTime(date).plusYears(ONE);
     }
 
     /**
      * 一年以后得时间
      *
-     * @param startDate 开始时间
+     * @param date 开始时间
      * @return 结束时间
      */
     public static String plusOneYearToString(String date) {
@@ -130,6 +140,11 @@ public final class TimeProcessing {
         return LocalDateTime.of(LocalDate.now().plusDays(1), LocalTime.MIN).format(DATE_TIME_FORMATTER);
     }
 
+    public static String tomorrowDate() {
+        return LocalDate.now().plusDays(1).format(DATE_FORMATTER);
+    }
+
+
     /**
      * 获取时间范围
      * 用于查询订单的时候按照时间范围查询
@@ -170,6 +185,20 @@ public final class TimeProcessing {
         return LocalDateTime.now().format(DATE_TIME_FORMATTER);
     }
 
+    /**
+     * 使用年限计算
+     *
+     * @param date 日期
+     * @return 年限
+     */
+    public static int serviceLife(String date) {
+        LocalDate localDate = parseDate(date);
+        LocalDate now = LocalDate.now();
+        Period between = Period.between(localDate, now);
+        return between.getYears();
+    }
+
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

+ 14 - 17
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java

@@ -1,10 +1,10 @@
 package com.jzg.quotation.huanong.crawler.build;
 
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
-import com.jzg.quotation.commons.component.ConversionOfQuoteInformation;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
-import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.quotation.commons.component.ConversionOfQuoteInformation;
 import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
 import com.jzg.quotation.huanong.enums.dictionary.Risk;
 
@@ -28,20 +28,17 @@ public final class HuaNongCrawlerQuoteResultsVoBuild {
         Map<String, HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contractDTOMap = contract.stream()
                 .collect(Collectors.toMap(x -> x.getContractMain().getRiskCode(), x -> x));
 
-        boolean newEnergyMark = quoteVo.getCarInfoVo().isNewEnergyMark();
-        HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO contractDTO;
-        if (newEnergyMark) {
-            contractDTO = contractDTOMap.get(Risk.RISK_0515.getRiskCode());
-        } else {
-            contractDTO = contractDTOMap.get(Risk.RISK_0510.getRiskCode());
-        }
-        // 商业险险种信息
-        buildKindInfo(quoteVo.getKindInfoVo(), contractDTO.getCoverage());
-        // 交强险
-        HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO ciContractDTO = contractDTOMap.get(Risk.RISK_0507.getRiskCode());
-        buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), ciContractDTO.getContractMain());
-        // 商业险
-        buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), contractDTO.getContractMain());
+        contract.forEach(contractDTO -> {
+            if (Risk.RISK_0507.getRiskCode().equals(contractDTO.getContractMain().getRiskCode())) {
+                // 交强险
+                HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO ciContractDTO = contractDTOMap.get(Risk.RISK_0507.getRiskCode());
+                buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), ciContractDTO.getContractMain());
+            } else {
+                // 商业险
+                buildKindInfo(quoteVo.getKindInfoVo(), contractDTO.getCoverage());
+                buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), contractDTO.getContractMain());
+            }
+        });
 
         return quoteResultsVo;
     }
@@ -52,7 +49,7 @@ public final class HuaNongCrawlerQuoteResultsVoBuild {
     }
 
     private static void buildKindInfo(List<KindInfoVo> kindInfoVo, List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO> coverage) {
-         ConversionOfQuoteInformation.mapCoverageToKinds(
+        ConversionOfQuoteInformation.mapCoverageToKinds(
                 kindInfoVo,
                 coverage,
                 HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO::getKindCode,

+ 2 - 2
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerRequestComponent.java

@@ -1,7 +1,7 @@
 package com.jzg.quotation.huanong.crawler.component;
 
 import cn.hutool.core.codec.Base64;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
@@ -56,7 +56,7 @@ public class HuaNongCrawlerRequestComponent {
         HuaNongCrawlerBaseResponseHead responseHead = Optional.ofNullable(response)
                 .map(HuaNongHeadResponse::getHead)
                 .orElseThrow(() -> new SystemException(requestUrl.getRequestDescription() + "异常"));
-        if ("1".equals(responseHead.getReturnCode())) {
+        if (!"0".equals(responseHead.getReturnCode())) {
             throw new SystemException(responseHead.getReturnMessage());
         }
         return response;

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

@@ -27,7 +27,7 @@ public enum RequestUrl implements CrawlerRequestUrlStandard {
     PRECISION_SERVICE_SEARCH("QUERYCARMODELRISK", "精准服务搜索", "precisionServiceSearch.do"),
     ACTUAL_VALUE("ActualValue", "折旧价计算", "actualValue"),
     QUOTED_PRICE("QuotedPrice", "保费计算", "QuotedPrice"),
-    SAVE("Save", "保存订单", "Save"),
+    SAVE("TSave", "保存订单", "Save"),
     // 上传影像
     NEW_IMAGE_QUERY("newImageQuery", "影像上传", "newImageQuery"),
 

+ 1 - 1
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequestRequest.java

@@ -86,7 +86,7 @@ public class HuaNongCrawlerModelsQueryRequestRequest implements HuaNongHeadReque
         this.factory = "";
         this.series = "";
         this.localModelCode = "";
-        this.plateNo = "";
+        this.plateNo = carInfoVo.getLicenseNo();
         this.plateType = "";
         this.noLicenseFlag = false;
         this.frameNo = "";

+ 3 - 4
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerPrecisionServiceSearchRequest.java

@@ -2,7 +2,6 @@ package com.jzg.quotation.huanong.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
-import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
 import lombok.Data;
@@ -92,13 +91,13 @@ public class HuaNongCrawlerPrecisionServiceSearchRequest implements HuaNongHeadR
             this.motorUsageTypeCode = carInfoVo.getVehicleUseCode();
             this.motorTypeCode = carInfoVo.getCarKindCode();
             this.firstRegisterDate = TimeProcessing.dateToDateTime(carInfoVo.getRegisterDate());
-            this.effectiveDate = TimeProcessing.nowDateTime();
+            this.effectiveDate = TimeProcessing.tomorrowDate() + " 00:00:00:00:00";
             this.tonnage = Integer.valueOf(carInfoVo.getLimitLoad());
-            this.ratedPassengerCapacity = Integer.valueOf(carInfoVo.getSeatCount()) ;
+            this.ratedPassengerCapacity = Integer.valueOf(carInfoVo.getSeatCount());
             this.noticeType = carModelDTO.getPlatFormCar().getNoticeType();
             this.replacementValue = carModelDTO.getFullCarData().getPurchasePrice();
             this.queryModel = "1";
-            this.expireDate = TimeProcessing.dateToDateTime(carInfoVo.getIssueDate());
+            this.expireDate = this.effectiveDate;
             this.pageNo = "1";
             this.rows = 10;
             this.pureRange = "";

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 469 - 234
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequestRequest.java


+ 35 - 32
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerSaveRequestRequest.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.huanong.crawler.entity.request;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.jzg.quotation.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
 import com.jzg.quotation.huanong.enums.dictionary.Risk;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -23,16 +24,18 @@ public class HuaNongCrawlerSaveRequestRequest implements HuaNongHeadRequest {
     @Serial
     private static final long serialVersionUID = 5383273187105919255L;
 
-    @JsonProperty("head")
+    @JSONField(name="head")
     private HuaNongCrawlerRequestBaseHead head;
-    @JsonProperty("businessData")
+
+    @JSONField(name="businessData")
     private BusinessDataDTO businessData;
-    @JsonProperty("loginCom")
+
+    @JSONField(name="loginCom")
     private String loginCom;
 
 
-    public HuaNongCrawlerSaveRequestRequest(List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractDTO> contract,
-                                            List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractAccidentDTO> contractAccident,
+    public HuaNongCrawlerSaveRequestRequest(List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contract,
+                                            List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractAccidentDTO> contractAccident,
                                             String token, String loginCom) {
         this.head = new HuaNongCrawlerRequestBaseHead(token);
         this.businessData = new BusinessDataDTO(contract, contractAccident);
@@ -43,25 +46,25 @@ public class HuaNongCrawlerSaveRequestRequest implements HuaNongHeadRequest {
     @NoArgsConstructor
     @Data
     public static class BusinessDataDTO {
-        @JsonProperty("contract")
+        @JSONField(name="contract")
         private List<ContractDTO> contract;
-        @JsonProperty("contractNveh")
+        @JSONField(name="contractNveh")
         private List<ContractNvehDTO> contractNveh;
-        @JsonProperty("contractHome")
+        @JSONField(name="contractHome")
         private List<Object> contractHome;
-        @JsonProperty("contractGlass")
+        @JSONField(name="contractGlass")
         private List<Object> contractGlass;
-        @JsonProperty("ciDemandNo")
+        @JSONField(name="ciDemandNo")
         private String ciDemandNo;
-        @JsonProperty("biDemandNo")
+        @JSONField(name="biDemandNo")
         private String biDemandNo;
-        @JsonProperty("ocrCarInfoId")
+        @JSONField(name="ocrCarInfoId")
         private List<Object> ocrCarInfoId;
-        @JsonProperty("ocrIdentityInfoId")
+        @JSONField(name="ocrIdentityInfoId")
         private List<Object> ocrIdentityInfoId;
 
-        public BusinessDataDTO(List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractDTO> contract,
-                               List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractAccidentDTO> contractAccident) {
+        public BusinessDataDTO(List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contract,
+                               List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractAccidentDTO> contractAccident) {
             this.contract = new ArrayList<>();
             contract.forEach(item -> {
                 String riskCode = item.getContractMain().getRiskCode();
@@ -70,7 +73,7 @@ public class HuaNongCrawlerSaveRequestRequest implements HuaNongHeadRequest {
                 } else {
                     this.biDemandNo = item.getPlatFormMessage().getQuerySequenceNo();
                 }
-                this.contract.add(new ContractDTO(riskCode, item.getContractMain().getContractNo()));
+                this.contract.add(new ContractDTO(riskCode, item.getContractMain()));
             });
             this.contractGlass = Collections.emptyList();
             this.contractHome = Collections.emptyList();
@@ -84,42 +87,42 @@ public class HuaNongCrawlerSaveRequestRequest implements HuaNongHeadRequest {
         @NoArgsConstructor
         @Data
         public static class ContractDTO {
-            @JsonProperty("provisonalNo")
+            @JSONField(name="provisonalNo")
             private String provisonalNo;
-            @JsonProperty("relationProNo")
+            @JSONField(name="relationProNo")
             private String relationProNo;
-            @JsonProperty("proposalNo")
+            @JSONField(name="proposalNo")
             private String proposalNo;
-            @JsonProperty("riskCode")
+            @JSONField(name="riskCode")
             private String riskCode;
-            @JsonProperty("ocrId")
+            @JSONField(name="ocrId")
             private String ocrId;
-            @JsonProperty("peerComparisonFlag")
+            @JSONField(name="peerComparisonFlag")
             private String peerComparisonFlag;
 
-            public ContractDTO(String riskCode, String contractNo) {
-                this.provisonalNo = contractNo;
-                this.relationProNo = contractNo;
+            public ContractDTO(String riskCode, HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.ContractMainDTO contractNo) {
+                this.provisonalNo = contractNo.getContractNo();
+                this.relationProNo = contractNo.getRelationProNo();
                 this.proposalNo = "";
                 this.riskCode = riskCode;
                 this.ocrId = "";
-                this.peerComparisonFlag = "";
+                this.peerComparisonFlag = contractNo.getPeerComparisonFlag();
             }
         }
 
         @NoArgsConstructor
         @Data
         public static class ContractNvehDTO {
-            @JsonProperty("provisonalNo")
+            @JSONField(name="provisonalNo")
             private String provisonalNo;
-            @JsonProperty("relationProNo")
+            @JSONField(name="relationProNo")
             private String relationProNo;
-            @JsonProperty("proposalNo")
+            @JSONField(name="proposalNo")
             private String proposalNo;
-            @JsonProperty("riskCode")
+            @JSONField(name="riskCode")
             private String riskCode;
 
-            public ContractNvehDTO(HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractAccidentDTO.ContractMainDTO contractMain) {
+            public ContractNvehDTO(HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractAccidentDTO.ContractMainDTO contractMain) {
                 this.provisonalNo = contractMain.getContractNo();
                 this.relationProNo = "";
                 this.proposalNo = "";

+ 20 - 12
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

@@ -56,13 +56,13 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) {
         HttpHeaders httpHeaders = new HttpHeaders();
-        AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
+        AttributionInformationVo attributionInformationVo = getAttributionInformationVo(quoteVo);
         HuaNongCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         RMap<String, Object> authorization = huaNongCrawlerGetToken.getAuthorization(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         String token = (String) authorization.get(HuaNongCrawlerCacheComponent.TOKEN);
-
         String loginCom = parameters.getLoginCom();
         String loginComCode = (String) authorization.get(loginCom);
+
         // 归属信息
         HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.SaleInfoDTO saleInfoDTO = huaNongCrawlerQuoteProcessService.attributionInformation(parameters, attributionInformationVo.getUsername(), token, loginComCode);
 
@@ -87,23 +87,27 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
         HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse = huaNongCrawlerRequestComponent.quotedPrice(huaNongCrawlerQuotedPriceRequest, httpHeaders);
 
         // 保存
-        HuaNongCrawlerSaveRequestRequest huaNongCrawlerSaveRequest = getHuaNongCrawlerSaveRequestRequest(huaNongCrawlerQuotedPriceRequest, token, loginComCode);
+        HuaNongCrawlerSaveRequestRequest huaNongCrawlerSaveRequest = getHuaNongCrawlerSaveRequestRequest(huaNongCrawlerQuotedPriceResponse, token, loginComCode);
         huaNongCrawlerRequestComponent.save(huaNongCrawlerSaveRequest, httpHeaders);
 
         return HuaNongCrawlerQuoteResultsVoBuild.buildQuoteResultsVo(quoteVo.getOrder()
                 .getOrdersNo(), quoteVo, huaNongCrawlerQuotedPriceResponse);
     }
 
+    private static AttributionInformationVo getAttributionInformationVo(QuoteVo quoteVo) {
+        AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
+        return attributionInformationVo;
+    }
+
     @NotNull
-    private static HuaNongCrawlerSaveRequestRequest getHuaNongCrawlerSaveRequestRequest(HuaNongCrawlerQuotedPriceRequestRequest huaNongCrawlerQuotedPriceRequest, String token, String loginComCode) {
-        List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractDTO> contract = huaNongCrawlerQuotedPriceRequest.getBusinessData()
+    private static HuaNongCrawlerSaveRequestRequest getHuaNongCrawlerSaveRequestRequest(HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse, String token, String loginComCode) {
+        List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contract = huaNongCrawlerQuotedPriceResponse.getBusinessData()
                 .getContract();
-        List<HuaNongCrawlerQuotedPriceRequestRequest.BusinessDataDTO.ContractAccidentDTO> contractAccident =
-                Optional.ofNullable(huaNongCrawlerQuotedPriceRequest.getBusinessData().getContractAccident())
+        List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractAccidentDTO> contractAccident =
+                Optional.ofNullable(huaNongCrawlerQuotedPriceResponse.getBusinessData().getContractAccident())
                         .orElse(new ArrayList<>());
 
-        HuaNongCrawlerSaveRequestRequest huaNongCrawlerSaveRequest = new HuaNongCrawlerSaveRequestRequest(contract, contractAccident, token, loginComCode);
-        return huaNongCrawlerSaveRequest;
+        return new HuaNongCrawlerSaveRequestRequest(contract, contractAccident, token, loginComCode);
     }
 
     @Override
@@ -183,12 +187,16 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
     @Override
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
         AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
-        HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
-        String token = huaNongCrawlerGetToken.getToken(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+        HuaNongCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
+        RMap<String, Object> authorization = huaNongCrawlerGetToken.getAuthorization(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+        String token = (String) authorization.get(HuaNongCrawlerCacheComponent.TOKEN);
+        String loginCom = parameters.getLoginCom();
+        String loginComCode = (String) authorization.get(loginCom);
+
         HttpHeaders httpHeaders = new HttpHeaders();
         HuaNongCrawlerOrder order = huaNongCrawlerOrderService.getById(orderStatusVo.getOrder().getOrdersNo());
 
-        HuaNongCrawlerFindBusinessesRequestRequest huaNongCrawlerFindBusinessesRequest = new HuaNongCrawlerFindBusinessesRequestRequest();
+        HuaNongCrawlerFindBusinessesRequestRequest huaNongCrawlerFindBusinessesRequest = new HuaNongCrawlerFindBusinessesRequestRequest(token, loginComCode);
         huaNongCrawlerRequestComponent.findBusinesses(huaNongCrawlerFindBusinessesRequest, httpHeaders);
         return null;
     }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно