Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -541,7 +541,9 @@ public class InsAreaCompany implements Serializable {
         this.syRenewal = StringUtils.isEmpty(quoteRespVo.getSyRenewal()) ? null : quoteRespVo.getSyRenewal();
         this.jqClaims = quoteRespVo.getJqClaims();
         this.syClaims = quoteRespVo.getSyClaims();
-
+        if(StringUtils.isNotEmpty(quoteRespVo.getIszdj())){
+            this.isDjq = quoteRespVo.getIszdj();
+        }
     }
 
     public void setPaymentLink(String paymentLink) {

src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerQuoteResponse.java

@@ -283,6 +283,18 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
         @JsonProperty("errorCodeMap")
         private List<String> errorCodeMap;
 
+        /**
+         * 真假单交
+         */
+        @JsonProperty("isCIFlag")
+        private String isCIFlag;
+
+        /**
+         * 平台返回的期望折扣
+         */
+        @JsonProperty("hope_discount")
+        private String hopeDiscount;
+
         /**
          * 报价提示
          */

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -352,6 +352,9 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         quoteRespVo.setSyAdjustRate(other.getSyDiscount());
         quoteRespVo.setOrderno(orderNo); //订单号
 
+        quoteRespVo.setIszdj(other.getIsCIFlag());
+        quoteRespVo.setInitialProposalDiscount(other.getHopeDiscount());
+
         if (!ObjectUtils.isEmpty(other.getPredictInfo())) {
             quoteRespVo.setPredictInfo(other.getPredictInfo().stream().map(QuoteRespVo.PreUnderwritingInfoDTO::new).collect(Collectors.toList()));
         }