Merge branch 'master' into wrq_dev

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

@@ -31,7 +31,10 @@ public class GuoRenCrawlerProposalNoSaveRequest implements Serializable {
     private GuoRenCrawlerCalculationPremiumData.CiDTO ci;
 
     public GuoRenCrawlerProposalNoSaveRequest(QuoteVo quoteVo, GuoRenCrawlerCalculationPremiumData guoRenCrawlerCalculationPremiumData, GuoRenCrawlerCalculationPremiumRequest calculationPremiumRequest) {
+        GuoRenCrawlerCalculationPremiumData.CiDTO ciDto = guoRenCrawlerCalculationPremiumData.getCi();
+        ciDto.setPrptengageList(calculationPremiumRequest.getCi().getPrptengageList());
         GuoRenCrawlerCalculationPremiumData.BiDTO biDto = guoRenCrawlerCalculationPremiumData.getBi();
+        biDto.setPrptengageList(calculationPremiumRequest.getBi().getPrptengageList());
         this.bc = calculationPremiumRequest.getBc();
         this.bc.getPrpTmain().setCaptcha("");
         this.bc.getPrpTmain().setEProposalFlag("1");
@@ -42,8 +45,8 @@ public class GuoRenCrawlerProposalNoSaveRequest implements Serializable {
             guoRenCrawlerCalculationPremiumData.getBi().getCiInsureDemand().setTonCount(quoteVo.getCarInfoVo().getTonCount());
             guoRenCrawlerCalculationPremiumData.getBi().getCiInsureDemand().setSeatCount(quoteVo.getCarInfoVo().getSeatCount());
         }
+        this.ci = ciDto;
         this.bi = biDto;
-        this.ci = guoRenCrawlerCalculationPremiumData.getCi();
         // 将试算响应中的报价ID回填到bc中
         fillProposalNoFromResponse(guoRenCrawlerCalculationPremiumData);
     }

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

@@ -214,23 +214,23 @@ public class GuoRenCrawlerQuoteProcessServiceImpl implements GuoRenCrawlerQuoteP
         crawlerCalculationPremiumRequest.getCi().getPrpTmain().setProposalNo(
                 calculationPremium.getCi().getPrpTmain().getProposalNo());
         crawlerCalculationPremiumRequest.getCi().setCiInsureDemand(calculationPremium.getCi().getCiInsureDemand());
-        crawlerCalculationPremiumRequest.getCi().setPrptengageList(calculationPremium.getCi().getPrptengageList());
+        crawlerCalculationPremiumRequest.getCi().getPrptengageList().addAll(calculationPremium.getCi().getPrptengageList());
         // BC也需要回填proposalNo/demandNo/certiNo/carsonlyid
         if (calculationPremium.getBc() != null && calculationPremium.getBc().getPrpTmain() != null) {
-            if (org.springframework.util.StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getProposalNo())) {
+            if (StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getProposalNo())) {
                 crawlerCalculationPremiumRequest.getBc().getPrpTmain().setProposalNo(
                         calculationPremium.getBc().getPrpTmain().getProposalNo());
             }
-            if (org.springframework.util.StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getDemandNo())) {
+            if (StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getDemandNo())) {
                 crawlerCalculationPremiumRequest.getBc().getPrpTmain().setDemandNo(
                         calculationPremium.getBc().getPrpTmain().getDemandNo());
             }
-            if (org.springframework.util.StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getCertiNo())) {
+            if (StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getCertiNo())) {
                 String certiNo = calculationPremium.getBc().getPrpTmain().getCertiNo();
                 crawlerCalculationPremiumRequest.getBc().getPrpTmain().setCertiNo(certiNo);
                 crawlerCalculationPremiumRequest.getBc().getPrpTmain().setCertino1(certiNo);
             }
-            if (org.springframework.util.StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getCarsonlyid())) {
+            if (StringUtils.hasText(calculationPremium.getBc().getPrpTmain().getCarsonlyid())) {
                 crawlerCalculationPremiumRequest.getBc().getPrpTmain().setCarsonlyid(
                         calculationPremium.getBc().getPrpTmain().getCarsonlyid());
             }
@@ -242,7 +242,7 @@ public class GuoRenCrawlerQuoteProcessServiceImpl implements GuoRenCrawlerQuoteP
             crawlerCalculationPremiumRequest.getBi().getPrpTmain().setProposalNo(
                     calculationPremium.getBi().getPrpTmain().getProposalNo());
             crawlerCalculationPremiumRequest.getBi().setCiInsureDemand(calculationPremium.getBi().getCiInsureDemand());
-            crawlerCalculationPremiumRequest.getBi().setPrptengageList(calculationPremium.getBi().getPrptengageList());
+            crawlerCalculationPremiumRequest.getBi().getPrptengageList().addAll(calculationPremium.getCi().getPrptengageList());
         }
         return guoRenCrawlerRequestComponent.calculationPremium(crawlerCalculationPremiumRequest, headers).getData();
     }