永诚商业险bug修改

platform/src/main/resources/mapper/JyxConfigMapper.xml

@@ -121,9 +121,32 @@
 
     <select id="selectMainInsurance" resultType="com.jzg.commons.entity.vo.JyxConfigVo">
         select
-        <include refid="params"/> ,
-        jb.id as blame_id,jb.blame,jb.blame_code,jb.blame_coverage,jb.blame_premium,jb.system_code as blame_system_code,jb.jyx_config_id as blame_jyx_config_id,
-        js.id as setting_id,js.seats,js.coverage as setting_coverage,js.premium as setting_premium,js.system_code as setting_system_code,js.jyx_config_id as setting_jyx_config_id
+        jc.`id`,
+        jc.`product_type`,
+        jc.`parent_id`,
+        jc.`product_name`,
+        jc.`alias`,
+        jc.`company`,
+        jc.`product_code`,
+        jc.`connection_method`,
+        jc.`premium_setting`,
+        jc.`coverage` AS jsCoverage,
+        jc.`premium` AS jsPremium,
+        jc.`system_code`,
+        jc.`is_delete` AS isDelete,
+        jb.id AS blame_id,
+        jb.blame,
+        jb.blame_code,
+        jb.blame_coverage,
+        jb.blame_premium,
+        jb.system_code AS blame_system_code,
+        jb.jyx_config_id AS blame_jyx_config_id,
+        js.id AS setting_id,
+        js.seats,
+        js.coverage AS setting_coverage,
+        js.premium AS setting_premium,
+        js.system_code AS setting_system_code,
+        js.jyx_config_id AS setting_jyx_config_id
         from jyx_config jc
         left join jyx_blame jb on jc.id = jb.jyx_config_id AND jb.is_delete = 0
         left join jyx_setting js on jc.id = js.jyx_config_id AND js.is_delete = 0

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/build/ChengTaiAPIQuoteResultsVoBuild.java

@@ -134,6 +134,10 @@ public final class ChengTaiAPIQuoteResultsVoBuild {
                     .fluentPut("scoreName", "自主定价系数")
                     .fluentPut("scoreKey","coefficient")
                     .fluentPut("score", coefficientVal));
+            scoreJson.add(new JSONObject()
+                    .fluentPut("scoreName", "一账通评分")
+                    .fluentPut("scoreKey", "YztScore")
+                    .fluentPut("score", premiumCalculationResponse.getYztScore()));
         }
         scoreVo.setScoreJson(scoreJson);
         return scoreVo;

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -169,12 +169,21 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
 
         //build参数
         List<String> requestInfoList = new ArrayList<>();
-
+        BigDecimal finalNegotiatedPrice = negotiatedPrice;
+        quoteVo.getKindInfoVo().stream()
+        .filter(Objects::nonNull) // 防止集合内元素为null
+        .forEach(item -> {
+            if ("A".equals(item.getPlatformKindCode())) {
+                String priceStr = finalNegotiatedPrice.toString();
+                item.setAmount(priceStr);
+                item.setUnitAmount(priceStr);
+            }
+        });
         QuoteRequest quoteRequest = this.builderParams(configurationProperties, quoteVo, vehicleInfo, negotiatedPrice.toString());
         QuoteResponse quoteResponse = this.getResponse(quoteRequest,quoteVo, requestInfoList,url);
 
         QuoteResultsVo quoteResultsVo = buildQuoteRespVo(order.getOrdersNo(), quoteResponse, quoteVo);
-
+        quoteResultsVo.setCarActualValue(depreciationPrice);
         return quoteResultsVo;
     }
 
@@ -483,11 +492,9 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         // 保险公司订单号
         quoteRespVo.setCompanyOrderNo(rd.getBase().getCresvTxt6());
 
-        List<KindInfoVo> kindList = buildQuoteKindList(rd);
-
-        quoteRespVo.setKindInfoVo(kindList);
+//        List<KindInfoVo> kindList = buildQuoteKindList(rd);
 
-        buildQuoteKindList(rd,quoteVo.getKindInfoVo());
+        quoteRespVo.setKindInfoVo(buildQuoteKindList(rd,quoteVo.getKindInfoVo()));
 
         //车船税
         double sumTax = 0;
@@ -497,6 +504,8 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         //意外险
         if (null != rd.getProposal()) {
             jyPremium = Double.parseDouble(rd.getProposal().getPremium());
+            quoteVo.getAccidentalDrivings().get(0).setPremium(String.valueOf(jyPremium));
+//            quoteRespVo.set
         }
 
 
@@ -691,15 +700,17 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         if (null == rd.getCvrgListSY() || null == rd.getCvrgListSY().getCvrgSY()) {
             return Collections.emptyList();
         }
-
         List<KindInfoVo> kindList = new ArrayList<>();
 
-//        rd.getCvrgListSY().getCvrgSY().forEach(a -> {
-//
-//            String kindcode = a.getCCvrgNo();
+        rd.getCvrgListSY().getCvrgSY().forEach(a -> {
+
+            String kindcode = a.getCCvrgNo();
+            KindInfoVo kindInfoVo = new KindInfoVo();
+            kindInfoVo.setKindCode(kindcode);
+            kindInfoVo.setAmount(a.getNPrm());
 //            int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.getYongchengConnectInsuranceType(), kindcode);
-////            InsurKind insurKind = Enum.valueOf(InsurKind.class, InsuranceTypeCorrespondence.getJinZhangGuiType()[i]);
-//
+//            InsurKind insurKind = Enum.valueOf(InsurKind.class, InsuranceTypeCorrespondence.getJinZhangGuiType()[i]);
+
 //            double premium = Double.parseDouble(a.getNPrm());
 //            double amount = Double.parseDouble(a.getNPerAmt());
 //            QuoteKindRespVo kind;
@@ -724,10 +735,10 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
 //            if (ArrayUtil.indexOf(InsuranceTypeCorrespondence.getSpecialContractClause(), insurKind.getCode()) >= 0) {
 //                kind.setServiceTimes(a.getNLiabDaysLmt());
 //            }
-//
-//            kindList.add(kind);
-//
-//        });
+
+            kindList.add(kindInfoVo);
+
+        });
 
         return kindList;
     }