update

1.国任爬虫报价接口调试

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationBaseService.java

@@ -37,6 +37,7 @@ public interface QuotationBaseService {
      * 下载保单
      */
     DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo downloadPolicyVo);
+
     /**
      * 查询订单状态
      */

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/component/GuoRenCrawlerRequestComponent.java

@@ -12,6 +12,7 @@ import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.guoren.crawler.constant.enums.RequestUrl;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.request.*;
 import com.jzg.quotation.guoren.crawler.entity.response.*;
 import com.jzg.quotation.guoren.crawler.properties.GuoRenCrawlerProperties;
@@ -236,7 +237,7 @@ public class GuoRenCrawlerRequestComponent {
      * @param httpHeaders       请求头
      * @return 车价查询响应
      */
-    public GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTitemCarDTO getCarPriceData(GuoRenCrawlerQueryCarModelData.ContentDTO queryCarModelData, GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO prpTmainDTO,
+    public GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTitemCarDTO getCarPriceData(GuoRenCrawlerQueryCarModelData.ContentDTO queryCarModelData, PrpTMainDTO prpTmainDTO,
                                                                                        QuoteVo quoteVo,
                                                                                        GuoRenCrawlerWriteBackAddressData ownersAddr, String relationShip, HttpHeaders httpHeaders) {
         GuoRenCrawlerGetCarPriceRequest getCarPriceRequest = new GuoRenCrawlerGetCarPriceRequest(queryCarModelData, prpTmainDTO, quoteVo, ownersAddr, relationShip);
@@ -262,12 +263,16 @@ public class GuoRenCrawlerRequestComponent {
      *
      * 保存投保单
      *
-     * @param crawlerCalculationPremiumRequest 报价请求参数
-     * @param httpHeaders                      请求头
+     * @param calculationPremiumRequest 报价请求参数
+     * @param calculationPremium        报价响应参数
+     * @param httpHeaders               请求头
      * @return 投保单号
      */
-    public GuoRenCrawlerProposalNoSaveData proposalNoSave(GuoRenCrawlerCalculationPremiumRequest crawlerCalculationPremiumRequest, HttpHeaders httpHeaders) {
-        return request(RequestUrl.PROPOSAL_NO_SAVE, crawlerCalculationPremiumRequest, httpHeaders);
+    public GuoRenCrawlerProposalNoSaveData proposalNoSave(GuoRenCrawlerCalculationPremiumRequest calculationPremiumRequest, GuoRenCrawlerCalculationPremiumData calculationPremium, HttpHeaders httpHeaders) {
+        GuoRenCrawlerProposalNoSaveRequest guoRenCrawlerProposalNoSaveRequest = new GuoRenCrawlerProposalNoSaveRequest(calculationPremium, calculationPremiumRequest);
+        GuoRenCrawlerBaseResponse<GuoRenCrawlerProposalNoSaveData> request = request(RequestUrl.PROPOSAL_NO_SAVE, guoRenCrawlerProposalNoSaveRequest, new ParameterizedTypeReference<>() {
+        }, httpHeaders);
+        return request.getData();
     }
 
     /**
@@ -313,6 +318,33 @@ public class GuoRenCrawlerRequestComponent {
         return submitUnderwriteDataList.get(0);
     }
 
+    /**
+     * 获取支付链接
+     *
+     * @param proposalNo  投保单号
+     * @param httpHeaders 请求头
+     * @return
+     */
+    public GuoRenCrawlerCheckNoticeData checkNoticeData(String proposalNo, HttpHeaders httpHeaders) {
+        GuoRenCrawlerCheckNoticeRequest checkNotice = new GuoRenCrawlerCheckNoticeRequest(proposalNo);
+        return request(RequestUrl.CHECK_NOTICE, checkNotice, httpHeaders);
+    }
+
+    /**
+     * 获取小程序支付链接
+     *
+     * @param proposalNoBi 交强投保单号
+     * @param proposalNoCi 商业投保单号
+     * @param elecapplyurl 链接
+     * @param httpHeaders  请求头
+     * @return
+     */
+    public GuoRenCrawlerGetEleProposalQRCoreData getEleProposalQRCoreData(String proposalNoBi, String proposalNoCi, String elecapplyurl, HttpHeaders httpHeaders) {
+        GuoRenCrawlerGetEleProposalQRCoreRequest checkNotice = new GuoRenCrawlerGetEleProposalQRCoreRequest(proposalNoBi, proposalNoCi, elecapplyurl);
+        return request(RequestUrl.GET_ELE_PROPOSAL_QR_CORE, checkNotice, new ParameterizedTypeReference<>() {
+        }, httpHeaders);
+    }
+
     /**
      * 投保单查询
      *

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

@@ -31,6 +31,9 @@ public enum RequestUrl implements CrawlerRequestUrlStandard {
     UPLOAD("/api/grecar/photo/upload", "上传影像"),
     SUBMIT_UNDERWRITE("/api/grecar/ecar/submitUnderwrite", "提交核保"),
 
+    CHECK_NOTICE("/api/grepolicycenter/epolicy/checkNotice", "查询电子投保单"),
+    GET_ELE_PROPOSAL_QR_CORE("/api/grsavecarcore/savecarcore/getEleProposalQRCore", "获取二维码"),
+
     QUERY_PRPALL_PROPOSAL_INFO("/api/grecar/proposalSearch/queryPrpallProposalInfo", "订单状态查询"),
 
     TRANS_CODE_ELE_POLICY_NO("/api/grecar/print/transCodeElePolicyNo", "查询下载电子保单的编码"),

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/dto/PrpTMainDTO.java

@@ -0,0 +1,693 @@
+package com.jzg.quotation.guoren.crawler.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.commons.utils.TimeProcessing;
+import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerGetAgentAgreementResponse;
+import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerInitSelectResponse;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+
+@NoArgsConstructor
+@Data
+public class PrpTMainDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -1506154526496095056L;
+
+
+    @JsonProperty("agreementNo")
+    private String agreementNo;
+
+    @JsonProperty("project")
+    private String project;
+
+    @JsonProperty("cooprOutlets")
+    private String cooprOutlets;
+
+    @JsonProperty("commissionerNo")
+    private String commissionerNo;
+
+    @JsonProperty("comName")
+    private String comName;
+
+    @JsonProperty("handler1Name")
+    private String handler1Name;
+
+    @JsonProperty("agentName")
+    private String agentName;
+
+    @JsonProperty("unitMaintenanceName")
+    private String unitMaintenanceName;
+
+    @JsonProperty("unitMaintenanceType1Name")
+    private String unitMaintenanceType1Name;
+
+    @JsonProperty("channeltypeoneName")
+    private String channeltypeoneName;
+
+    @JsonProperty("unitMaintenanceType2Name")
+    private String unitMaintenanceType2Name;
+
+    @JsonProperty("channeltypetwoName")
+    private String channeltypetwoName;
+
+    /**
+     * 1 诉讼 2 裁决
+     */
+    @JsonProperty("argueSolution")
+    private String argueSolution;
+
+    @JsonProperty("arbitboardName")
+    private String arbitboardName;
+
+    @JsonProperty("isExpressProtectionFlag")
+    private String isExpressProtectionFlag;
+
+    /**
+     * 电子投保单标识 1 电子投保单  0 传统投保单
+     */
+    @JsonProperty("eProposalFlag")
+    private String eProposalFlag;
+
+    @JsonProperty("appliFactorFlag")
+    private String appliFactorFlag;
+
+    @JsonProperty("insuredFactorFlag")
+    private String insuredFactorFlag;
+
+    @JsonProperty("handler1Code")
+    private String handler1Code;
+
+    @JsonProperty("channeltypeone")
+    private String channeltypeone;
+
+    @JsonProperty("channeltypetwo")
+    private String channeltypetwo;
+
+    @JsonProperty("classIdentifier")
+    private String classIdentifier;
+
+    @JsonProperty("unitMaintenanceCode")
+    private String unitMaintenanceCode;
+
+    @JsonProperty("unitmainTenanceType1")
+    private String unitmainTenanceType1;
+
+    @JsonProperty("unitmainTenanceType2")
+    private String unitmainTenanceType2;
+
+    @JsonProperty("isStandard")
+    private String isStandard;
+
+    @JsonProperty("uwELRrel1")
+    private String uwELRrel1;
+
+    @JsonProperty("uwELRrel2")
+    private String uwELRrel2;
+
+    @JsonProperty("templateName")
+    private String templateName;
+
+    @JsonProperty("templateNo")
+    private String templateNo;
+
+    @JsonProperty("deGentType")
+    private String deGentType;
+
+    @JsonProperty("saleProfessionalNum")
+    private String saleProfessionalNum;
+
+    @JsonProperty("lifeAgentName")
+    private String lifeAgentName;
+
+    @JsonProperty("lifeAgentCode")
+    private String lifeAgentCode;
+
+    @JsonProperty("internetFlag")
+    private String internetFlag;
+
+    @JsonProperty("internetPlatform")
+    private String internetPlatform;
+
+    @JsonProperty("internetSource")
+    private String internetSource;
+
+    @JsonProperty("platformCategory")
+    private String platformCategory;
+
+    @JsonProperty("fcAgentCode")
+    private String fcAgentCode;
+
+    @JsonProperty("fcAgentName")
+    private String fcAgentName;
+
+    @JsonProperty("fcAgreementNo")
+    private String fcAgreementNo;
+
+    @JsonProperty("fcAgreementNoName")
+    private String fcAgreementNoName;
+
+    @JsonProperty("fcBusinessNature")
+    private String fcBusinessNature;
+
+    @JsonProperty("fcHandler1Code")
+    private String fcHandler1Code;
+
+    @JsonProperty("fcHandler1Name")
+    private String fcHandler1Name;
+
+    @JsonProperty("fcSaleProfessionalNum")
+    private String fcSaleProfessionalNum;
+
+    @JsonProperty("fclifeAgentName")
+    private String fclifeAgentName;
+
+    @JsonProperty("comCode")
+    private String comCode;
+
+    @JsonProperty("businessNature")
+    private String businessNature;
+
+    @JsonProperty("agentCode")
+    private String agentCode;
+
+    @JsonProperty("agentCanalCode")
+    private String agentCanalCode;
+
+    @JsonProperty("serviceStrategy")
+    private String serviceStrategy;
+
+    @JsonProperty("cooprOutletsNo")
+    private String cooprOutletsNo;
+
+    @JsonProperty("saleName")
+    private String saleName;
+
+    @JsonProperty("remark")
+    private String remark;
+
+    @JsonProperty("amlCode")
+    private String amlCode;
+
+    @JsonProperty("operateDate")
+    private String operateDate;
+
+    @JsonProperty("policySort")
+    private String policySort;
+
+    @JsonProperty("serviceLabelName")
+    private String serviceLabelName;
+
+    @JsonProperty("uniteBusinessFlag")
+    private Integer uniteBusinessFlag;
+
+    @JsonProperty("noCarFlag")
+    private Integer noCarFlag;
+
+    @JsonProperty("goodCodes")
+    private List<?> goodCodes;
+
+    @JsonProperty("noCarPremium")
+    private Integer noCarPremium;
+
+    @JsonProperty("certiNo")
+    private String certiNo;
+
+    @JsonProperty("certino1")
+    private String certino1;
+
+    @JsonProperty("business")
+    private Object business;
+
+    @JsonProperty("operatorCode")
+    private String operatorCode;
+
+    @JsonProperty("signDate")
+    private String signDate;
+
+    @JsonProperty("loginComCode")
+    private String loginComCode;
+
+    @JsonProperty("noCarCodes")
+    private String noCarCodes;
+
+    @JsonProperty("cooprOutletsName")
+    private String cooprOutletsName;
+
+    @JsonProperty("proposalNo")
+    private String proposalNo;
+
+    @JsonProperty("renewalFlag")
+    private String renewalFlag;
+
+    @JsonProperty("classCode")
+    private String classCode;
+
+    @JsonProperty("riskCode")
+    private String riskCode;
+
+    @JsonProperty("contractNo")
+    private String contractNo;
+
+    @JsonProperty("printNo")
+    private String printNo;
+
+    @JsonProperty("language")
+    private String language;
+
+    @JsonProperty("policyType")
+    private String policyType;
+
+    @JsonProperty("appliCode")
+    private String appliCode;
+
+    @JsonProperty("appliName")
+    private String appliName;
+
+    @JsonProperty("appliAddress")
+    private String appliAddress;
+
+    @JsonProperty("insuredCode")
+    private String insuredCode;
+
+    @JsonProperty("insuredName")
+    private String insuredName;
+
+    @JsonProperty("insuredAddress")
+    private String insuredAddress;
+
+
+    @JsonProperty("startDate")
+    private String startDate;
+
+    @JsonProperty("startHour")
+    private Integer startHour;
+
+    @JsonProperty("startMinute")
+    private Integer startMinute;
+
+    @JsonProperty("endMinute")
+    private Integer endMinute;
+
+    @JsonProperty("endDate")
+    private String endDate;
+
+    @JsonProperty("endHour")
+    private Integer endHour;
+
+    @JsonProperty("pureRate")
+    private Integer pureRate;
+
+    @JsonProperty("disRate")
+    private Integer disRate;
+
+    @JsonProperty("disCount")
+    private Double disCount;
+
+    @JsonProperty("currency")
+    private String currency;
+
+    @JsonProperty("sumAmount")
+    private Integer sumAmount;
+
+    @JsonProperty("sumPremium")
+    private Double sumPremium;
+
+    @JsonProperty("sumSubprem")
+    private Integer sumSubprem;
+
+    @JsonProperty("sumQuantity")
+    private Integer sumQuantity;
+
+    @JsonProperty("judicalCode")
+    private String judicalCode;
+
+    @JsonProperty("judicalScope")
+    private String judicalScope;
+
+    @JsonProperty("autoTransRenewFlag")
+    private String autoTransRenewFlag;
+
+
+    @JsonProperty("makeCom")
+    private String makeCom;
+
+    @JsonProperty("operateSite")
+    private String operateSite;
+
+
+    @JsonProperty("handlerCode")
+    private String handlerCode;
+
+
+    @JsonProperty("approverCode")
+    private String approverCode;
+
+    @JsonProperty("underWriteCode")
+    private String underWriteCode;
+
+    @JsonProperty("underWriteName")
+    private String underWriteName;
+
+
+    @JsonProperty("inputDate")
+    private String inputDate;
+
+    @JsonProperty("inputHour")
+    private Integer inputHour;
+
+    @JsonProperty("statiSticSym")
+    private String statiSticSym;
+
+
+    @JsonProperty("coinsFlag")
+    private String coinsFlag;
+
+    @JsonProperty("reinsFlag")
+    private String reinsFlag;
+
+    @JsonProperty("allinsFlag")
+    private String allinsFlag;
+
+    @JsonProperty("underwriteFlag")
+    private String underwriteFlag;
+
+    @JsonProperty("othFlag")
+    private String othFlag;
+
+    @JsonProperty("disRate1")
+    private Integer disRate1;
+
+    @JsonProperty("businessFlag")
+    private String businessFlag;
+
+    @JsonProperty("updaterCode")
+    private String updaterCode;
+
+    @JsonProperty("updateDate")
+    private String updateDate;
+
+    @JsonProperty("upDateHour")
+    private String upDateHour;
+
+    @JsonProperty("shareHolderFlag")
+    private String shareHolderFlag;
+
+    @JsonProperty("inquiryNo")
+    private String inquiryNo;
+
+    @JsonProperty("payMode")
+    private String payMode;
+
+    @JsonProperty("policyNo")
+    private String policyNo;
+
+    @JsonProperty("visaCode")
+    private String visaCode;
+
+    @JsonProperty("manualType")
+    private String manualType;
+
+    @JsonProperty("businessKind")
+    private String businessKind;
+
+    @JsonProperty("businessClass")
+    private String businessClass;
+
+    @JsonProperty("manualFlag")
+    private String manualFlag;
+
+    @JsonProperty("businessRemark1")
+    private String businessRemark1;
+
+    @JsonProperty("businessRemark2")
+    private String businessRemark2;
+
+    @JsonProperty("domesticFlag")
+    private String domesticFlag;
+
+    @JsonProperty("ventureFlag")
+    private String ventureFlag;
+
+    @JsonProperty("bidFlag")
+    private String bidFlag;
+
+    @JsonProperty("agriFlag")
+    private String agriFlag;
+
+    @JsonProperty("agriNature")
+    private String agriNature;
+
+    @JsonProperty("groupPurchaseFlag")
+    private String groupPurchaseFlag;
+
+    @JsonProperty("productCode")
+    private String productCode;
+
+    @JsonProperty("payMethod")
+    private String payMethod;
+
+    @JsonProperty("immeValiFlag")
+    private String immeValiFlag;
+
+    @JsonProperty("lifeManageComCode")
+    private String lifeManageComCode;
+
+    @JsonProperty("lifeChannelType")
+    private String lifeChannelType;
+
+    @JsonProperty("lifeSalecomCode")
+    private String lifeSalecomCode;
+
+    @JsonProperty("lifeAppcontNo")
+    private String lifeAppcontNo;
+
+    @JsonProperty("saleMobile")
+    private String saleMobile;
+
+    @JsonProperty("isPersonal")
+    private String isPersonal;
+
+    @JsonProperty("subRiskCode")
+    private String subRiskCode;
+
+    @JsonProperty("ePolicySort")
+    private String ePolicySort;
+
+    @JsonProperty("policyUrl")
+    private String policyUrl;
+
+    @JsonProperty("captcha")
+    private String captcha;
+
+    @JsonProperty("eFlag")
+    private String eFlag;
+
+    @JsonProperty("uploadTime")
+    private String uploadTime;
+
+    @JsonProperty("businessNatureNew")
+    private String businessNatureNew;
+
+    @JsonProperty("groupBuySize")
+    private Integer groupBuySize;
+
+    @JsonProperty("businessMark")
+    private String businessMark;
+
+    @JsonProperty("mainBankName")
+    private String mainBankName;
+
+    @JsonProperty("otherBankName")
+    private String otherBankName;
+
+    @JsonProperty("sumnoTaxPremium")
+    private Double sumnoTaxPremium;
+
+    @JsonProperty("sumTaxFee")
+    private Double sumTaxFee;
+
+    @JsonProperty("linkerName")
+    private String linkerName;
+
+    @JsonProperty("linkerMobile")
+    private String linkerMobile;
+
+    @JsonProperty("linkerAddress")
+    private String linkerAddress;
+
+    @JsonProperty("dataSourceCode")
+    private String dataSourceCode;
+
+    @JsonProperty("policySequenceNo")
+    private String policySequenceNo;
+
+    @JsonProperty("underwritSequenceNo")
+    private String underwritSequenceNo;
+
+    @JsonProperty("infoManagerFlag")
+    private String infoManagerFlag;
+
+    @JsonProperty("teamCode")
+    private String teamCode;
+
+    @JsonProperty("teamName")
+    private String teamName;
+
+    @JsonProperty("teamTypeId")
+    private String teamTypeId;
+
+    @JsonProperty("teamTypeIdName")
+    private String teamTypeIdName;
+
+    @JsonProperty("teamTypeTwo")
+    private String teamTypeTwo;
+
+    @JsonProperty("teamTypeTwoName")
+    private String teamTypeTwoName;
+
+    @JsonProperty("teamTypeThree")
+    private String teamTypeThree;
+
+    @JsonProperty("teamTypeThreeName")
+    private String teamTypeThreeName;
+
+    @JsonProperty("customerGroupName")
+    private String customerGroupName;
+
+    @JsonProperty("businessNatureOne")
+    private String businessNatureOne;
+
+    @JsonProperty("businessNatureOneName")
+    private String businessNatureOneName;
+
+    @JsonProperty("businessNatureThree")
+    private String businessNatureThree;
+
+    @JsonProperty("businessNatureTwo")
+    private String businessNatureTwo;
+
+    @JsonProperty("businessNatureTwoName")
+    private String businessNatureTwoName;
+
+    @JsonProperty("businessNaturethreeName")
+    private String businessNaturethreeName;
+
+    @JsonProperty("feeandDiscountFlag")
+    private Integer feeandDiscountFlag;
+
+    @JsonProperty("saleChange")
+    private Double saleChange;
+
+    @JsonProperty("oaFlowNumber")
+    private String oaFlowNumber;
+
+    @JsonProperty("upDateTime")
+    private String upDateTime;
+
+    @JsonProperty("underWriteendTime")
+    private String underWriteendTime;
+
+    @JsonProperty("answer")
+    private String answer;
+
+    @JsonProperty("orderNo")
+    private String orderNo;
+
+    @JsonProperty("simpleOrderFlag")
+    private String simpleOrderFlag;
+
+    @JsonProperty("hisOrderNo")
+    private String hisOrderNo;
+
+    @JsonProperty("startDateFlag")
+    private String startDateFlag;
+
+    @JsonProperty("saleGentType")
+    private String saleGentType;
+
+    @JsonProperty("demandNo")
+    private String demandNo;
+
+    @JsonProperty("correction_applicant")
+    private String correctionApplicant;
+
+
+    @JsonProperty("firstProposalDate")
+    private String firstProposalDate;
+
+    @JsonProperty("isbatchProposalNo")
+    private String isbatchProposalNo;
+
+    @JsonProperty("carsonlyid")
+    private String carsonlyid;
+
+    @JsonProperty("flag")
+    private String flag;
+
+
+    public PrpTMainDTO(GuoRenCrawlerInitSelectResponse.CodeDataDTO comCodeData, GuoRenCrawlerInitSelectResponse.CodeDataDTO agentCodeData,
+                       GuoRenCrawlerGetAgentAgreementResponse.PrpDagreeDetailDtoListDTO agentAgreement, GuoRenCrawlerInitSelectResponse.CodeDataDTO handlerCodeData,
+                       GuoRenCrawlerInitSelectResponse.CodeDataDTO unitMaintenanceCodeData, String businessSources, String username) {
+        String today = TimeProcessing.nowDate();
+        this.agreementNo = agentAgreement.getAgreementNo();
+        this.project = "";
+        this.cooprOutlets = "";
+        this.commissionerNo = "";
+        this.comName = comCodeData.getCodeName();
+        this.handler1Name = agentAgreement.getHandlerName();
+        this.agentName = agentCodeData.getCodeName();
+        this.unitMaintenanceName = unitMaintenanceCodeData.getCodeName();
+        this.unitMaintenanceType1Name = unitMaintenanceCodeData.getUnitmainTenanceType1Name();
+        this.channeltypeoneName = handlerCodeData.getChannelTypeOneName();
+        this.unitMaintenanceType2Name = unitMaintenanceCodeData.getUnitmainTenanceType2Name();
+        this.channeltypetwoName = handlerCodeData.getChannelTypeTwoName();
+        this.argueSolution = "1";
+        this.arbitboardName = "";
+        this.isExpressProtectionFlag = "JSB00";
+        this.eProposalFlag = "1";
+        this.appliFactorFlag = "";
+        this.insuredFactorFlag = "";
+        this.handler1Code = handlerCodeData.getCodeCode();
+        this.channeltypeone = handlerCodeData.getChannelTypeOne();
+        this.channeltypetwo = handlerCodeData.getChannelTepeTwo();
+        this.classIdentifier = unitMaintenanceCodeData.getClassIdentifier();
+        this.unitMaintenanceCode = unitMaintenanceCodeData.getCodeCode();
+        this.unitmainTenanceType1 = unitMaintenanceCodeData.getUnitmainTenanceType1();
+        this.unitmainTenanceType2 = unitMaintenanceCodeData.getUnitmainTenanceType2();
+        this.isStandard = unitMaintenanceCodeData.getIsStandard();
+        this.uwELRrel1 = unitMaintenanceCodeData.getUwELRrel1();
+        this.uwELRrel2 = unitMaintenanceCodeData.getUwELRrel2();
+        this.templateName = "";
+        this.templateNo = "";
+        this.deGentType = "";
+        this.saleProfessionalNum = "";
+        this.lifeAgentName = "";
+        this.lifeAgentCode = "";
+        this.comCode = comCodeData.getCodeCode();
+        this.businessNature = businessSources;
+        this.agentCode = agentCodeData.getCodeCode();
+        this.agentCanalCode = " ";
+        this.saleName = "";
+        this.amlCode = "";
+        this.operateDate = today;
+        this.serviceLabelName = "";
+        this.uniteBusinessFlag = 0;
+        this.noCarFlag = 0;
+        this.goodCodes = Collections.emptyList();
+        this.noCarPremium = 0;
+        this.business = null;
+        this.cooprOutletsName = "";
+        this.operatorCode = username;
+        this.signDate = today;
+        this.loginComCode = comCodeData.getCodeCode();
+    }
+
+
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerCalculationPremiumRequest.java

@@ -7,6 +7,7 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.guoren.crawler.constant.enums.InsuranceMap;
 import com.jzg.quotation.guoren.crawler.entity.dto.CiInsureDemandDTO;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.dto.PrptengageListDTO;
 import com.jzg.quotation.guoren.crawler.entity.po.InsuranceItem;
 import com.jzg.quotation.guoren.crawler.entity.po.TaxResult;
@@ -46,7 +47,7 @@ public class GuoRenCrawlerCalculationPremiumRequest {
     @JsonProperty("ci")
     private CiDTO ci;
 
-    public GuoRenCrawlerCalculationPremiumRequest(QuoteVo quoteVo, BcDTO.PrpTmainDTO prpTmainDTO, BcDTO.PrpTitemCarDTO prpTitemCar, GuoRenCrawlerWriteBackAddressData policyHolderAddr, GuoRenCrawlerWriteBackAddressData insuredPersonAddr, int insuredTypeTmp) {
+    public GuoRenCrawlerCalculationPremiumRequest(QuoteVo quoteVo, PrpTMainDTO prpTmainDTO, BcDTO.PrpTitemCarDTO prpTitemCar, GuoRenCrawlerWriteBackAddressData policyHolderAddr, GuoRenCrawlerWriteBackAddressData insuredPersonAddr, int insuredTypeTmp) {
         this.bc = new BcDTO(quoteVo, prpTmainDTO, prpTitemCar, insuredTypeTmp, policyHolderAddr, insuredPersonAddr);
         String loginRiskCode;
         if (quoteVo.getBiRiskInfoVo() != null) {
@@ -71,7 +72,7 @@ public class GuoRenCrawlerCalculationPremiumRequest {
         private String riskCode;
 
         @JsonProperty("prpTmain")
-        private PrpTmainDTO prpTmain;
+        private PrpTMainDTO prpTmain;
 
         @JsonProperty("prpTitemCar")
         private PrpTitemCarDTO prpTitemCar;
@@ -113,7 +114,7 @@ public class GuoRenCrawlerCalculationPremiumRequest {
         private String feeandDiscountFlag;
 
 
-        public BcDTO(QuoteVo quoteVo, PrpTmainDTO prpTmainDTO, PrpTitemCarDTO prpTitemCar, Integer insuredTypeTmp, GuoRenCrawlerWriteBackAddressData policyHolderAddr, GuoRenCrawlerWriteBackAddressData insuredPersonAddr) {
+        public BcDTO(QuoteVo quoteVo, PrpTMainDTO prpTmainDTO, PrpTitemCarDTO prpTitemCar, Integer insuredTypeTmp, GuoRenCrawlerWriteBackAddressData policyHolderAddr, GuoRenCrawlerWriteBackAddressData insuredPersonAddr) {
             this.baseInfoInit = 2;
             this.riskCode = "0500";
             this.prpTmain = prpTmainDTO;
@@ -132,287 +133,6 @@ public class GuoRenCrawlerCalculationPremiumRequest {
             this.feeandDiscountFlag = "0";
         }
 
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainDTO {
-            @JsonProperty("agreementNo")
-            private String agreementNo;
-
-            @JsonProperty("project")
-            private String project;
-
-            @JsonProperty("cooprOutlets")
-            private String cooprOutlets;
-
-            @JsonProperty("commissionerNo")
-            private String commissionerNo;
-
-            @JsonProperty("comName")
-            private String comName;
-
-            @JsonProperty("handler1Name")
-            private String handler1Name;
-
-            @JsonProperty("agentName")
-            private String agentName;
-
-            @JsonProperty("unitMaintenanceName")
-            private String unitMaintenanceName;
-
-            @JsonProperty("unitMaintenanceType1Name")
-            private String unitMaintenanceType1Name;
-
-            @JsonProperty("channeltypeoneName")
-            private String channeltypeoneName;
-
-            @JsonProperty("unitMaintenanceType2Name")
-            private String unitMaintenanceType2Name;
-
-            @JsonProperty("channeltypetwoName")
-            private String channeltypetwoName;
-
-            /**
-             * 1 诉讼 2 裁决
-             */
-            @JsonProperty("argueSolution")
-            private String argueSolution;
-
-            @JsonProperty("arbitboardName")
-            private String arbitboardName;
-
-            @JsonProperty("isExpressProtectionFlag")
-            private String isExpressProtectionFlag;
-
-            /**
-             * 电子投保单标识 1 电子投保单  0 传统投保单
-             */
-            @JsonProperty("eProposalFlag")
-            private String eProposalFlag;
-
-            @JsonProperty("appliFactorFlag")
-            private String appliFactorFlag;
-
-            @JsonProperty("insuredFactorFlag")
-            private String insuredFactorFlag;
-
-            @JsonProperty("handler1Code")
-            private String handler1Code;
-
-            @JsonProperty("channeltypeone")
-            private String channeltypeone;
-
-            @JsonProperty("channeltypetwo")
-            private String channeltypetwo;
-
-            @JsonProperty("classIdentifier")
-            private String classIdentifier;
-
-            @JsonProperty("unitMaintenanceCode")
-            private String unitMaintenanceCode;
-
-            @JsonProperty("unitmainTenanceType1")
-            private String unitmainTenanceType1;
-
-            @JsonProperty("unitmainTenanceType2")
-            private String unitmainTenanceType2;
-
-            @JsonProperty("isStandard")
-            private String isStandard;
-
-            @JsonProperty("uwELRrel1")
-            private String uwELRrel1;
-
-            @JsonProperty("uwELRrel2")
-            private String uwELRrel2;
-
-            @JsonProperty("templateName")
-            private String templateName;
-
-            @JsonProperty("templateNo")
-            private String templateNo;
-
-            @JsonProperty("deGentType")
-            private String deGentType;
-
-            @JsonProperty("saleProfessionalNum")
-            private String saleProfessionalNum;
-
-            @JsonProperty("lifeAgentName")
-            private String lifeAgentName;
-
-            @JsonProperty("lifeAgentCode")
-            private String lifeAgentCode;
-
-            @JsonProperty("internetFlag")
-            private String internetFlag;
-
-            @JsonProperty("internetPlatform")
-            private String internetPlatform;
-
-            @JsonProperty("internetSource")
-            private String internetSource;
-
-            @JsonProperty("platformCategory")
-            private String platformCategory;
-
-            @JsonProperty("fcAgentCode")
-            private String fcAgentCode;
-
-            @JsonProperty("fcAgentName")
-            private String fcAgentName;
-
-            @JsonProperty("fcAgreementNo")
-            private String fcAgreementNo;
-
-            @JsonProperty("fcAgreementNoName")
-            private String fcAgreementNoName;
-
-            @JsonProperty("fcBusinessNature")
-            private String fcBusinessNature;
-
-            @JsonProperty("fcHandler1Code")
-            private String fcHandler1Code;
-
-            @JsonProperty("fcHandler1Name")
-            private String fcHandler1Name;
-
-            @JsonProperty("fcSaleProfessionalNum")
-            private String fcSaleProfessionalNum;
-
-            @JsonProperty("fclifeAgentName")
-            private String fclifeAgentName;
-
-            @JsonProperty("comCode")
-            private String comCode;
-
-            @JsonProperty("businessNature")
-            private String businessNature;
-
-            @JsonProperty("agentCode")
-            private String agentCode;
-
-            @JsonProperty("agentCanalCode")
-            private String agentCanalCode;
-
-            @JsonProperty("serviceStrategy")
-            private String serviceStrategy;
-
-            @JsonProperty("cooprOutletsNo")
-            private String cooprOutletsNo;
-
-            @JsonProperty("saleName")
-            private String saleName;
-
-            @JsonProperty("remark")
-            private String remark;
-
-            @JsonProperty("amlCode")
-            private String amlCode;
-
-            @JsonProperty("operateDate")
-            private String operateDate;
-
-            @JsonProperty("policySort")
-            private String policySort;
-
-            @JsonProperty("serviceLabelName")
-            private String serviceLabelName;
-
-            @JsonProperty("uniteBusinessFlag")
-            private Integer uniteBusinessFlag;
-
-            @JsonProperty("noCarFlag")
-            private Integer noCarFlag;
-
-            @JsonProperty("goodCodes")
-            private List<?> goodCodes;
-
-            @JsonProperty("noCarPremium")
-            private Integer noCarPremium;
-
-            @JsonProperty("certiNo")
-            private String certiNo;
-
-            @JsonProperty("certino1")
-            private String certino1;
-
-            @JsonProperty("business")
-            private Object business;
-
-            @JsonProperty("operatorCode")
-            private String operatorCode;
-
-            @JsonProperty("signDate")
-            private String signDate;
-
-            @JsonProperty("loginComCode")
-            private String loginComCode;
-
-            @JsonProperty("noCarCodes")
-            private String noCarCodes;
-
-            @JsonProperty("cooprOutletsName")
-            private String cooprOutletsName;
-
-            public PrpTmainDTO(GuoRenCrawlerInitSelectResponse.CodeDataDTO comCodeData, GuoRenCrawlerInitSelectResponse.CodeDataDTO agentCodeData,
-                               GuoRenCrawlerGetAgentAgreementResponse.PrpDagreeDetailDtoListDTO agentAgreement, GuoRenCrawlerInitSelectResponse.CodeDataDTO handlerCodeData,
-                               GuoRenCrawlerInitSelectResponse.CodeDataDTO unitMaintenanceCodeData, String businessSources, String username) {
-                String today = TimeProcessing.nowDate();
-                this.agreementNo = agentAgreement.getAgreementNo();
-                this.project = "";
-                this.cooprOutlets = "";
-                this.commissionerNo = "";
-                this.comName = comCodeData.getCodeName();
-                this.handler1Name = agentAgreement.getHandlerName();
-                this.agentName = agentCodeData.getCodeName();
-                this.unitMaintenanceName = unitMaintenanceCodeData.getCodeName();
-                this.unitMaintenanceType1Name = unitMaintenanceCodeData.getUnitmainTenanceType1Name();
-                this.channeltypeoneName = handlerCodeData.getChannelTypeOneName();
-                this.unitMaintenanceType2Name = unitMaintenanceCodeData.getUnitmainTenanceType2Name();
-                this.channeltypetwoName = handlerCodeData.getChannelTypeTwoName();
-                this.argueSolution = "1";
-                this.arbitboardName = "";
-                this.isExpressProtectionFlag = "JSB00";
-                this.eProposalFlag = "1";
-                this.appliFactorFlag = "";
-                this.insuredFactorFlag = "";
-                this.handler1Code = handlerCodeData.getCodeCode();
-                this.channeltypeone = handlerCodeData.getChannelTypeOne();
-                this.channeltypetwo = handlerCodeData.getChannelTepeTwo();
-                this.classIdentifier = unitMaintenanceCodeData.getClassIdentifier();
-                this.unitMaintenanceCode = unitMaintenanceCodeData.getCodeCode();
-                this.unitmainTenanceType1 = unitMaintenanceCodeData.getUnitmainTenanceType1();
-                this.unitmainTenanceType2 = unitMaintenanceCodeData.getUnitmainTenanceType2();
-                this.isStandard = unitMaintenanceCodeData.getIsStandard();
-                this.uwELRrel1 = unitMaintenanceCodeData.getUwELRrel1();
-                this.uwELRrel2 = unitMaintenanceCodeData.getUwELRrel2();
-                this.templateName = "";
-                this.templateNo = "";
-                this.deGentType = "";
-                this.saleProfessionalNum = "";
-                this.lifeAgentName = "";
-                this.lifeAgentCode = "";
-                this.comCode = comCodeData.getCodeCode();
-                this.businessNature = businessSources;
-                this.agentCode = agentCodeData.getCodeCode();
-                this.agentCanalCode = " ";
-                this.saleName = "";
-                this.amlCode = "";
-                this.operateDate = today;
-                this.serviceLabelName = "";
-                this.uniteBusinessFlag = 0;
-                this.noCarFlag = 0;
-                this.goodCodes = Collections.emptyList();
-                this.noCarPremium = 0;
-                this.business = null;
-                this.cooprOutletsName = "";
-                this.operatorCode = username;
-                this.signDate = today;
-                this.loginComCode = comCodeData.getCodeCode();
-            }
-        }
-
         @NoArgsConstructor
         @Data
         public static class PrpTitemCarDTO {
@@ -3150,13 +2870,11 @@ public class GuoRenCrawlerCalculationPremiumRequest {
         private Integer endMinute;
 
         public PrpTmainDTO(RiskInfoVo biRiskInfoVo, String today) {
-            String startDate = TimeProcessing.dateTimeToDate(biRiskInfoVo.getStartDate());
-            this.startDate = startDate;
+            this.startDate = TimeProcessing.dateTimeToDate(biRiskInfoVo.getStartDate());
             this.startHour = 0;
             this.startMinute = 0;
 
-            String endDate = TimeProcessing.dateTimeToDate(biRiskInfoVo.getEndDate());
-            this.endDate = endDate;
+            this.endDate = TimeProcessing.dateTimeToDate(biRiskInfoVo.getEndDate());
             this.endHour = 24;
             this.endMinute = 0;
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerCheckNoticeRequest.java

@@ -0,0 +1,16 @@
+package com.jzg.quotation.guoren.crawler.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class GuoRenCrawlerCheckNoticeRequest {
+
+    @JsonProperty("proposalNo")
+    private String proposalNo;
+
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerGetCarPriceRequest.java

@@ -5,6 +5,7 @@ import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.commons.utils.TimeProcessing;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerQueryCarModelData;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerWriteBackAddressData;
 import lombok.Data;
@@ -561,7 +562,7 @@ public class GuoRenCrawlerGetCarPriceRequest {
     @JsonProperty("sex")
     private String sex;
 
-    public GuoRenCrawlerGetCarPriceRequest(GuoRenCrawlerQueryCarModelData.ContentDTO queryCarModelData, GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO prpTmainDTO, QuoteVo quoteVo, GuoRenCrawlerWriteBackAddressData ownersAddr, String relationShip) {
+    public GuoRenCrawlerGetCarPriceRequest(GuoRenCrawlerQueryCarModelData.ContentDTO queryCarModelData, PrpTMainDTO prpTmainDTO, QuoteVo quoteVo, GuoRenCrawlerWriteBackAddressData ownersAddr, String relationShip) {
         String today = TimeProcessing.nowDate();
 
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerGetEleProposalQRCoreRequest.java

@@ -0,0 +1,36 @@
+package com.jzg.quotation.guoren.crawler.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.commons.util.StringUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class GuoRenCrawlerGetEleProposalQRCoreRequest {
+
+    @JsonProperty("proposalNoList")
+    private List<String> proposalNoList;
+
+    @JsonProperty("elecapplyurl")
+    private String elecapplyurl;
+
+    @JsonProperty("qrType")
+    private Integer qrType;
+
+
+    public GuoRenCrawlerGetEleProposalQRCoreRequest(String proposalNoBi, String proposalNoCi, String elecapplyurl) {
+        this.proposalNoList = new ArrayList<>();
+        if (StringUtils.hasText(proposalNoBi)) {
+            this.proposalNoList.add(proposalNoBi);
+        }
+        if (StringUtils.hasText(proposalNoCi)) {
+            this.proposalNoList.add(proposalNoCi);
+        }
+        this.elecapplyurl = elecapplyurl;
+        this.qrType = 1;
+    }
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerProposalNoSaveRequest.java

@@ -0,0 +1,40 @@
+package com.jzg.quotation.guoren.crawler.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerCalculationPremiumData;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+public class GuoRenCrawlerProposalNoSaveRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 7163967208066871261L;
+
+    @JsonProperty("bc")
+    private GuoRenCrawlerCalculationPremiumRequest.BcDTO bc;
+
+    @JsonProperty("basePartVo")
+    private GuoRenCrawlerCalculationPremiumRequest.BasePartVoDTO basePartVo;
+
+    @JsonProperty("bi")
+    private GuoRenCrawlerCalculationPremiumData.BiDTO bi;
+
+    @JsonProperty("ci")
+    private GuoRenCrawlerCalculationPremiumData.CiDTO ci;
+
+    public GuoRenCrawlerProposalNoSaveRequest(GuoRenCrawlerCalculationPremiumData guoRenCrawlerCalculationPremiumData, GuoRenCrawlerCalculationPremiumRequest calculationPremiumRequest) {
+        this.bc = calculationPremiumRequest.getBc();
+        this.bc.setPrpTmain(guoRenCrawlerCalculationPremiumData.getBc().getPrpTmain());
+        this.bc.getPrpTmain().setCaptcha("");
+        this.bc.getPrpTmain().setEProposalFlag("1");
+        this.basePartVo = calculationPremiumRequest.getBasePartVo();
+        this.bi = guoRenCrawlerCalculationPremiumData.getBi();
+        this.ci = guoRenCrawlerCalculationPremiumData.getCi();
+    }
+
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/response/GuoRenCrawlerCalculationPremiumData.java

@@ -5,6 +5,7 @@ import com.jzg.quotation.guoren.crawler.entity.dto.CiInsureDemandDTO;
 import com.jzg.quotation.guoren.crawler.entity.dto.PrptengageListDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 
 import java.util.List;
 
@@ -3523,8 +3524,9 @@ public class GuoRenCrawlerCalculationPremiumData {
     @NoArgsConstructor
     @Data
     public static class BcDTO {
+
         @JsonProperty("prpTmain")
-        private PrpTmainDTO prpTmain;
+        private PrpTMainDTO prpTmain;
 
         @JsonProperty("prpTitemCar")
         private PrpTitemCarDTO prpTitemCar;
@@ -3559,586 +3561,6 @@ public class GuoRenCrawlerCalculationPremiumData {
         @JsonProperty("prpTengiNeerList")
         private List<?> prpTengiNeerList;
 
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainDTO {
-            @JsonProperty("proposalNo")
-            private String proposalNo;
-
-            @JsonProperty("renewalFlag")
-            private String renewalFlag;
-
-            @JsonProperty("classCode")
-            private String classCode;
-
-            @JsonProperty("comName")
-            private String comName;
-
-            @JsonProperty("riskCode")
-            private String riskCode;
-
-            @JsonProperty("contractNo")
-            private String contractNo;
-
-            @JsonProperty("policySort")
-            private String policySort;
-
-            @JsonProperty("printNo")
-            private String printNo;
-
-            @JsonProperty("businessNature")
-            private String businessNature;
-
-            @JsonProperty("language")
-            private String language;
-
-            @JsonProperty("policyType")
-            private String policyType;
-
-            @JsonProperty("appliCode")
-            private String appliCode;
-
-            @JsonProperty("appliName")
-            private String appliName;
-
-            @JsonProperty("appliAddress")
-            private String appliAddress;
-
-            @JsonProperty("insuredCode")
-            private String insuredCode;
-
-            @JsonProperty("insuredName")
-            private String insuredName;
-
-            @JsonProperty("insuredAddress")
-            private String insuredAddress;
-
-            @JsonProperty("operateDate")
-            private String operateDate;
-
-            @JsonProperty("startDate")
-            private String startDate;
-
-            @JsonProperty("startHour")
-            private Integer startHour;
-
-            @JsonProperty("startMinute")
-            private Integer startMinute;
-
-            @JsonProperty("endMinute")
-            private Integer endMinute;
-
-            @JsonProperty("endDate")
-            private String endDate;
-
-            @JsonProperty("endHour")
-            private Integer endHour;
-
-            @JsonProperty("pureRate")
-            private Integer pureRate;
-
-            @JsonProperty("disRate")
-            private Integer disRate;
-
-            @JsonProperty("disCount")
-            private Double disCount;
-
-            @JsonProperty("currency")
-            private String currency;
-
-            @JsonProperty("sumAmount")
-            private Integer sumAmount;
-
-            @JsonProperty("sumPremium")
-            private Double sumPremium;
-
-            @JsonProperty("sumSubprem")
-            private Integer sumSubprem;
-
-            @JsonProperty("sumQuantity")
-            private Integer sumQuantity;
-
-            @JsonProperty("judicalCode")
-            private String judicalCode;
-
-            @JsonProperty("judicalScope")
-            private String judicalScope;
-
-            @JsonProperty("autoTransRenewFlag")
-            private String autoTransRenewFlag;
-
-            @JsonProperty("argueSolution")
-            private String argueSolution;
-
-            @JsonProperty("arbitboardName")
-            private String arbitboardName;
-
-            @JsonProperty("makeCom")
-            private String makeCom;
-
-            @JsonProperty("operateSite")
-            private String operateSite;
-
-            @JsonProperty("comCode")
-            private String comCode;
-
-            @JsonProperty("handlerCode")
-            private String handlerCode;
-
-            @JsonProperty("handler1Code")
-            private String handler1Code;
-
-            @JsonProperty("approverCode")
-            private String approverCode;
-
-            @JsonProperty("underWriteCode")
-            private String underWriteCode;
-
-            @JsonProperty("underWriteName")
-            private String underWriteName;
-
-            @JsonProperty("operatorCode")
-            private String operatorCode;
-
-            @JsonProperty("inputDate")
-            private String inputDate;
-
-            @JsonProperty("inputHour")
-            private Integer inputHour;
-
-            @JsonProperty("statiSticSym")
-            private String statiSticSym;
-
-            @JsonProperty("agentCode")
-            private String agentCode;
-
-            @JsonProperty("coinsFlag")
-            private String coinsFlag;
-
-            @JsonProperty("reinsFlag")
-            private String reinsFlag;
-
-            @JsonProperty("allinsFlag")
-            private String allinsFlag;
-
-            @JsonProperty("underwriteFlag")
-            private String underwriteFlag;
-
-            @JsonProperty("othFlag")
-            private String othFlag;
-
-            @JsonProperty("disRate1")
-            private Integer disRate1;
-
-            @JsonProperty("businessFlag")
-            private String businessFlag;
-
-            @JsonProperty("updaterCode")
-            private String updaterCode;
-
-            @JsonProperty("updateDate")
-            private String updateDate;
-
-            @JsonProperty("upDateHour")
-            private String upDateHour;
-
-            @JsonProperty("signDate")
-            private String signDate;
-
-            @JsonProperty("shareHolderFlag")
-            private String shareHolderFlag;
-
-            @JsonProperty("agreementNo")
-            private String agreementNo;
-
-            @JsonProperty("inquiryNo")
-            private String inquiryNo;
-
-            @JsonProperty("payMode")
-            private String payMode;
-
-            @JsonProperty("remark")
-            private String remark;
-
-            @JsonProperty("policyNo")
-            private String policyNo;
-
-            @JsonProperty("visaCode")
-            private String visaCode;
-
-            @JsonProperty("manualType")
-            private String manualType;
-
-            @JsonProperty("businessKind")
-            private String businessKind;
-
-            @JsonProperty("businessClass")
-            private String businessClass;
-
-            @JsonProperty("manualFlag")
-            private String manualFlag;
-
-            @JsonProperty("businessRemark1")
-            private String businessRemark1;
-
-            @JsonProperty("businessRemark2")
-            private String businessRemark2;
-
-            @JsonProperty("domesticFlag")
-            private String domesticFlag;
-
-            @JsonProperty("ventureFlag")
-            private String ventureFlag;
-
-            @JsonProperty("bidFlag")
-            private String bidFlag;
-
-            @JsonProperty("agriFlag")
-            private String agriFlag;
-
-            @JsonProperty("agriNature")
-            private String agriNature;
-
-            @JsonProperty("groupPurchaseFlag")
-            private String groupPurchaseFlag;
-
-            @JsonProperty("productCode")
-            private String productCode;
-
-            @JsonProperty("payMethod")
-            private String payMethod;
-
-            @JsonProperty("immeValiFlag")
-            private String immeValiFlag;
-
-            @JsonProperty("saleName")
-            private String saleName;
-
-            @JsonProperty("saleProfessionalNum")
-            private String saleProfessionalNum;
-
-            @JsonProperty("lifeAgentCode")
-            private String lifeAgentCode;
-
-            @JsonProperty("lifeAgentName")
-            private String lifeAgentName;
-
-            @JsonProperty("lifeManageComCode")
-            private String lifeManageComCode;
-
-            @JsonProperty("lifeChannelType")
-            private String lifeChannelType;
-
-            @JsonProperty("lifeSalecomCode")
-            private String lifeSalecomCode;
-
-            @JsonProperty("lifeAppcontNo")
-            private String lifeAppcontNo;
-
-            @JsonProperty("saleMobile")
-            private String saleMobile;
-
-            @JsonProperty("isPersonal")
-            private String isPersonal;
-
-            @JsonProperty("subRiskCode")
-            private String subRiskCode;
-
-            @JsonProperty("ePolicySort")
-            private String ePolicySort;
-
-            @JsonProperty("policyUrl")
-            private String policyUrl;
-
-            @JsonProperty("captcha")
-            private String captcha;
-
-            @JsonProperty("eFlag")
-            private String eFlag;
-
-            @JsonProperty("uploadTime")
-            private String uploadTime;
-
-            @JsonProperty("businessNatureNew")
-            private String businessNatureNew;
-
-            @JsonProperty("groupBuySize")
-            private Integer groupBuySize;
-
-            @JsonProperty("business")
-            private String business;
-
-            @JsonProperty("businessMark")
-            private String businessMark;
-
-            @JsonProperty("mainBankName")
-            private String mainBankName;
-
-            @JsonProperty("otherBankName")
-            private String otherBankName;
-
-            @JsonProperty("sumnoTaxPremium")
-            private Double sumnoTaxPremium;
-
-            @JsonProperty("sumTaxFee")
-            private Double sumTaxFee;
-
-            @JsonProperty("linkerName")
-            private String linkerName;
-
-            @JsonProperty("linkerMobile")
-            private String linkerMobile;
-
-            @JsonProperty("linkerAddress")
-            private String linkerAddress;
-
-            @JsonProperty("dataSourceCode")
-            private String dataSourceCode;
-
-            @JsonProperty("policySequenceNo")
-            private String policySequenceNo;
-
-            @JsonProperty("underwritSequenceNo")
-            private String underwritSequenceNo;
-
-            @JsonProperty("uniteBusinessFlag")
-            private String uniteBusinessFlag;
-
-            @JsonProperty("amlCode")
-            private String amlCode;
-
-            @JsonProperty("infoManagerFlag")
-            private String infoManagerFlag;
-
-            @JsonProperty("teamCode")
-            private String teamCode;
-
-            @JsonProperty("teamName")
-            private String teamName;
-
-            @JsonProperty("teamTypeId")
-            private String teamTypeId;
-
-            @JsonProperty("teamTypeIdName")
-            private String teamTypeIdName;
-
-            @JsonProperty("teamTypeTwo")
-            private String teamTypeTwo;
-
-            @JsonProperty("teamTypeTwoName")
-            private String teamTypeTwoName;
-
-            @JsonProperty("teamTypeThree")
-            private String teamTypeThree;
-
-            @JsonProperty("teamTypeThreeName")
-            private String teamTypeThreeName;
-
-            @JsonProperty("customerGroupName")
-            private String customerGroupName;
-
-            @JsonProperty("businessNatureOne")
-            private String businessNatureOne;
-
-            @JsonProperty("businessNatureOneName")
-            private String businessNatureOneName;
-
-            @JsonProperty("businessNatureThree")
-            private String businessNatureThree;
-
-            @JsonProperty("businessNatureTwo")
-            private String businessNatureTwo;
-
-            @JsonProperty("businessNatureTwoName")
-            private String businessNatureTwoName;
-
-            @JsonProperty("businessNaturethreeName")
-            private String businessNaturethreeName;
-
-            @JsonProperty("certiNo")
-            private String certiNo;
-
-            @JsonProperty("feeandDiscountFlag")
-            private Integer feeandDiscountFlag;
-
-            @JsonProperty("saleChange")
-            private Double saleChange;
-
-            @JsonProperty("isStandard")
-            private String isStandard;
-
-            @JsonProperty("noCarFlag")
-            private String noCarFlag;
-
-            @JsonProperty("unitMaintenanceCode")
-            private String unitMaintenanceCode;
-
-            @JsonProperty("unitmainTenanceType1")
-            private String unitmainTenanceType1;
-
-            @JsonProperty("unitmainTenanceType2")
-            private String unitmainTenanceType2;
-
-            @JsonProperty("unitMaintenanceName")
-            private String unitMaintenanceName;
-
-            @JsonProperty("unitMaintenanceType1Name")
-            private String unitMaintenanceType1Name;
-
-            @JsonProperty("unitMaintenanceType2Name")
-            private String unitMaintenanceType2Name;
-
-            @JsonProperty("oaFlowNumber")
-            private String oaFlowNumber;
-
-            @JsonProperty("channeltypeone")
-            private String channeltypeone;
-
-            @JsonProperty("channeltypeoneName")
-            private String channeltypeoneName;
-
-            @JsonProperty("channeltypetwo")
-            private String channeltypetwo;
-
-            @JsonProperty("channeltypetwoName")
-            private String channeltypetwoName;
-
-            @JsonProperty("upDateTime")
-            private String upDateTime;
-
-            @JsonProperty("underWriteendTime")
-            private String underWriteendTime;
-
-            @JsonProperty("handler1Name")
-            private String handler1Name;
-
-            @JsonProperty("agentName")
-            private String agentName;
-
-            @JsonProperty("answer")
-            private String answer;
-
-            @JsonProperty("orderNo")
-            private String orderNo;
-
-            @JsonProperty("simpleOrderFlag")
-            private String simpleOrderFlag;
-
-            @JsonProperty("hisOrderNo")
-            private String hisOrderNo;
-
-            @JsonProperty("startDateFlag")
-            private String startDateFlag;
-
-            @JsonProperty("uwELRrel1")
-            private String uwELRrel1;
-
-            @JsonProperty("uwELRrel2")
-            private String uwELRrel2;
-
-            @JsonProperty("classIdentifier")
-            private String classIdentifier;
-
-            @JsonProperty("commissionerNo")
-            private String commissionerNo;
-
-            @JsonProperty("templateNo")
-            private String templateNo;
-
-            @JsonProperty("templateName")
-            private String templateName;
-
-            @JsonProperty("serviceLabelName")
-            private String serviceLabelName;
-
-            @JsonProperty("noCarPremium")
-            private Integer noCarPremium;
-
-            @JsonProperty("deGentType")
-            private String deGentType;
-
-            @JsonProperty("saleGentType")
-            private String saleGentType;
-
-            @JsonProperty("agentCanalCode")
-            private String agentCanalCode;
-
-            @JsonProperty("demandNo")
-            private String demandNo;
-
-            @JsonProperty("internetFlag")
-            private String internetFlag;
-
-            @JsonProperty("internetPlatform")
-            private String internetPlatform;
-
-            @JsonProperty("internetSource")
-            private String internetSource;
-
-            @JsonProperty("platformCategory")
-            private String platformCategory;
-
-            @JsonProperty("fcBusinessNature")
-            private String fcBusinessNature;
-
-            @JsonProperty("fcHandler1Code")
-            private String fcHandler1Code;
-
-            @JsonProperty("fcHandler1Name")
-            private String fcHandler1Name;
-
-            @JsonProperty("fcAgentCode")
-            private String fcAgentCode;
-
-            @JsonProperty("fcAgentName")
-            private String fcAgentName;
-
-            @JsonProperty("fcAgreementNo")
-            private String fcAgreementNo;
-
-            @JsonProperty("fcAgreementNoName")
-            private String fcAgreementNoName;
-
-            @JsonProperty("fclifeAgentName")
-            private String fclifeAgentName;
-
-            @JsonProperty("fcSaleProfessionalNum")
-            private String fcSaleProfessionalNum;
-
-            @JsonProperty("correction_applicant")
-            private String correctionApplicant;
-
-            @JsonProperty("appliFactorFlag")
-            private String appliFactorFlag;
-
-            @JsonProperty("insuredFactorFlag")
-            private String insuredFactorFlag;
-
-            @JsonProperty("firstProposalDate")
-            private String firstProposalDate;
-
-            @JsonProperty("isbatchProposalNo")
-            private String isbatchProposalNo;
-
-            @JsonProperty("certino1")
-            private String certino1;
-
-            @JsonProperty("carsonlyid")
-            private String carsonlyid;
-
-            @JsonProperty("loginComCode")
-            private String loginComCode;
-
-            @JsonProperty("noCarCodes")
-            private String noCarCodes;
-
-            @JsonProperty("flag")
-            private String flag;
-
-            @JsonProperty("eProposalFlag")
-            private String eProposalFlag;
-        }
-
         @NoArgsConstructor
         @Data
         public static class PrpTitemCarDTO {

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/response/GuoRenCrawlerCheckNoticeData.java

@@ -0,0 +1,104 @@
+package com.jzg.quotation.guoren.crawler.entity.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class GuoRenCrawlerCheckNoticeData {
+
+    @JsonProperty("frameNo")
+    private String frameNo;
+
+    @JsonProperty("createtime")
+    private String createtime;
+
+    @JsonProperty("licenseNo")
+    private String licenseNo;
+
+    @JsonProperty("confirmflag")
+    private String confirmflag;
+
+    @JsonProperty("handler1Name")
+    private String handler1Name;
+
+    @JsonProperty("clauseFileInfo")
+    private List<ClauseFileInfoDTO> clauseFileInfo;
+
+    @JsonProperty("channeltypetwo")
+    private String channeltypetwo;
+
+    @JsonProperty("riskCode")
+    private List<String> riskCode;
+
+    @JsonProperty("Premium")
+    private List<PremiumDTO> premium;
+
+    @JsonProperty("businessNature")
+    private String businessNature;
+
+    @JsonProperty("appliName")
+    private String appliName;
+
+    @JsonProperty("sumPremium")
+    private Integer sumPremium;
+
+    @JsonProperty("proposalNo")
+    private List<String> proposalNo;
+
+    @JsonProperty("appliIdentifyNumber")
+    private String appliIdentifyNumber;
+
+    @JsonProperty("elecapplyurl")
+    private String elecapplyurl;
+
+    @JsonProperty("appliMobile")
+    private String appliMobile;
+
+    @JsonProperty("insuredNature")
+    private String insuredNature;
+
+    @JsonProperty("handler1Code")
+    private String handler1Code;
+
+    @JsonProperty("activityplan")
+    private String activityplan;
+
+    @JsonProperty("updatetime")
+    private String updatetime;
+
+    @JsonProperty("comCode")
+    private String comCode;
+
+    @JsonProperty("noCarProposalNo")
+    private List<?> noCarProposalNo;
+
+    @NoArgsConstructor
+    @Data
+    public static class ClauseFileInfoDTO {
+
+        @JsonProperty("pageNum")
+        private Integer pageNum;
+
+        @JsonProperty("fileName")
+        private String fileName;
+
+        @JsonProperty("title")
+        private String title;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PremiumDTO {
+
+        @JsonProperty("proposalNo")
+        private String proposalNo;
+
+        @JsonProperty("premium")
+        private Integer premium;
+
+    }
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/response/GuoRenCrawlerGetEleProposalQRCoreData.java

@@ -0,0 +1,35 @@
+package com.jzg.quotation.guoren.crawler.entity.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class GuoRenCrawlerGetEleProposalQRCoreData {
+
+    @JsonProperty("licenseNo")
+    private String licenseNo;
+
+    @JsonProperty("qrUrl")
+    private String qrUrl;
+
+    @JsonProperty("qrCode")
+    private String qrCode;
+
+    @JsonProperty("resultCode")
+    private String resultCode;
+
+    @JsonProperty("appliName")
+    private String appliName;
+
+    @JsonProperty("resultMessage")
+    private String resultMessage;
+
+    @JsonProperty("sumPremium")
+    private Integer sumPremium;
+
+    @JsonProperty("username")
+    private String username;
+
+}

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/GuoRenCrawlerOrderService.java

@@ -1,9 +1,20 @@
 package com.jzg.quotation.guoren.crawler.service;
 
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.guoren.crawler.entity.po.GuoRenCrawlerOrder;
+import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerProposalNoSaveData;
 
 public interface GuoRenCrawlerOrderService {
 
+
+    /**
+     * 保存订单信息
+     *
+     * @param quoteVo                         报价信息
+     * @param guoRenCrawlerProposalNoSaveData 国任财险保存投保单响应
+     */
+    void saveOrderInfo(QuoteVo quoteVo, GuoRenCrawlerProposalNoSaveData guoRenCrawlerProposalNoSaveData);
+
     /**
      * 通过id查询mongodb中的唯一订单号
      *

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/GuoRenCrawlerQuoteProcessService.java

@@ -2,6 +2,7 @@ package com.jzg.quotation.guoren.crawler.service;
 
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.base.LoginBase;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.request.GuoRenCrawlerCalculationPremiumRequest;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerCalculationPremiumData;
 import org.springframework.http.HttpHeaders;
@@ -28,7 +29,7 @@ public interface GuoRenCrawlerQuoteProcessService {
      *
      * @param attributionInformationVo 归属配置信息
      */
-    GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO buildAttributionInformation(AttributionInformationVo attributionInformationVo, HttpHeaders headers);
+    PrpTMainDTO buildAttributionInformation(AttributionInformationVo attributionInformationVo, HttpHeaders headers);
 
     /**
      * 投保验证码处理

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/impl/GuoRenCrawlerOrderServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jzg.quotation.guoren.crawler.service.impl;
 
+import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.quotation.guoren.crawler.entity.po.GuoRenCrawlerOrder;
+import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerProposalNoSaveData;
 import com.jzg.quotation.guoren.crawler.repository.GuoRenCrawlerOrderRepository;
 import com.jzg.quotation.guoren.crawler.service.GuoRenCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +14,15 @@ public class GuoRenCrawlerOrderServiceImpl implements GuoRenCrawlerOrderService
 
     private final GuoRenCrawlerOrderRepository guoRenCrawlerOrderRepository;
 
+    @Override
+    public void saveOrderInfo(QuoteVo quoteVo, GuoRenCrawlerProposalNoSaveData guoRenCrawlerProposalNoSaveData) {
+        GuoRenCrawlerOrder guoRenCrawlerOrder = new GuoRenCrawlerOrder();
+        guoRenCrawlerOrder.setId(quoteVo.getOrder().getOrdersNo());
+        guoRenCrawlerOrder.setCiPolicyNumber( guoRenCrawlerProposalNoSaveData.getBusinessNoCI());
+        guoRenCrawlerOrder.setBiPolicyNumber( guoRenCrawlerProposalNoSaveData.getBusinessNoBI());
+        guoRenCrawlerOrderRepository.save(guoRenCrawlerOrder);
+    }
+
     @Override
     public GuoRenCrawlerOrder getById(String id) {
         return guoRenCrawlerOrderRepository.getById(id);

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/impl/GuoRenCrawlerQuoteProcessServiceImpl.java

@@ -12,6 +12,7 @@ import com.jzg.quotation.guoren.crawler.component.GuoRenCrawlerCacheComponent;
 import com.jzg.quotation.guoren.crawler.component.GuoRenCrawlerRequestComponent;
 import com.jzg.quotation.guoren.crawler.constant.enums.BusinessSources;
 import com.jzg.quotation.guoren.crawler.entity.GuoRenCrawlerConfigureParameters;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.request.GuoRenCrawlerCalculationPremiumRequest;
 import com.jzg.quotation.guoren.crawler.entity.request.GuoRenCrawlerInitSelectRequest;
 import com.jzg.quotation.guoren.crawler.entity.response.*;
@@ -53,7 +54,7 @@ public class GuoRenCrawlerQuoteProcessServiceImpl implements GuoRenCrawlerQuoteP
     public HttpHeaders getHeaders(String username) {
         HttpHeaders headers = new HttpHeaders();
 //        String token = guoRenCrawlerCacheComponent.getToken(username);
-        String token = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJXMzAwMDM5OSIsInVzZXJJZCI6IjQ5NjE4MSIsIm5hbWUiOiLmnY7mmKXmooUiLCJleHAiOjE3NjQzMTM2MDN9.gxAetCuOMbxH8LuTl2gCacRlz65psaQItr7GUKo502DqAZxbMUjqamV527_XDVexFlS4-zRAdsS84nz_MnmeQImE28jRqy_8ggy5C3Ss9Teg-FOf4uLvQ2evje6PXtiU65nSE5O_Y_blog0dHxm4nqqJtPGXK1yIztIIsIB8zF8";
+        String token = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJXMzAwMDM5OSIsInVzZXJJZCI6IjQ5NjE4MSIsIm5hbWUiOiLmnY7mmKXmooUiLCJleHAiOjE3NjQ0MDE4ODV9.SWFEoclc2C-59feIHkFdbQKvbD6QD_2lLjb0fb8O95RXdA5BK63mlyI02rzqjBqasesgZy2J3NWltLiLe4SYny-eHEJY9TUYdtqSFUcKvaTBNOdFxK9dq4P0UhsDkAIQCbx5bLue_3yb_GfkbgAK2A-PYS3DTq_E-D8DpaVe3vw";
         if (!StringUtils.hasText(token)) {
             throw new SystemException("登录失败，请重新登录");
         }
@@ -62,7 +63,7 @@ public class GuoRenCrawlerQuoteProcessServiceImpl implements GuoRenCrawlerQuoteP
     }
 
     @Override
-    public GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO buildAttributionInformation(AttributionInformationVo attributionInformationVo, HttpHeaders headers) {
+    public PrpTMainDTO buildAttributionInformation(AttributionInformationVo attributionInformationVo, HttpHeaders headers) {
         // 配置信息
         GuoRenCrawlerConfigureParameters guoRenCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(GuoRenCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         // 登录机构查询
@@ -133,7 +134,7 @@ public class GuoRenCrawlerQuoteProcessServiceImpl implements GuoRenCrawlerQuoteP
                 .findFirst()
                 .orElseThrow(() -> new SystemException("归属业务员查询失败"));
 
-        return new GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO(comCodeData, agentCodeData, agentAgreement, handlerCodeData,
+        return new PrpTMainDTO(comCodeData, agentCodeData, agentAgreement, handlerCodeData,
                 unitMaintenanceCodeData, businessSources, attributionInformationVo.getUsername());
     }
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/impl/GuoRenCrawlerRequestImpl.java

@@ -15,6 +15,7 @@ import com.jzg.quotation.guoren.crawler.build.GuoRenCrawlerQuoteResultsVoBuild;
 import com.jzg.quotation.guoren.crawler.component.GuoRenCrawlerRequestComponent;
 import com.jzg.quotation.guoren.crawler.constant.enums.RequestUrl;
 import com.jzg.quotation.guoren.crawler.entity.GuoRenCrawlerConfigureParameters;
+import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.po.GuoRenCrawlerOrder;
 import com.jzg.quotation.guoren.crawler.entity.po.OrderCommon;
 import com.jzg.quotation.guoren.crawler.entity.request.GuoRenCrawlerCalculationPremiumRequest;
@@ -55,7 +56,7 @@ public class GuoRenCrawlerRequestImpl implements GuoRenCrawlerRequest {
     public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         HttpHeaders headers = guoRenCrawlerQuoteProcessService.getHeaders(quoteVo.getOrder().getAttributionInformationVo().getUsername());
         // 构建归属信息
-        GuoRenCrawlerCalculationPremiumRequest.BcDTO.PrpTmainDTO prpTmainDTO = guoRenCrawlerQuoteProcessService.buildAttributionInformation(quoteVo.getOrder().getAttributionInformationVo(), headers);
+        PrpTMainDTO prpTmainDTO = guoRenCrawlerQuoteProcessService.buildAttributionInformation(quoteVo.getOrder().getAttributionInformationVo(), headers);
         // 车型查询
         GuoRenCrawlerQueryCarModelData.ContentDTO queryCarModelData = guoRenCrawlerRequestComponent.queryCarModel(quoteVo.getCarInfoVo(), prpTmainDTO.getComCode(), prpTmainDTO.getOperatorCode(), headers);
         // 车架号查询
@@ -86,8 +87,9 @@ public class GuoRenCrawlerRequestImpl implements GuoRenCrawlerRequest {
         calculationPremium = guoRenCrawlerQuoteProcessService.insuranceVerificationCodeProcessing(crawlerCalculationPremiumRequest, calculationPremium, headers);
 
         // 保存投保单号
-        GuoRenCrawlerProposalNoSaveData proposalNoSave = guoRenCrawlerRequestComponent.proposalNoSave(crawlerCalculationPremiumRequest, headers);
-
+        GuoRenCrawlerProposalNoSaveData proposalNoSave = guoRenCrawlerRequestComponent.proposalNoSave(crawlerCalculationPremiumRequest, calculationPremium, headers);
+        // 保存数据
+        guoRenCrawlerOrderService.saveOrderInfo(quoteVo, proposalNoSave);
         return GuoRenCrawlerQuoteResultsVoBuild.buildQuoteResultsVo(quoteVo, calculationPremium, proposalNoSave);
     }
 
@@ -106,16 +108,17 @@ public class GuoRenCrawlerRequestImpl implements GuoRenCrawlerRequest {
         GuoRenCrawlerOrder guoRenCrawlerOrder = guoRenCrawlerOrderService.getById(underwritingVo.getOrder().getOrdersNo());
         // 提交核保
         GuoRenCrawlerSubmitUnderwriteData submitUnderwrite = guoRenCrawlerRequestComponent.submitUnderwrite(guoRenCrawlerOrder.getCiPolicyNumber(), guoRenCrawlerOrder.getBiPolicyNumber(), username, headers);
-
-        return null;
+        return new UnderwritingResultsVo();
     }
 
     @Override
     public PaymentLinkResultsVo getPaymentLink(PaymentLinkVo paymentLinkVo) throws Exception {
-        HttpHeaders headers = guoRenCrawlerQuoteProcessService.getHeaders(paymentLinkVo.getOrder().getAttributionInformationVo().getUsername());
-        String username = paymentLinkVo.getOrder().getAttributionInformationVo().getUsername();
-
-        return null;
+        //
+        OrderCommon orderCommon = getOrderCommon(paymentLinkVo.getOrder());
+        GuoRenCrawlerCheckNoticeData guoRenCrawlerCheckNoticeData = guoRenCrawlerRequestComponent.checkNoticeData(orderCommon.getBusinessNo(), orderCommon.getHttpHeaders());
+        //
+        GuoRenCrawlerGetEleProposalQRCoreData eleProposalQRCoreData = guoRenCrawlerRequestComponent.getEleProposalQRCoreData(orderCommon.getBiPolicyNo(), orderCommon.getCiPolicyNo(), guoRenCrawlerCheckNoticeData.getElecapplyurl(), orderCommon.getHttpHeaders());
+        return new PaymentLinkResultsVo(true, eleProposalQRCoreData.getQrCode(), "");
     }
 
     @Override
@@ -152,8 +155,7 @@ public class GuoRenCrawlerRequestImpl implements GuoRenCrawlerRequest {
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) throws Exception {
         OrderCommon orderCommon = getOrderCommon(orderStatusVo.getOrder());
         GuoRenCrawlerQueryPrpallProposalInfoData queryPrpallProposalInfo = guoRenCrawlerRequestComponent.queryPrpallProposalInfo(orderCommon.getUsername(), orderCommon.getComCode(), orderCommon.getBusinessNo(), orderCommon.getHttpHeaders());
-
-        return null;
+        return new OrderStatusResultVo();
     }
 
     private OrderCommon getOrderCommon(OrderBase orderBase) {