增加折扣参数

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

@@ -394,10 +394,10 @@ public class InsAreaCompany implements Serializable {
         this.lossRation = quoteRespVo.getLossRation();
         this.jqLossRation = quoteRespVo.getJqLossRation();
         this.syLossRation = quoteRespVo.getSyLossRation();
-
+        // 保单号
         this.jqapplyno = quoteRespVo.getJqApplyNo();
         this.syapplyno = quoteRespVo.getSyApplyNo();
-
+        // 折扣率
         this.totalAdjustRate = quoteRespVo.getTotalAdjustRate();
         this.jqAdjustRate = StringUtils.parseDouble(quoteRespVo.getJqAdjustRate()) ;
         this.syAdjustRate = StringUtils.parseDouble(quoteRespVo.getSyAdjustRate());
@@ -409,3 +409,4 @@ public class InsAreaCompany implements Serializable {
         this.paymentLink = paymentLink;
     }
 }
+

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

@@ -32,7 +32,7 @@ public class CrawlerQuoteRequest extends BaseQuoteInfoVo {
     /**
      * 上次订单号
      */
-    private String lastOrderNo;
+    private String plyappno;
 
 
 }

src/main/java/com/ydtech/modules/order/entity/vo/ya/YaExtendInfoDto.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.entity.vo.ya;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,7 +34,6 @@ public class YaExtendInfoDto implements Serializable {
     @ApiModelProperty("交强深度定价分档")
     private String deepPriceGradeCI;
 
-
     /**
      *  临时增加
      *
@@ -58,6 +58,14 @@ public class YaExtendInfoDto implements Serializable {
     @ApiModelProperty("商业赔付率")
     private String syLossRation;
 
+    @ApiModelProperty("总折扣率")
+    private double totalAdjustRate;
+
+    @ApiModelProperty("交强险折扣")
+    private double jqAdjustRate;
+
+    @ApiModelProperty("商业险折扣")
+    private double syAdjustRate;
 
     /**
      *  临时增加

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

@@ -114,7 +114,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 上次订单
         if(StringUtils.isNotEmpty(t.getLastCompanyId())){
             InsAreaCompany insAreaCompany = insAreaCompanyService.getById(t.getLastCompanyId());
-            crawlerQuoteRequest.setLastOrderNo(insAreaCompany.getInsOrderNo());
+            crawlerQuoteRequest.setPlyappno(insAreaCompany.getInsOrderNo());
         }
 
         // 发送请求

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

@@ -2,12 +2,10 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.components.OrderComponents;
@@ -483,14 +481,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             //非车
             if (!ObjectUtils.isEmpty(insOrdersExcel.getCrossInsurance())) {
 
-                if(String.valueOf(PtlApiType.PTL_API_2.getCode()).equals(insOrdersExcel.getApiType())){
+                if (String.valueOf(PtlApiType.PTL_API_2.getCode()).equals(insOrdersExcel.getApiType())) {
                     List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurancesDTOS =
                             insOrdersExcel.getCrossInsurance().toJavaList(CrawlerVerifyPaymentResponse.DrivingInsurancesDTO.class);
                     if (!drivingInsurancesDTOS.isEmpty()) {
                         String policyNumber = drivingInsurancesDTOS.get(0).getPolicy();
                         insOrdersExcel.setJyPolicyno(policyNumber);
                     }
-                }else {
+                } else {
                     List<DrivingInsuranceDto> drivingInsuranceDtos =
                             insOrdersExcel.getCrossInsurance().toJavaList(DrivingInsuranceDto.class);
                     if (!drivingInsuranceDtos.isEmpty()) {
@@ -577,6 +575,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         yaExtendInfoDto.setLossRation(String.valueOf(iac.getLossRation()));
         yaExtendInfoDto.setJqLossRation(String.valueOf(iac.getJqLossRation()));
         yaExtendInfoDto.setSyLossRation(String.valueOf(iac.getSyLossRation()));
+        //折扣率
+        yaExtendInfoDto.setTotalAdjustRate(iac.getTotalAdjustRate());
+        yaExtendInfoDto.setJqAdjustRate(iac.getJqAdjustRate());
+        yaExtendInfoDto.setSyAdjustRate(iac.getSyAdjustRate());
 
         orderAndAreaCompany.setExtendInfo(yaExtendInfoDto);
 
@@ -609,7 +611,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (!Objects.isNull(insFeeOrderNew)) {
             List<QueryOrderFeeResultVo> orderFeeVoList = feeRuleSchemeService.convertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setOrderFeeResult(orderFeeVoList);
-            List<FeeOrderNewVo>  feeOrderNewVoList =   feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
+            List<FeeOrderNewVo> feeOrderNewVoList = feeRuleSchemeService.newConvertOrderFeeVoData(insFeeOrderNew);
             orderAndAreaCompany.setFeeOrderNewVoList(feeOrderNewVoList);
             List<DistributionLevelVo> distributionLevelVoList = feeRuleSchemeService.converDistrbutionData(insFeeOrderNew);
             orderAndAreaCompany.setDistributionLevelVoList(distributionLevelVoList);