增加折扣参数

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

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
+import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -322,6 +323,24 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "sy_loss_ration")
     private double syLossRation;
 
+    /**
+     * 总折扣率
+     */
+    @TableField(value = "total_adjust_rate")
+    private double totalAdjustRate;
+
+    /**
+     * 交强险折扣
+     */
+    @TableField(value = "jq_adjust_rate")
+    private double jqAdjustRate;
+
+    /**
+     * 商业险折扣
+     */
+    @TableField(value = "sy_adjust_rate")
+    private double syAdjustRate;
+
     /**
      * 业务员
      */
@@ -378,6 +397,11 @@ public class InsAreaCompany implements Serializable {
 
         this.jqapplyno = quoteRespVo.getJqApplyNo();
         this.syapplyno = quoteRespVo.getSyApplyNo();
+
+        this.totalAdjustRate = quoteRespVo.getTotalAdjustRate();
+        this.jqAdjustRate = StringUtils.parseDouble(quoteRespVo.getJqAdjustRate()) ;
+        this.syAdjustRate = StringUtils.parseDouble(quoteRespVo.getSyAdjustRate());
+
     }
 
     public void setPaymentLink(String paymentLink) {

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

@@ -7,6 +7,7 @@ import com.ydtech.modules.ins.model.vo.QuoteRiskRespVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
+import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -132,7 +133,7 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("商业赔付率")
         private double syLossRation;
 
-        public InsAreaCompanyEditingDto(InsAreaCompany insAreaCompany) {
+        public InsAreaCompanyEditingDto(InsAreaCompanyQueryDto insAreaCompany) {
             this.orderno = insAreaCompany.getOrderno();
             this.orderstatus = insAreaCompany.getOrderstatus();
             this.companyId = insAreaCompany.getId();

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

@@ -325,7 +325,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         quoteRespVo.setJqScore(other.getJqMark());
         quoteRespVo.setSyScore(other.getSyMark());
 
-        quoteRespVo.setTotalAdjustRate(Double.parseDouble(other.getDiscount()));
+        quoteRespVo.setTotalAdjustRate(StringUtils.toDouble(other.getDiscount()));
         quoteRespVo.setJqAdjustRate(other.getJqDiscount());
         quoteRespVo.setSyAdjustRate(other.getSyDiscount());
         quoteRespVo.setOrderno(orderNo); //订单号

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -61,6 +61,9 @@
         <result property="lossRation" column="loss_ration" jdbcType="DOUBLE"/>
         <result property="jqLossRation" column="jq_loss_ration" jdbcType="DOUBLE"/>
         <result property="syLossRation" column="sy_loss_ration" jdbcType="DOUBLE"/>
+        <result property="totalAdjustRate" column="total_adjust_rate" jdbcType="DOUBLE"/>
+        <result property="jqAdjustRate" column="jq_adjust_rate" jdbcType="DOUBLE"/>
+        <result property="syAdjustRate" column="sy_adjust_rate" jdbcType="DOUBLE"/>
         <result property="insideOrderStatus" column="inside_order_status" jdbcType="TINYINT"/>
         <result property="insidePayTime" column="inside_pay_time" jdbcType="TIMESTAMP"/>
         <result property="signingTime" column="signing_time" jdbcType="TIMESTAMP"/>