添加阳光合并经营成本率

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -129,7 +129,7 @@ public class QuoteRespVo {
     private double syLossRation;
 
     @ApiModelProperty("阳光 交商含增值服务合并经营成本率")
-    private double margeCostRate;
+    private double mergeCostRate;
 
     @ApiModelProperty("核心返回车型")
     private CoreModelsVo coreModels;

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

@@ -628,7 +628,7 @@ public class InsAreaCompany implements Serializable {
         this.lossRation = quoteRespVo.getLossRation();
         this.jqLossRation = quoteRespVo.getJqLossRation();
         this.syLossRation = quoteRespVo.getSyLossRation();
-        this.mergeCostRate = quoteRespVo.getMargeCostRate();
+        this.mergeCostRate = quoteRespVo.getMergeCostRate();
         // 保单号
         this.jqapplyno = quoteRespVo.getJqApplyNo();
         this.syapplyno = quoteRespVo.getSyApplyNo();

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

@@ -217,6 +217,9 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
         @ApiModelProperty("商业赔付率")
         private double syLossRation;
 
+        @ApiModelProperty("交商合并经营成本率")
+        private double mergeCostRate;
+
 
         /**
          * 紫金能源车（鼎然-车辆风险评分  add by hxl 2024-04-09
@@ -320,6 +323,7 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
             if(!Objects.isNull(insAreaCompany.getApiType())) {
                 this.apiType = insAreaCompany.getApiType().toString();
             }
+            this.mergeCostRate = insAreaCompany.getMergeCostRate();
         }
     }
 

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

@@ -83,6 +83,9 @@ public class YaExtendInfoDto implements Serializable {
     @ApiModelProperty("商业出险次数")
     private String syClaims;
 
+    @ApiModelProperty("交商合并经营成本率")
+    private Double mergeCostRate;
+
     /**
      * 临时增加
      *
@@ -128,6 +131,7 @@ public class YaExtendInfoDto implements Serializable {
         // 出险次数
         this.jqClaims = insAreaCompany.getJqClaims();
         this.syClaims = insAreaCompany.getSyClaims();
+        this.mergeCostRate = insAreaCompany.getMergeCostRate();
     }
 
 }

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

@@ -731,6 +731,7 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
             quoteRespVo.setSyScore(discount.getMarkingnobcBI() != null ? discount.getMarkingnobcBI() : "");
             quoteRespVo.setJqLossRation(Double.parseDouble(discount.getFinalmarkingnoCi() != null ? discount.getFinalmarkingnoCi() : "0.00"));
             quoteRespVo.setSyLossRation(Double.parseDouble(discount.getFinalmarkingnoBi() != null ? discount.getFinalmarkingnoBi() : "0.00"));
+            quoteRespVo.setMergeCostRate(Double.parseDouble(yangGuangAccuracyCalculateResponse.getVascostmarginbc() != null ?yangGuangAccuracyCalculateResponse.getVascostmarginbc() : "0.00"));
         }
 
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();

src/main/java/com/ydtech/modules/scheme/controller/PtlSchemeController.java

@@ -213,9 +213,11 @@ public class PtlSchemeController extends BaseController {
     }
 
     @ApiOperation(value = "规则过滤保险公司")
-    @Validated
+//    @Validated
     @PostMapping("/ruleFilterCompany")
-    public HttpResult ruleFilterCompany(@Validated @RequestBody RuleFilterVo ruleFilterVo){
+    public HttpResult ruleFilterCompany(
+//            @Validated
+                                            @RequestBody RuleFilterVo ruleFilterVo){
         String userId = getUserId();
         if(!Objects.isNull(ruleFilterVo.getUserId()) && !ruleFilterVo.getUserId().equals("")){
             userId = ruleFilterVo.getUserId();

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

@@ -132,6 +132,7 @@
         <result property="signingTime" column="signingTime" jdbcType="TIMESTAMP"/>
         <result property="payDate" column="payDate" jdbcType="TIMESTAMP"/>
         <result property="partnerCompaniesName" column="partnerCompaniesName" jdbcType="VARCHAR"/>
+        <result property="mergecostrate" column="mergecostrate" jdbcType="DOUBLE"/>
 
     </resultMap>
 
@@ -249,7 +250,8 @@
                iac.pay_date  as payDate,
                iac.agreement_id,
                o.entry_status,
-               eic.namesimple as partnerCompaniesName
+               eic.namesimple as partnerCompaniesName,
+               iac.merge_cost_rate
         from ins_orders as o
                  join ins_area_company iac on o.orderno = iac.orderno
                  LEFT JOIN ptl_agreement pa ON pa.id = iac.agreement_id