fix 补录订单时手续费费用比例不保存问题

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -21,6 +21,7 @@ import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.commons.entity.rights.vo.InsOrderRightsInfoVo;
 import com.jzg.commons.entity.scheme.vo.PtlAgreementInsCompanyVo;
 import com.jzg.commons.entity.vo.InsFeeOrdersVo;
+import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -198,14 +199,22 @@ public class QuoteEchoVo extends QuoteVo {
 
         //评分信息
         this.scoreVo = new QuoteResultsVo.ScoreVo();
-//        this.scoreVo.setScore(insOrdersVo.getInsOrdersOtherInfo().getScore());
-//        this.scoreVo.setJqScore(insOrdersVo.getInsOrdersOtherInfo().getJqScore());
-//        this.scoreVo.setSyScore(insOrdersVo.getInsOrdersOtherInfo().getSyScore());
-//        this.scoreVo.setTpColorScore(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getTpColorScore()) ? null : insOrdersVo.getInsOrdersOtherInfo().getTpColorScore().toString());
-        this.scoreVo.setLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getLossRation().toString());
-        this.scoreVo.setJqLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getJqLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getJqLossRation().toString());
-        this.scoreVo.setSyLossRation(Objects.isNull(insOrdersVo.getInsOrdersOtherInfo().getSyLossRation()) ? null : insOrdersVo.getInsOrdersOtherInfo().getSyLossRation().toString());
-        this.scoreVo.setScoreJson(insOrdersVo.getInsOrdersOtherInfo().getScoreJson());
+        if (Objects.nonNull(insOrdersVo.getInsOrdersOtherInfo())) {
+            InsOrdersOtherInfoVo otherInfo = insOrdersVo.getInsOrdersOtherInfo();
+            this.scoreVo.setScore(otherInfo.getScore() == null ? null : otherInfo.getScore());
+            this.scoreVo.setLossRation(otherInfo.getLossRation() == null ? null : otherInfo.getLossRation().toString());
+            this.scoreVo.setJqLossRation(otherInfo.getJqLossRation() == null ? null : otherInfo.getJqLossRation().toString());
+            this.scoreVo.setSyLossRation(otherInfo.getSyLossRation() == null ? null : otherInfo.getSyLossRation().toString());
+            this.scoreVo.setCiClaims(Byte.toString(otherInfo.getJqClaims()));
+            this.scoreVo.setBiClaims(Byte.toString(otherInfo.getSyClaims()));
+            this.scoreVo.setJqRenewal(otherInfo.getJqRenewal());
+            this.scoreVo.setSyRenewal(otherInfo.getSyRenewal());
+            this.scoreVo.setIsDjq(Byte.toString(otherInfo.getIsDjq()));
+            this.scoreVo.setTotalAdjustRate(otherInfo.getTotalAdjustRate() == null ? null : otherInfo.getTotalAdjustRate().toString());
+            this.scoreVo.setJqAdjustRate(otherInfo.getJqAdjustRate() == null ? null : otherInfo.getJqAdjustRate().toString());
+            this.scoreVo.setSyAdjustRate(otherInfo.getSyAdjustRate() == null ? null : otherInfo.getSyAdjustRate().toString());
+            this.scoreVo.setScoreJson(otherInfo.getScoreJson());
+        }
 
         // 未匹配费用原因
         if(Objects.nonNull(insOrdersVo.getInsOrdersOtherInfo())) {

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteResultsVo.java

@@ -168,6 +168,11 @@ public class QuoteResultsVo implements Serializable {
     @AllArgsConstructor
     @NoArgsConstructor
     public static class ScoreVo {
+
+        /**
+         * 总评分
+         */
+        private String score;
         /**
          * 总赔付率
          */
@@ -231,7 +236,7 @@ public class QuoteResultsVo implements Serializable {
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    public static class CostsVo{
+    public static class CostsVo {
         /**
          * 交强险保费
          */

commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java

@@ -111,6 +111,24 @@ public class InsFeeOrdersVo {
     @Schema(description = "驾意出口比例")
     private BigDecimal jyExportRatio;
 
+    @Schema(description = "交强险手续费比例")
+    private BigDecimal jqCommissionRatio;
+
+    @Schema(description = "商业险手续费比例")
+    private BigDecimal syCommissionRatio;
+
+    @Schema(description = "驾意险手续费比例")
+    private BigDecimal jyCommissionRatio;
+
+    @Schema(description = "交强险跟单费比例")
+    private BigDecimal jqFollowRatio;
+
+    @Schema(description = "商业险跟单费比例")
+    private BigDecimal syFollowRatio;
+
+    @Schema(description = "驾意险跟单费比例")
+    private BigDecimal jyFollowRatio;
+
     @Schema(description = "交强入口比例")
     private BigDecimal jqInletRatio;
 
@@ -241,6 +259,14 @@ public class InsFeeOrdersVo {
         this.syExportRatio = insFeeOrders.getSyExportRatio() != null ? insFeeOrders.getSyExportRatio() : new BigDecimal(0);
         this.jyExportRatio = insFeeOrders.getJyExportRatio() != null ? insFeeOrders.getJyExportRatio() : new BigDecimal(0);
 
+        this.jqCommissionRatio = insFeeOrders.getJqCommissionRatio() != null ? insFeeOrders.getJqCommissionRatio() : BigDecimal.ZERO;
+        this.syCommissionRatio = insFeeOrders.getSyCommissionRatio() != null ? insFeeOrders.getSyCommissionRatio() : BigDecimal.ZERO;
+        this.jyCommissionRatio = insFeeOrders.getJyCommissionRatio() != null ? insFeeOrders.getJyCommissionRatio() : BigDecimal.ZERO;
+
+        this.jqFollowRatio = insFeeOrders.getJqFollowRatio() != null ? insFeeOrders.getJqFollowRatio() : BigDecimal.ZERO;
+        this.syFollowRatio = insFeeOrders.getSyFollowRatio() != null ? insFeeOrders.getSyFollowRatio() : BigDecimal.ZERO;
+        this.jyFollowRatio = insFeeOrders.getJyFollowRatio() != null ? insFeeOrders.getJyFollowRatio() : BigDecimal.ZERO;
+
         this.jqKeepPointPremium = insFeeOrders.getJqKeepPointPremium() != null ? insFeeOrders.getJqKeepPointPremium().toString() : "0.00";
         this.syKeepPointPremium = insFeeOrders.getSyKeepPointPremium() != null ? insFeeOrders.getSyKeepPointPremium().toString() : "0.00";
         this.jyKeepPointPremium = insFeeOrders.getJyKeepPointPremium() != null ? insFeeOrders.getJyKeepPointPremium().toString() : "0.00";

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -134,6 +134,7 @@
         <result property="isDjq" column="is_djq" jdbcType="VARCHAR"/>
         <result property="jqAdjustRate" column="jq_adjust_rate" jdbcType="VARCHAR"/>
         <result property="syAdjustRate" column="sy_adjust_rate" jdbcType="VARCHAR"/>
+        <result property="totalAdjustRate" column="total_adjust_rate" jdbcType="VARCHAR"/>
         <result property="signingTime" column="signing_time" jdbcType="VARCHAR"/>
         <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
         <result property="jqPremium" column="jq_premium" jdbcType="VARCHAR"/>
@@ -768,6 +769,7 @@
         ot.is_djq,
         ot.jq_adjust_rate,
         ot.sy_adjust_rate,
+        ot.total_adjust_rate,
         ot.tp_color_score,
         o.signing_time,
         o.company_name,