泰康报价完成

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitParam.java

@@ -162,6 +162,8 @@ public class PreciseInitParam extends OrderRequest {
 
     private TKCarProduct carProduct;
 
+
+
     @Override
     protected void addChildUnknownFields() {
         addChildUnknownField("chgOwnerInfo", chgOwnerInfo);

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitResult.java

@@ -1,9 +1,13 @@
 package com.jzg.quotation.taikang.crawler.model.api;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.taikang.crawler.client.BaseResponse;
 import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import com.jzg.quotation.taikang.crawler.model.entity.*;
+import lombok.Data;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -15,6 +19,8 @@ import java.util.List;
 @Getter
 @Document("taikang.api.order")
 public class PreciseInitResult extends UnknownFieldEntity {
+
+    @Data
     public static final class Response extends BaseResponse<PreciseInitResult> {
     }
 
@@ -23,14 +29,14 @@ public class PreciseInitResult extends UnknownFieldEntity {
 
     /**
      * 商业评分，保单综合评分
-     *
+     * <p>
      * 比如：C20
      */
     private String businessScore;
 
     /**
      * 交强险折扣
-     *
+     * <p>
      * 比如最终交强险费用是 570，同时它的折扣是 0.6
      */
     private BigDecimal bzDisCount;
@@ -41,14 +47,13 @@ public class PreciseInitResult extends UnknownFieldEntity {
 
     /**
      * 商业险的折扣
-     *
+     * <p>
      * 比如最终商业险费用是 3954.52，同时它的折扣是 0.6517
-     *
      */
     private BigDecimal ciDisCount;
     /**
      * 投保商业险
-     *
+     * <p>
      * 商业保险种类信息列表
      */
     private List<TKCiKindsVo> ciKindsVo;
@@ -80,7 +85,7 @@ public class PreciseInitResult extends UnknownFieldEntity {
     private TKDateInfo date;
     /**
      * 投保驾乘意外险
-     *
+     * <p>
      * 比如：升级-C￥368、升级-B￥298、升级-A￥218
      */
     private TKDriverAccidentVo driverAccidentVo;
@@ -144,7 +149,7 @@ public class PreciseInitResult extends UnknownFieldEntity {
 
     /**
      * 初始化标志，标识订单是否处于初始化状态
-     *
+     * <p>
      * 第一次时，录入完车辆和车主信息后，提交时是 init。下一步进行选择险种并计算保费。
      * 从第二次开始，也就是选完险种后，每进行保费计算时，是 quote。
      */
@@ -152,16 +157,16 @@ public class PreciseInitResult extends UnknownFieldEntity {
 
     /**
      * 商业险自主定价系数
-     *
+     * <p>
      * 比如：0.9
-     *
+     * <p>
      * 观察到与  ciDisCount 一样
      */
     private BigDecimal pricingRate;
 
     /**
      * 商业险NCD
-     *
+     * <p>
      * 比如 0.7
      */
     private BigDecimal syclaimAdjust;
@@ -170,12 +175,50 @@ public class PreciseInitResult extends UnknownFieldEntity {
 
     /**
      * 商业险类型
-     *
+     * <p>
      * 新能源车时，为 0808
      * 传统能源车时，为 0809
      */
     private String riskType;
 
+    private List<?> expect;
+
+    private List<NonCarProductListDTO> nonCarProductList;
+
+    @NoArgsConstructor
+    @Data
+    public static class NonCarProductListDTO {
+        private String endDate;
+        private String isSelect;
+        private String premium;
+        private String productCategoryCode;
+        private String productCategoryName;
+        private List<ProductInfoListDTO> productInfoList;
+        private String selectProductCode;
+        private String selectProductName;
+        private String startDate;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class ProductInfoListDTO {
+        private List<test.NonCarProductListDTO.ProductInfoListDTO.KindMapDTO> kindMap;
+        private String pageShowFlag;
+        private String premium;
+        private String productCode;
+        private String productName;
+        private String productShortName;
+
+        @NoArgsConstructor
+        @Data
+        public static class KindMapDTO {
+            private String amount;
+            private String kindName;
+            private Integer serialNo;
+        }
+    }
+
+
     @Override
     protected void addChildUnknownFields() {
         addChildUnknownField("bzKindVo", bzKindVo);

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/test.java

@@ -0,0 +1,534 @@
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class test {
+    @JSONField(name = "businessScore")
+    private String businessScore;
+    @JSONField(name = "bzDisCount")
+    private Double bzDisCount;
+    @JSONField(name = "bzKindVo")
+    private BzKindVoDTO bzKindVo;
+    @JSONField(name = "carTax")
+    private CarTaxDTO carTax;
+    @JSONField(name = "ciDisCount")
+    private Double ciDisCount;
+    @JSONField(name = "ciKindsVo")
+    private List<?> ciKindsVo;
+    @JSONField(name = "commissionAmountCI")
+    private Double commissionAmountCI;
+    @JSONField(name = "commissionRateCI")
+    private Double commissionRateCI;
+    @JSONField(name = "date")
+    private DateDTO date;
+    @JSONField(name = "driverAccidentVo")
+    private DriverAccidentVoDTO driverAccidentVo;
+    @JSONField(name = "elr")
+    private Double elr;
+    @JSONField(name = "entireExpDiscount")
+    private Double entireExpDiscount;
+    @JSONField(name = "entireRecommenDiscount")
+    private Double entireRecommenDiscount;
+    @JSONField(name = "expect")
+    private List<?> expect;
+    @JSONField(name = "flag")
+    private FlagDTO flag;
+    @JSONField(name = "goodStartDiscount")
+    private Double goodStartDiscount;
+    @JSONField(name = "nonCarProductList")
+    private List<NonCarProductListDTO> nonCarProductList;
+    @JSONField(name = "other")
+    private OtherDTO other;
+    @JSONField(name = "premium")
+    private PremiumDTO premium;
+    @JSONField(name = "riskScore")
+    private Double riskScore;
+    @JSONField(name = "valueAdded")
+    private ValueAddedDTO valueAdded;
+
+    @NoArgsConstructor
+    @Data
+    public static class BzKindVoDTO {
+        @JSONField(name = "benchmarkPremium")
+        private Double benchmarkPremium;
+        @JSONField(name = "bjPremium")
+        private Double bjPremium;
+        @JSONField(name = "deductibleAmount")
+        private Double deductibleAmount;
+        @JSONField(name = "isBjKindFlag")
+        private String isBjKindFlag;
+        @JSONField(name = "isSelect")
+        private String isSelect;
+        @JSONField(name = "kindCName")
+        private String kindCName;
+        @JSONField(name = "kindCode")
+        private String kindCode;
+        @JSONField(name = "premium")
+        private Double premium;
+        @JSONField(name = "quantity")
+        private Integer quantity;
+        @JSONField(name = "quoteAmount")
+        private Double quoteAmount;
+        @JSONField(name = "quoteAmountCN")
+        private String quoteAmountCN;
+        @JSONField(name = "serialNo")
+        private Integer serialNo;
+        @JSONField(name = "totalPremium")
+        private Double totalPremium;
+        @JSONField(name = "unitAmount")
+        private Double unitAmount;
+        @JSONField(name = "unitAmountCN")
+        private String unitAmountCN;
+        @JSONField(name = "upKindCode")
+        private String upKindCode;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class CarTaxDTO {
+        @JSONField(name = "sumPayment")
+        private Double sumPayment;
+        @JSONField(name = "sumtaxOverdue")
+        private Double sumtaxOverdue;
+        @JSONField(name = "surCharge")
+        private Double surCharge;
+        @JSONField(name = "tax")
+        private Double tax;
+        @JSONField(name = "taxFlag")
+        private String taxFlag;
+        @JSONField(name = "taxOverdue")
+        private Double taxOverdue;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class DateDTO {
+        @JSONField(name = "endDateBZ")
+        private String endDateBZ;
+        @JSONField(name = "endDateCI")
+        private String endDateCI;
+        @JSONField(name = "enrollDate")
+        private String enrollDate;
+        @JSONField(name = "initStartDateBZ")
+        private String initStartDateBZ;
+        @JSONField(name = "initStartDateCI")
+        private String initStartDateCI;
+        @JSONField(name = "jcbEndDate")
+        private String jcbEndDate;
+        @JSONField(name = "jcbEndHour")
+        private String jcbEndHour;
+        @JSONField(name = "jcbEndMinute")
+        private String jcbEndMinute;
+        @JSONField(name = "jcbStartDate")
+        private String jcbStartDate;
+        @JSONField(name = "jcbStartHour")
+        private String jcbStartHour;
+        @JSONField(name = "jcbStartMinute")
+        private String jcbStartMinute;
+        @JSONField(name = "jqEndDate")
+        private String jqEndDate;
+        @JSONField(name = "jqEndHour")
+        private String jqEndHour;
+        @JSONField(name = "jqEndMinute")
+        private String jqEndMinute;
+        @JSONField(name = "jqStartDate")
+        private String jqStartDate;
+        @JSONField(name = "jqStartDateLittleLimit")
+        private String jqStartDateLittleLimit;
+        @JSONField(name = "jqStartHour")
+        private String jqStartHour;
+        @JSONField(name = "jqStartMinute")
+        private String jqStartMinute;
+        @JSONField(name = "postponeCountCIP")
+        private Integer postponeCountCIP;
+        @JSONField(name = "startDateBZ")
+        private String startDateBZ;
+        @JSONField(name = "startDateCI")
+        private String startDateCI;
+        @JSONField(name = "syEndDate")
+        private String syEndDate;
+        @JSONField(name = "syEndHour")
+        private String syEndHour;
+        @JSONField(name = "syEndMinute")
+        private String syEndMinute;
+        @JSONField(name = "syStartDate")
+        private String syStartDate;
+        @JSONField(name = "syStartDateLittleLimit")
+        private String syStartDateLittleLimit;
+        @JSONField(name = "syStartHour")
+        private String syStartHour;
+        @JSONField(name = "syStartMinute")
+        private String syStartMinute;
+        @JSONField(name = "tantuEndDate")
+        private String tantuEndDate;
+        @JSONField(name = "tantuEndHour")
+        private String tantuEndHour;
+        @JSONField(name = "tantuEndMinute")
+        private String tantuEndMinute;
+        @JSONField(name = "tantuStartDate")
+        private String tantuStartDate;
+        @JSONField(name = "tantuStartHour")
+        private String tantuStartHour;
+        @JSONField(name = "tantuStartMinute")
+        private String tantuStartMinute;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class DriverAccidentVoDTO {
+        @JSONField(name = "carPlanInfoList")
+        private List<CarPlanInfoListDTO> carPlanInfoList;
+        @JSONField(name = "commonPlanInfoList")
+        private List<CommonPlanInfoListDTO> commonPlanInfoList;
+        @JSONField(name = "discount")
+        private Double discount;
+        @JSONField(name = "highGuestFlag")
+        private Boolean highGuestFlag;
+        @JSONField(name = "isSelect")
+        private String isSelect;
+        @JSONField(name = "kindCName")
+        private String kindCName;
+        @JSONField(name = "kindCode")
+        private String kindCode;
+        @JSONField(name = "nonCarEndDate")
+        private String nonCarEndDate;
+        @JSONField(name = "nonCarStartDate")
+        private String nonCarStartDate;
+        @JSONField(name = "premium")
+        private Double premium;
+        @JSONField(name = "quantity")
+        private Integer quantity;
+        @JSONField(name = "quantityCname")
+        private String quantityCname;
+        @JSONField(name = "quantityList")
+        private List<QuantityListDTO> quantityList;
+        @JSONField(name = "selectPlanCode")
+        private String selectPlanCode;
+        @JSONField(name = "vipPlanInfoList")
+        private List<?> vipPlanInfoList;
+
+        @NoArgsConstructor
+        @Data
+        public static class CarPlanInfoListDTO {
+            @JSONField(name = "itemKindList")
+            private List<ItemKindListDTO> itemKindList;
+            @JSONField(name = "newEnergyItemKindList")
+            private List<NewEnergyItemKindListDTO> newEnergyItemKindList;
+            @JSONField(name = "planCode")
+            private String planCode;
+            @JSONField(name = "planName")
+            private String planName;
+            @JSONField(name = "planType")
+            private String planType;
+            @JSONField(name = "sumAmount")
+            private String sumAmount;
+            @JSONField(name = "sumPremium")
+            private String sumPremium;
+
+            @NoArgsConstructor
+            @Data
+            public static class ItemKindListDTO {
+                @JSONField(name = "amount")
+                private Double amount;
+                @JSONField(name = "amountCN")
+                private String amountCN;
+                @JSONField(name = "deductibleAmount")
+                private Double deductibleAmount;
+                @JSONField(name = "deductibleRate")
+                private Double deductibleRate;
+                @JSONField(name = "kindCode")
+                private String kindCode;
+                @JSONField(name = "kindInd")
+                private String kindInd;
+                @JSONField(name = "kindName")
+                private String kindName;
+                @JSONField(name = "modeCode")
+                private Integer modeCode;
+                @JSONField(name = "premium")
+                private Double premium;
+                @JSONField(name = "stantardPremium")
+                private Double stantardPremium;
+                @JSONField(name = "unholidaySumInsured")
+                private Double unholidaySumInsured;
+                @JSONField(name = "unitType")
+                private String unitType;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class NewEnergyItemKindListDTO {
+                @JSONField(name = "amount")
+                private Double amount;
+                @JSONField(name = "deductibleAmount")
+                private Double deductibleAmount;
+                @JSONField(name = "deductibleRate")
+                private Double deductibleRate;
+                @JSONField(name = "kindCode")
+                private String kindCode;
+                @JSONField(name = "kindInd")
+                private String kindInd;
+                @JSONField(name = "kindName")
+                private String kindName;
+                @JSONField(name = "modeCode")
+                private Integer modeCode;
+                @JSONField(name = "premium")
+                private Double premium;
+                @JSONField(name = "stantardPremium")
+                private Double stantardPremium;
+                @JSONField(name = "unholidaySumInsured")
+                private Double unholidaySumInsured;
+                @JSONField(name = "unitType")
+                private String unitType;
+            }
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class CommonPlanInfoListDTO {
+            @JSONField(name = "itemKindList")
+            private List<ItemKindListDTO> itemKindList;
+            @JSONField(name = "newEnergyItemKindList")
+            private List<NewEnergyItemKindListDTO> newEnergyItemKindList;
+            @JSONField(name = "planCode")
+            private String planCode;
+            @JSONField(name = "planName")
+            private String planName;
+            @JSONField(name = "planType")
+            private String planType;
+            @JSONField(name = "sumAmount")
+            private String sumAmount;
+            @JSONField(name = "sumPremium")
+            private String sumPremium;
+
+            @NoArgsConstructor
+            @Data
+            public static class ItemKindListDTO {
+                @JSONField(name = "amount")
+                private Double amount;
+                @JSONField(name = "amountCN")
+                private String amountCN;
+                @JSONField(name = "deductibleAmount")
+                private Double deductibleAmount;
+                @JSONField(name = "deductibleRate")
+                private Double deductibleRate;
+                @JSONField(name = "kindCode")
+                private String kindCode;
+                @JSONField(name = "kindInd")
+                private String kindInd;
+                @JSONField(name = "kindName")
+                private String kindName;
+                @JSONField(name = "modeCode")
+                private Integer modeCode;
+                @JSONField(name = "premium")
+                private Double premium;
+                @JSONField(name = "stantardPremium")
+                private Double stantardPremium;
+                @JSONField(name = "unholidaySumInsured")
+                private Double unholidaySumInsured;
+                @JSONField(name = "unitType")
+                private String unitType;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class NewEnergyItemKindListDTO {
+                @JSONField(name = "amount")
+                private Double amount;
+                @JSONField(name = "deductibleAmount")
+                private Double deductibleAmount;
+                @JSONField(name = "deductibleRate")
+                private Double deductibleRate;
+                @JSONField(name = "kindCode")
+                private String kindCode;
+                @JSONField(name = "kindInd")
+                private String kindInd;
+                @JSONField(name = "kindName")
+                private String kindName;
+                @JSONField(name = "modeCode")
+                private Integer modeCode;
+                @JSONField(name = "premium")
+                private Double premium;
+                @JSONField(name = "stantardPremium")
+                private Double stantardPremium;
+                @JSONField(name = "unholidaySumInsured")
+                private Double unholidaySumInsured;
+                @JSONField(name = "unitType")
+                private String unitType;
+            }
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class QuantityListDTO {
+            @JSONField(name = "amountCname")
+            private String amountCname;
+            @JSONField(name = "amountEname")
+            private String amountEname;
+            @JSONField(name = "amountShowName")
+            private String amountShowName;
+            @JSONField(name = "clientType")
+            private String clientType;
+            @JSONField(name = "comCode")
+            private String comCode;
+            @JSONField(name = "kindCode")
+            private String kindCode;
+            @JSONField(name = "selected")
+            private String selected;
+            @JSONField(name = "serialNo")
+            private Integer serialNo;
+        }
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class FlagDTO {
+        @JSONField(name = "alternativePlanFlag")
+        private String alternativePlanFlag;
+        @JSONField(name = "bzFlag")
+        private String bzFlag;
+        @JSONField(name = "carServiceApiPresentShowFlag")
+        private String carServiceApiPresentShowFlag;
+        @JSONField(name = "ciFlag")
+        private String ciFlag;
+        @JSONField(name = "expectDiscountFlag")
+        private String expectDiscountFlag;
+        @JSONField(name = "expectShowFlag")
+        private Boolean expectShowFlag;
+        @JSONField(name = "forbidBzFlag")
+        private String forbidBzFlag;
+        @JSONField(name = "forbidCiFlag")
+        private String forbidCiFlag;
+        @JSONField(name = "innerFromId")
+        private String innerFromId;
+        @JSONField(name = "instantInsureBZAllowed")
+        private String instantInsureBZAllowed;
+        @JSONField(name = "instantInsureCIAllowed")
+        private String instantInsureCIAllowed;
+        @JSONField(name = "instantInsureFlagBZ")
+        private String instantInsureFlagBZ;
+        @JSONField(name = "instantInsureFlagCI")
+        private String instantInsureFlagCI;
+        @JSONField(name = "isAccidentInsureFlag")
+        private String isAccidentInsureFlag;
+        @JSONField(name = "isStaffCar")
+        private String isStaffCar;
+        @JSONField(name = "isTurnToProtect")
+        private String isTurnToProtect;
+        @JSONField(name = "noticeFlag")
+        private String noticeFlag;
+        @JSONField(name = "oldNewCIFlag")
+        private String oldNewCIFlag;
+        @JSONField(name = "onlyQuoteFlag")
+        private String onlyQuoteFlag;
+        @JSONField(name = "preQuoteFlag")
+        private String preQuoteFlag;
+        @JSONField(name = "quoteFlag")
+        private String quoteFlag;
+        @JSONField(name = "quoteLinkageFlag")
+        private String quoteLinkageFlag;
+        @JSONField(name = "renewalBZFlag")
+        private String renewalBZFlag;
+        @JSONField(name = "renewalBZShowFlag")
+        private String renewalBZShowFlag;
+        @JSONField(name = "renewalCIFlag")
+        private String renewalCIFlag;
+        @JSONField(name = "renewalCIShowFlag")
+        private String renewalCIShowFlag;
+        @JSONField(name = "renewalFlag")
+        private String renewalFlag;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class OtherDTO {
+        @JSONField(name = "actualValue")
+        private Double actualValue;
+        @JSONField(name = "carType")
+        private String carType;
+        @JSONField(name = "comCode")
+        private String comCode;
+        @JSONField(name = "discountMonths")
+        private Integer discountMonths;
+        @JSONField(name = "isCutCar")
+        private String isCutCar;
+        @JSONField(name = "isNewCar")
+        private String isNewCar;
+        @JSONField(name = "notice")
+        private String notice;
+        @JSONField(name = "purchasePrice")
+        private Double purchasePrice;
+        @JSONField(name = "seats")
+        private Integer seats;
+        @JSONField(name = "useNatureCodeCode")
+        private String useNatureCodeCode;
+        @JSONField(name = "useYear")
+        private Integer useYear;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PremiumDTO {
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class ValueAddedDTO {
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class NonCarProductListDTO {
+        @JSONField(name = "endDate")
+        private String endDate;
+        @JSONField(name = "isSelect")
+        private String isSelect;
+        @JSONField(name = "premium")
+        private String premium;
+        @JSONField(name = "productCategoryCode")
+        private String productCategoryCode;
+        @JSONField(name = "productCategoryName")
+        private String productCategoryName;
+        @JSONField(name = "productInfoList")
+        private List<ProductInfoListDTO> productInfoList;
+        @JSONField(name = "selectProductCode")
+        private String selectProductCode;
+        @JSONField(name = "selectProductName")
+        private String selectProductName;
+        @JSONField(name = "startDate")
+        private String startDate;
+
+        @NoArgsConstructor
+        @Data
+        public static class ProductInfoListDTO {
+            @JSONField(name = "kindMap")
+            private List<KindMapDTO> kindMap;
+            @JSONField(name = "pageShowFlag")
+            private String pageShowFlag;
+            @JSONField(name = "premium")
+            private String premium;
+            @JSONField(name = "productCode")
+            private String productCode;
+            @JSONField(name = "productName")
+            private String productName;
+            @JSONField(name = "productShortName")
+            private String productShortName;
+
+            @NoArgsConstructor
+            @Data
+            public static class KindMapDTO {
+                @JSONField(name = "amount")
+                private String amount;
+                @JSONField(name = "kindName")
+                private String kindName;
+                @JSONField(name = "serialNo")
+                private Integer serialNo;
+            }
+        }
+    }
+}

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKDateInfo.java

@@ -120,5 +120,13 @@ public class TKDateInfo extends UnknownFieldEntity {
      * 商业险开始分钟
      */
     private String syStartMinute;
+
+
+    private String tantuEndDate;
+    private String tantuEndHour;
+    private String tantuEndMinute;
+    private String tantuStartDate;
+    private String tantuStartHour;
+    private String tantuStartMinute;
 }
 

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKFlag.java

@@ -118,4 +118,10 @@ public class TKFlag extends UnknownFieldEntity {
      * 续保标志
      */
     private String renewalFlag;
+
+    private String alternativePlanFlag;
+
+    private String innerFromId;
+
+    private String isStaffCar;
 }

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/TKHttpAPIService.java

@@ -422,47 +422,10 @@ public class TKHttpAPIService {
         CarModelinfoQueryResult.Response decrypt = decrypt(response, CarModelinfoQueryResult.Response.class);
 
         checkResponseUnknownField(decrypt);
-        Integer status = decrypt.getStatus();
-//        getEntrance(status,session,mainOrderId);
 
         return decrypt.getData();
     }
 
-    /**
-     * "channelCode": "OffWeb",
-     * "orderID": self.orderId,
-     * "fromId": self.fromid,
-     * "validateCodeFlag": "1",
-     * "sixIdNum": "",
-     * "isOrphan": "0",
-     * "tplatformId": self.tplatformId,
-     * "innerFromId": self.fromIdcode
-     */
-    private void getEntrance(Integer status,TKLoginSession session,String mainOrderId) {
-        if (status == 1) {
-            EntranceParam param = new EntranceParam();
-            param.setChannelCode("OffWeb");
-//            param.setOrderID(mainOrderId);
-            param.setFromID(session.getFromid());
-//            param.setValidateCodeFlag("1");
-//            param.setSixIdNum("");
-//            param.setIsOrphan("0");
-            param.setTplatformId(session.getTplatformId());
-//            param.setFromId(session.getFromid());
-//            param.setInnerFromId("");
-
-
-            HttpHeaders httpHeaders = new HttpHeaders();
-            httpHeaders.add("tkCarRequestToken", session.getToken());
-//            httpHeaders.add("Actiontype", "000082");
-
-            StringResponse response = client.request(HttpURL.entrance, param, httpHeaders, StringResponse.class);
-
-        }
-
-
-    }
-
     /**
      * 09 交管车辆类型校验
      *
@@ -687,11 +650,14 @@ public class TKHttpAPIService {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add("tkCarRequestToken", token);
 
-        PreciseInitResult.Response response = client.request(HttpURL.preciseInit, param, httpHeaders, PreciseInitResult.Response.class);
+        StringResponse response = client.request(HttpURL.preciseInit, param, httpHeaders, StringResponse.class);
 
         checkResponseUnknownField(response);
 
-        return response.getData();
+
+        return decrypt(response, PreciseInitResult.class);
+
+
     }
 
     /**
@@ -722,11 +688,11 @@ public class TKHttpAPIService {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add("tkCarRequestToken", token);
 
-        PreciseInitResult.Response response = client.request(HttpURL.preciseInit, param, httpHeaders, PreciseInitResult.Response.class);
+        StringResponse response = client.request(HttpURL.preciseInit, param, httpHeaders, StringResponse.class);
 
         checkResponseUnknownField(response);
 
-        return response.getData();
+        return decrypt(response, PreciseInitResult.class);
     }
 
     /**

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/TKSimpleService.java

@@ -4,6 +4,7 @@ import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.commons.constants.quote.enums.quote.CarKindCode;
 import com.jzg.commons.constants.quote.enums.quote.VehicleUseCode;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.taikang.crawler.CodeUtil;
 import com.jzg.quotation.taikang.crawler.model.TKLoginSession;
@@ -413,7 +414,6 @@ public class TKSimpleService {
         List<TKCarModel> tkCarModels = CarModelinfoQueryResult.hasModel(carModelinfoQueryResult);
 
         if (tkCarModels != null) {
-//            // 第二次查车型，如果第一次没查到，使用车架号的方式
             carModelinfoQueryResult = queryCarModels(session, mainOrderId, commonCarInfoVo, area, tkCarModels, ownersInfo);
         }else {
             throw new RuntimeException("车辆信息未查询到！");
@@ -948,6 +948,11 @@ public class TKSimpleService {
         if (preciseInitResult == null) {
             throw new RuntimeException("HttpService#preciseInitToInit 失败！");
         }
+        TKOther other = preciseInitResult.getOther();
+        List<String> messageBZ = other.getMessageBZ();
+        if (messageBZ != null) {
+            throw new SystemException(messageBZ.get(0)+"\n"+ messageBZ.get(1));
+        }
 
         return preciseInitResult;
     }