修改华泰特约 各个保险公司增加 赔付率和评分

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

@@ -33,7 +33,6 @@ public class CustomerInfoVo {
     @ApiModelProperty("身份证类型")
     private String identifyType;
 
-
     @ApiModelProperty("地址")
     private String addr;
 

src/main/java/com/ydtech/modules/order/controller/HuaTaiOrderApiController.java

@@ -54,7 +54,6 @@ public class HuaTaiOrderApiController {
         return this.huaTaiOrderApiService.queryClauseData(companyId);
     }
 
-
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")//3.6.	转投保接口
     public HttpResult<Object> audit(@RequestBody SpecialAuditVo<InsHuataiContributingVo> specialAudit) {

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiSubmitRequest.java

@@ -73,8 +73,6 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
                                HuaTaiConfigureParameters huaTaiConfigureParameters, List<InsHuataiContributingVo> engageList) {
             List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
             CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
-            // 车主名称
-            String name = ownerInfo.getName();
 
             CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
             CustomerInfoVo insuredPersonInfo = yaQuoteInfoVo.getInsuredPersonInfo();
@@ -82,7 +80,7 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
             this.businessMain = new BusinessMainDto(huaTaiConfigureParameters);
 
             // 保险信息
-            this.contract = new ContractDto().getContract(riskList, insAreaCompany, engageList, name);
+            this.contract = new ContractDto().getContract(riskList, insAreaCompany, engageList);
             // 客户信息
             this.customer = new CustomerDto().getCustomers(ownerInfo, policyHolderInfo, insuredPersonInfo, huaTaiConfigureParameters);
             //销售信息
@@ -127,7 +125,7 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
         private List<EngageDto> engage;
 
         public List<ContractDto> getContract(List<RiskInfoVo> riskInfoVos, InsAreaCompany insAreaCompany,
-                                             List<InsHuataiContributingVo> engageList, String name) {
+                                             List<InsHuataiContributingVo> engageList) {
             String querySequenceNos[] = insAreaCompany.getInsOrderNo().split("-");
             String jqQuerySequenceNo = querySequenceNos[0].trim();
             String syQuerySequenceNo = querySequenceNos[1].trim();
@@ -137,8 +135,6 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest {
                 this.contractMain = new ContractMainDto(riskInfoVo, insAreaCompany);
                 if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
                     this.platFormMessage = new PlatFormMessage(jqQuerySequenceNo);
-                    InsHuataiContributingVo ownerContributing = InsHuataiContributingVo.getOwnerContributing(name);
-                    engageList.add(ownerContributing);
                 }
 
                 if (InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {

src/main/java/com/ydtech/modules/order/entity/po/InsHuataiContributing.java

@@ -11,15 +11,14 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 
  * @TableName ins_huatai_contributing
  */
-@TableName(value ="ins_huatai_contributing")
+@TableName(value = "ins_huatai_contributing")
 @Data
 @ApiModel("华泰特别约定")
 public class InsHuataiContributing implements Serializable {
     /**
-     * 
+     *
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -59,6 +58,13 @@ public class InsHuataiContributing implements Serializable {
     @TableField(value = "engage_detail")
     private String engageDetail;
 
+    /**
+     * 选择类型
+     */
+    @ApiModelProperty("选择类型(1-可选,2-必选, 3-默认勾选)")
+    @TableField(value = "opt_type")
+    private String optType;
+
     /**
      * 是否可修改
      */

src/main/java/com/ydtech/modules/order/entity/vo/huatai/InsHuataiContributingVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serial;
 import java.io.Serializable;
 
 @Data
@@ -25,13 +24,5 @@ public class InsHuataiContributingVo implements Serializable {
     @ApiModelProperty("特约内容")
     private String engageDetail;
 
-    public static InsHuataiContributingVo getOwnerContributing(String owner) {
-        InsHuataiContributingVo insHuataiContributingVo = new InsHuataiContributingVo();
-        insHuataiContributingVo.setRiskCode("0507");
-        insHuataiContributingVo.setEngageCode("T0028");
-        insHuataiContributingVo.setEngageTitle("车主约定(1002)");
-        insHuataiContributingVo.setEngageDetail("本保单行驶证车主为：" + owner);
-        return insHuataiContributingVo;
-    }
 
 }

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

@@ -695,6 +695,12 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             }
         }
 
+        PremiumResp.DataDTO.AutoPriceOutputXOMRespVoDTO autoPriceOutputXOMRespVo = rd.getAutoPriceOutputXOMRespVo();
+
+        quoteRespVo.setJqLossRation(StringUtils.toDouble(autoPriceOutputXOMRespVo.getStrBillCTPELR2()));
+        quoteRespVo.setSyLossRation(StringUtils.toDouble(autoPriceOutputXOMRespVo.getStrBillCOMELR2()));
+        quoteRespVo.setLossRation(StringUtils.toDouble(autoPriceOutputXOMRespVo.getStrBillELR2()));
+
         quoteRespVo.setRiskList(riskList1);
         quoteRespVo.setKindList(kindRespVoList);
         quoteRespVo.setCiSumPermium(jqPremiumBig.add(taxPremiumBig).doubleValue());//交强险和车船税合计

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

@@ -281,10 +281,25 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     @Override
     public HttpResult<List<InsHuataiContributing>> queryClauseData(String companyId) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
+        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+
+        CustomerInfoVo ownerinfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
+        CustomerInfoVo applyinfo = insOrders.getApplyinfo().toJavaObject(CustomerInfoVo.class);
+
         List<String> collect =
                 insAreaCompany.getRiskinfo().toJavaList(RiskInfoVo.class).stream().map(RiskInfoVo::getRiskCode).collect(Collectors.toList());
         List<InsHuataiContributing> list =
                 insHuataiContributingService.lambdaQuery().in(InsHuataiContributing::getRiskCode, collect).list();
+
+        for (InsHuataiContributing insHuataiContributing : list) {
+            if ("T0028".equals(insHuataiContributing.getEngageCode())) {
+                insHuataiContributing.setEngageDetail(insHuataiContributing.getEngageDetail() + ownerinfo.getName());
+            }
+            if ("T0093".equals(insHuataiContributing.getEngageCode())) {
+                insHuataiContributing.setEngageDetail(insHuataiContributing.getEngageDetail() + applyinfo.getName());
+            }
+        }
+
         return HttpResult.ok(list);
     }
 
@@ -510,7 +525,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 jqDiscount = contractMain.getTotalAdjustRate();
                 jqPremium = contractMain.getTotalPremium();
                 jqApplyNo = contractMain.getContractNo();
-
+                quoteRespVo.setJqScore(contractMain.getCategory());
                 quoteRespVo.setStartDateJq(contractMain.getValidDate());
                 quoteRespVo.setEndDateJq(contractMain.getExpiryDate());
             } else {
@@ -518,7 +533,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 syDiscount = contractMain.getTotalAdjustRate();
                 syPremium = contractMain.getTotalPremium();
                 syApplyNo = contractMain.getContractNo();
-
+                quoteRespVo.setSyScore(contractMain.getCategory());
                 quoteRespVo.setStartDateSy(contractMain.getValidDate());
                 quoteRespVo.setEndDateSy(contractMain.getExpiryDate());
             }

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

@@ -442,6 +442,15 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         quoteRespVo.setStartDateSy(calculatePremiumResponse.getBasePart().getSyStartTime());
         quoteRespVo.setEndDateSy(calculatePremiumResponse.getBasePart().getSyEndTime());
 
+        List<CalculatePremiumResponse.PriceInfoListDTO> priceInfoList = calculatePremiumResponse.getPriceInfoList();
+        if(!priceInfoList.isEmpty()){
+            CalculatePremiumResponse.PriceInfoListDTO priceInfoListDTO = priceInfoList.get(0);
+            quoteRespVo.setJqScore(priceInfoListDTO.getRevPredScoreAdjust());
+            quoteRespVo.setSyScore(priceInfoListDTO.getRevPredScore());
+            quoteRespVo.setJqLossRation(StringUtils.toDouble(priceInfoListDTO.getLrRecomAdjust()));
+            quoteRespVo.setSyLossRation(StringUtils.toDouble(priceInfoListDTO.getLrRecom()));
+        }
+
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
         //  报价险种放入保费