人寿修改

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/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); //订单号