Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/constant/enums/JiaYiXianProduct.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Getter
 public enum JiaYiXianProduct {
 
-    ANXIANG_100("112", "安享驾乘（100）", true, Arrays.asList(
+    ANXIANG_100("112","2781", "安享驾乘（100）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.051, "80000", "8.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.034, "80000", "8.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.28, "5000", "0.5万元/座", "每次事故免赔300后80%比例赔付", false),
@@ -21,7 +21,7 @@ public enum JiaYiXianProduct {
             new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.2, "1000", "0.1万元/座", "每次事故最高赔付300元", false)
     )),
 
-    ANXIANG_120("113", "安享驾乘（120）", false, Arrays.asList(
+    ANXIANG_120("113","2781", "安享驾乘（120）", false, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.063, "120000", "12.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.042, "120000", "12.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.26, "10000", "1.0万元/座", "每次事故免赔300后80%比例赔付", false),
@@ -30,13 +30,13 @@ public enum JiaYiXianProduct {
             new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.2, "2000", "0.2万元/座", "每次事故最高赔付300元", false)
     )),
 
-    ANXIANG_36("111", "安享驾乘（36）", true, Arrays.asList(
+    ANXIANG_36("111","2781", "安享驾乘（36）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.06, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.04, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.24, "1000", "0.1万元/座", "每次事故免赔300后80%比例赔付", false),
             new CoverageConfig("F27001", "附加团体意外伤害住院津贴保险条款", "0032", "意外伤害住院津贴保险责任", 0.2, "10", "0.001万元/座", "10元/天/座", true)
     )),
-    ANXIANG_260("260", "安享驾乘（260）", true, Arrays.asList(
+    ANXIANG_260("260", "2781","安享驾乘（260）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.06, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.04, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.24, "1000", "0.1万元/座", "每次事故免赔300后80%比例赔付", false),
@@ -44,14 +44,14 @@ public enum JiaYiXianProduct {
             new CoverageConfig("F27047-5", "附加辅助金保险条款", "0094", "家庭辅助金", 0.02, "10", "20000", "2.0万元/座", true),
             new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.1, "10", "2000", "0.2万元/座", true)
     )),
-    ANXIANG_50("091", "好运连连（50）", true, Arrays.asList(
+    ANXIANG_50("091","2782", "好运连连（50）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.06, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.04, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.24, "1000", "0.1万元/座", "每次事故免赔300后80%比例赔付", false),
             new CoverageConfig("F27001", "附加团体意外伤害住院津贴保险条款", "0032", "意外伤害住院津贴保险责任", 0.2, "10", "0.001万元/座", "10元/天/座", true)
 
     )),
-    ANXIANG_240("092", "好运连连（240）", true, Arrays.asList(
+    ANXIANG_240("092","2782", "好运连连（240）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.06, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.04, "30000", "3.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.24, "1000", "0.1万元/座", "每次事故免赔300后80%比例赔付", false),
@@ -66,6 +66,10 @@ public enum JiaYiXianProduct {
      * 产品代码
      */
     private final String productCode;
+    /**
+     * 产品代码
+     */
+    private final String nvehRiskCode;
 
     /**
      * 产品名称
@@ -82,8 +86,9 @@ public enum JiaYiXianProduct {
      */
     private final List<CoverageConfig> coverageConfigs;
 
-    JiaYiXianProduct(String productCode, String productName, boolean emptyEngage, List<CoverageConfig> coverageConfigs) {
+    JiaYiXianProduct(String productCode, String nvehRiskCode,String productName, boolean emptyEngage, List<CoverageConfig> coverageConfigs) {
         this.productCode = productCode;
+        this.nvehRiskCode = nvehRiskCode;
         this.productName = productName;
         this.emptyEngage = emptyEngage;
         this.coverageConfigs = coverageConfigs;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequestRequest.java

@@ -1798,18 +1798,18 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
                 if (quoteVo.getAccidentalDrivings() != null) {
                     quoteVo.getAccidentalDrivings().forEach(accident -> {
                         String productCode = accident.getProductCode();
+                        JiaYiXianProduct product = JiaYiXianProduct.fromProductCode(productCode);
                         ContractAccidentDTO contractAccidentDTO = new ContractAccidentDTO();
                         contractAccidentDTO.setAccident(new ArrayList<>());
                         contractAccidentDTO.setAdjust(new ArrayList<>());
                         contractAccidentDTO.setAutoPriceApqMainList(new ArrayList<>());
                         contractAccidentDTO.setChoosed(true);
-                        contractAccidentDTO.setContractMain(buildContractMainDTO(accident));
+                        contractAccidentDTO.setContractMain(buildContractMainDTO(accident,product));
                         contractAccidentDTO.setLoocked(false);
 
                         List<CoverageDTO> coverageDTOS = buildCoverageDTOs(productCode);
                         contractAccidentDTO.setCoverage(coverageDTOS);
 
-                        JiaYiXianProduct product = JiaYiXianProduct.fromProductCode(productCode);
                         if (product.isEmptyEngage()) {
                             contractAccidentDTO.setEngage(new ArrayList<>());
                         } else {
@@ -1896,7 +1896,7 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
                 return platFormMessage;
             }
 
-            private static ContractMainDTO buildContractMainDTO(AccidentalDrivingVo accidentVo) {
+            private static ContractMainDTO buildContractMainDTO(AccidentalDrivingVo accidentVo,JiaYiXianProduct product) {
                 ContractMainDTO contractMainDTO = new ContractMainDTO();
                 contractMainDTO.setAllQuantity(String.valueOf(accidentVo.getQuantity()));
                 contractMainDTO.setChoosed(true);
@@ -1905,7 +1905,7 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
                 contractMainDTO.setInsuredObjectCode("7");
                 contractMainDTO.setInsuredObjectName("从车");
                 contractMainDTO.setIsRegistered("0");
-                contractMainDTO.setNvehRiskCode("2781");
+                contractMainDTO.setNvehRiskCode(product.getNvehRiskCode());
                 contractMainDTO.setNvehRiskName("安享驾");
                 contractMainDTO.setNvehRiskType("01");
                 contractMainDTO.setParagraph("1");