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

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -72,6 +72,11 @@ public class TokenInterceptor {
         // 保险公司列表
         notMatchList.add("/esmInsCompany/gainTopList");
 
+        // 渤海回调地址
+        notMatchList.add("/esmInsCompany/gainTopList");
+        notMatchList.add("/esmInsCompany/gainTopList");
+        notMatchList.add("/esmInsCompany/gainTopList");
+
         return new SaInterceptor(handler -> {
             // 指定一条 match 规则
             SaRouter

src/main/java/com/ydtech/modules/order/components/bohai/BoHaiRequestApiComponent.java

@@ -171,7 +171,7 @@ public class BoHaiRequestApiComponent {
      * @return 响应
      */
     public QuotationResponse quotation(QuotationRequest request, String sysSourceCode) throws Exception {
-        return post(request, properties.getUrl(), QuotationResponse.class, sysSourceCode, RequestType.Z00006);
+        return verificationResponse(request, properties.getUrl(), QuotationResponse.class, sysSourceCode, RequestType.Z00006);
     }
 
     /**

src/main/java/com/ydtech/modules/order/entity/crawler/request/CrawlerQuoteRequest.java

@@ -29,5 +29,10 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
      * 折扣
      */
     private String discount;
+    /**
+     * 上次订单号
+     */
+    private String lastOrderNo;
+
 
 }

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

@@ -9,7 +9,6 @@ import org.springframework.util.ObjectUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -209,11 +208,29 @@ public class CrawlerQuoteResponse extends CrawlerBaseResponse {
         private static final long serialVersionUID = -7644262314380189512L;
 
         /**
-         * 评分
+         * 总评分
          */
         @JsonProperty("mark")
         private String mark;
 
+        /**
+         * 交强评分
+         */
+        @JsonProperty(" jq_mark")
+        private String jqMark;
+
+        /**
+         * 商业评分
+         */
+        @JsonProperty("sy_mark")
+        private String syMark;
+
+        /**
+         * 总折扣
+         */
+        @JsonProperty("discount")
+        private String discount;
+
         /**
          * 交强折扣
          */

src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteVo.java

@@ -43,4 +43,7 @@ public class BaseQuoteVo<T> {
     @ApiModelProperty("折扣")
     private String discount;
 
+    @ApiModelProperty("上一次订单号")
+    private String lastCompanyId;
+
 }

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

@@ -111,6 +111,11 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         crawlerQuoteRequest.setCoefficient(t.getCoefficient());
         //  折扣
         crawlerQuoteRequest.setDiscount(t.getDiscount());
+        // 上次订单
+        if(StringUtils.isNotEmpty(t.getLastCompanyId())){
+            InsAreaCompany insAreaCompany = insAreaCompanyService.getById(t.getLastCompanyId());
+            crawlerQuoteRequest.setLastOrderNo(insAreaCompany.getInsOrderNo());
+        }
 
         // 发送请求
         CrawlerQuoteResponse response = insCrawlerOrderComponents.request(apiUrl, ptlAgreementAttribution.getInsCompanyId(),
@@ -122,13 +127,6 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         //处理订单信息
         QuoteRespVo responseVo = responseOrder(response, quoteRespVo, ptlAgreementAttribution);
 
-        //添加调用费用匹配功能
-        String insCom = "";
-        if (ptlAgreementAttribution.getInsCompanyId() != null && ptlAgreementAttribution.getInsCompanyId().length() > 4) {
-            insCom = ptlAgreementAttribution.getInsCompanyId().substring(0, 4);
-        }
-        //这里调用费用匹配功能
-//        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), responseVo.getCompanyId());
         return HttpResult.ok("成功", responseVo);
     }
 
@@ -324,6 +322,10 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         //评分
         CrawlerQuoteResponse.OtherDto other = response.getOther();
         quoteRespVo.setILogPreUdwMess(other.getMark());
+        quoteRespVo.setJqScore(other.getJqMark());
+        quoteRespVo.setSyScore(other.getSyMark());
+
+        quoteRespVo.setTotalAdjustRate(Double.parseDouble(other.getDiscount()));
         quoteRespVo.setJqAdjustRate(other.getJqDiscount());
         quoteRespVo.setSyAdjustRate(other.getSyDiscount());
         quoteRespVo.setOrderno(orderNo); //订单号

src/main/resources/application-prod.yml

@@ -281,7 +281,7 @@ dajia:
 # 渤海财险
 bohai:
   api:
-    url: http://uatwhale.bpic.com.cn/app-intermediary/gatewayFromPlat
+    url: https://esales.bpic.com.cn/app-intermediary/gatewayFromPlat
     selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCGw4XAPHi+K+/F1yb4pP3MTSOurAWsV+o2bzeVLaI+L4AYeXWhMSZ/L5yEX1OvpZKkBRD6KeIzDFqlP+wZ3qgt4n8MoaeA4//Zj4TSXbyXVPtFAtpeTidd7oWBJWcydvhtcWXrhBRh9wErYZ6+hCwh10JBWmSbTcDm0qY8PyqusQIDAQAB
     selfPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIbDhcA8eL4r78XXJvik/cxNI66sBaxX6jZvN5Utoj4vgBh5daExJn8vnIRfU6+lkqQFEPop4jMMWqU/7BneqC3ifwyhp4Dj/9mPhNJdvJdU+0UC2l5OJ13uhYElZzJ2+G1xZeuEFGH3ASthnr6ELCHXQkFaZJtNwObSpjw/Kq6xAgMBAAECgYB2odAwNgukfVEJvCjWYYf6PT3YGh60ZIANg0JO1GkqjO4anXFrgLT+6Y7DCJfG296G/N7BGfXCMnHpXqgc7eDlmSy2JVfKzvptgKJBLktP7Yfajg3oY9S8parSK+iyHT6qYqQv6wBmQ3Q9smOp/TM2ndBMDXu9MjoTkNJhrfMDsQJBANbWHciQhazb3Y2DY42hW/zBf7rmmJFrw7aOrEjzw5E+SnGs/vcr3LUWBbSRTYHcoJ+V/kudfwRMlz0SLkfMAvMCQQCglcjNRx35Zw6vNKHE4vTN/ny2gukjvtkzXpPeTUfblrXjK3w3x9aWBZ/MUiphVe5NB8CAtlfYZMo4UG+WMEjLAkA4yHsyydArMinK/5FOm/meQt6p3c0xkpQ2KlurJJLqTtaKWTlCx1scmeeEJGuiCViDFbgS8FvkHQJUZ/vHikq1AkAHbUX/MHXTbg/AzKdaqsB1snpkGoPb0lzLQmmGU36qSjsZSY6SKdzjzVjJo1cwbz/5Mg2WJljDuk2b8yRmBs+nAkEAzoEZmM031u/0KBpukSbqef8JgJOZ0Do9KDbf2P6YuBal6drUeNYVhImKBxQAbjETp9m5TxxW/dkKmHCnc3zqsA==
     boHaiPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCIC3wgJd+7Wue63Qjdh3/uscQSKec2m9gaeCq007kjEiSFES5Tfx75VPSxRj6qk6XN4umHOsHY+W9jkv+Cj4+z3XpPozsRdoj21oxPx8fPJzpVeaUHrEkZtj9Yvo/KhByBK5sRjKmlENXVF3wXVfAg48JZR2XUyUcBdZhR9aHhoQIDAQAB