Merge remote-tracking branch 'origin/master'

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

@@ -41,8 +41,8 @@ public enum JiaYiXianProduct {
             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),
-            new CoverageConfig("F27047-5", "附加辅助金保险条款", "0094", "家庭辅助金", 0.02, "10", "20000", "2.0万元/座", true),
-            new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.1, "10", "2000", "0.2万元/座", true)
+            new CoverageConfig("F27047-5", "附加辅助金保险条款", "0094", "家庭辅助金", 0.02, "10", "20000", "2.0万元/座", false),
+            new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.1, "10", "2000", "0.2万元/座", false)
     )),
     ANXIANG_50("091","2782", "好运连连（50）", true, Arrays.asList(
             new CoverageConfig("Z27096-1", "交通出行团体意外伤害保险C款条款", "0955", "必选责任：意外伤害身故保险责任", 0.1302, "20000", "2.0万元/座", " ", false),
@@ -56,8 +56,8 @@ public enum JiaYiXianProduct {
             new CoverageConfig("Z27096-2", "交通出行团体意外伤害保险C款条款", "0956", "可选责任：意外伤害伤残保险责任", 0.1, "80000", "8.0万元/座", " ", false),
             new CoverageConfig("F27002", "附加团体意外伤害医疗保险条款", "0008", "意外伤害医疗保险责任", 0.3, "5000", "0.1万元/座", "每次事故免赔300后80%比例赔付", false),
             new CoverageConfig("F27001", "附加团体意外伤害住院津贴保险条款", "0032", "意外伤害住院津贴保险责任", 0.2, "50", "0.005万元/座", "50元/天/座", true),
-            new CoverageConfig("F27047-5", "附加辅助金保险条款", "0094", "家庭辅助金", 0.015, "20000", "2.0万元/座", "", true),
-            new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.2, "2000", "0.2万元/座", "", true)
+            new CoverageConfig("F27047-5", "附加辅助金保险条款", "0094", "家庭辅助金", 0.015, "20000", "2.0万元/座", "", false),
+            new CoverageConfig("F27048-6", "附加救护车车费保险条款", "0095", "救护车费用", 0.2, "2000", "0.2万元/座", "", false)
 
     ));
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -221,7 +221,12 @@ public class UnifyOrderManager {
         if (Objects.nonNull(carInfos) && !carInfos.isEmpty()) {
             InsOrdersVo insOrders = insOrdersService.queryById(Long.parseLong(carInfos.get(0).getOrderNo()));
             if (Objects.nonNull(insOrders)) {
-                quoteNo = String.valueOf(insOrders.getQuoteNo());
+                if(insOrders.getQuoteNo().isEmpty()){
+                    return HttpResult.ok(quoteNo);
+                }else{
+                    return HttpResult.ok(insOrders.getQuoteNo());
+                }
+
             }
         }
         return HttpResult.ok(quoteNo);

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/entity/Request/ZmCrawlerQuotedPriceRequest.java

@@ -690,7 +690,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
                 private Integer analogyPriceTax;
 
                 @JsonProperty("approvedLoad")
-                private Integer approvedLoad;
+                private double approvedLoad;
 
                 @JsonProperty("approvedPassengersCapacity")
                 private Integer approvedPassengersCapacity;
@@ -825,7 +825,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
                 private String series;
 
                 public SimpleStadarCarDTO(ZmCrawlerModelQueryResponse.FullCarDataDTO.FullCarData fullCarData,CarInfoVo carInfo){
-                    this.approvedLoad = fullCarData.getApprovedLoad();
+                    this.approvedLoad = fullCarData.getApprovedLoad() * 1000;
                     this.approvedPassengersCapacity = fullCarData.getApprovedPassengersCapacity();
                     this.brand = fullCarData.getModelName();
                     this.carType = fullCarData.getCarType();
@@ -869,7 +869,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
                 private String modelName;
 
                 @JsonProperty("approvedLoad")
-                private Integer approvedLoad;
+                private double approvedLoad;
 
                 @JsonProperty("approvedPassengersCapacity")
                 private Integer approvedPassengersCapacity;
@@ -939,7 +939,7 @@ public class ZmCrawlerQuotedPriceRequest extends BaseRequest {
 
                 public ModelDetailsDTO(ZmCrawlerModelQueryResponse.FullCarDataDTO fullCarDataDTO) {
                     ZmCrawlerModelQueryResponse.FullCarDataDTO.FullCarData fullCarData = fullCarDataDTO.getFullCarData();
-                    this.approvedLoad = fullCarData.getApprovedLoad();
+                    this.approvedLoad = fullCarData.getApprovedLoad()*1000;
                     this.approvedPassengersCapacity = fullCarData.getApprovedPassengersCapacity();
                     this.brand = fullCarData.getModelName();
                     this.carAlias = fullCarData.getModelName();

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/entity/Response/ZmCrawlerModelQueryResponse.java

@@ -78,7 +78,7 @@ public class ZmCrawlerModelQueryResponse extends BaseResponse {
 
             private Integer analogyPrice;
             private Integer analogyPriceTax;
-            private Integer approvedLoad;
+            private double approvedLoad;
             private Integer approvedPassengersCapacity;
             private String brand;
             private String brandCode;