核保

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

@@ -37,6 +37,7 @@ import com.jzg.quotation.summary.classifier.QuoteInfoParameterFilling;
 import com.jzg.quotation.summary.converter.QuoteInfoConverter;
 import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.jzg.quotation.summary.factory.CompanyFactory;
+import com.jzg.quotation.summary.mapper.InsOrdersCarUserInfoMapper;
 import com.jzg.quotation.summary.mapper.SysUploadFilesMapper;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
@@ -45,6 +46,7 @@ import io.minio.MinioClient;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCarUserInfoServiceImpl.java

@@ -92,6 +92,7 @@ public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUse
         return insOrdersCarUserInfoList;
     }
 
+
 //    @Override
 //    public InsOrdersCarUserInfo createUserInfo(String orderNo, CustomerInfoVo customerInfoVo, DateTimeFormatter formatter,Integer policyPersonType) {
 //        InsOrdersCarUserInfo info = new InsOrdersCarUserInfo();
@@ -122,7 +123,6 @@ public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUse
 //        }
 //        return info;
 //    }
-
     @Override
     public List<InsOrdersCarUserInfo> getByOrderId(String orderId) {
         return baseMapper.selectList(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getOrderNo, orderId));

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

@@ -11,7 +11,8 @@ import java.util.List;
 @Getter
 public class AgentFuzzyResult extends TKAgentFuzzy {
 
-    public static class Response extends BaseResponse<List<AgentFuzzyResult>> {}
-
+    public static class Response extends BaseResponse<List<AgentFuzzyResult>> {
+    }
+    private String hwpTipMessage;
 
 }

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

@@ -107,6 +107,8 @@ public class InitProposalResult extends UnknownFieldEntity {
      */
     private String issueCode;
 
+    private String tantuInsuredFlag;
+
     @Override
     protected void addChildUnknownFields() {
         addChildUnknownField("cityList", cityList);

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

@@ -1,5 +1,6 @@
 package com.jzg.quotation.taikang.crawler.model.api;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
@@ -18,32 +19,38 @@ public class PreciseInitParam extends OrderRequest {
     /**
      * 初始化标志，标识订单是否处于初始化状态
      */
+    @JsonProperty("initFlag")
     private String initFlag;
 
     /**
      * 过户信息
      */
+    @JsonProperty("chgOwnerInfo")
     private TKChgOwnerInfo chgOwnerInfo;
 
 
     /**
      * 商业评分
      */
+    @JsonProperty("businessScore")
     private String businessScore;
 
     /**
      * 商业折扣
      */
+    @JsonProperty("bzDisCount")
     private BigDecimal bzDisCount;
 
     /**
      * 商业险种信息
      */
+    @JsonProperty("bzKindVo")
     private TKBzKindVo bzKindVo;
 
     /**
      * 商业险折扣
      */
+    @JsonProperty("ciDisCount")
     private BigDecimal ciDisCount;
 
     /**
@@ -51,115 +58,138 @@ public class PreciseInitParam extends OrderRequest {
      *
      * 保费计算前，要选择投保商业险的项目，比如“车辆损失保险”、“第三者责任保险”、“车上人员责任保险（司机）”、“车上人员责任保险（乘客）”、“	附加法定节假日限额翻倍险” 等。
      */
+    @JsonProperty("ciKindsVo")
     private List<TKCiKindsVo> ciKindsVo;
 
     /**
      * 商业险佣金金额
      */
+    @JsonProperty("commissionAmountBI")
     private BigDecimal commissionAmountBI;
 
     /**
      * 商业险佣金率
      */
+    @JsonProperty("commissionRateBI")
     private BigDecimal commissionRateBI;
 
     /**
      * 佣金金额（以货币单位表示，例如元）
      */
+    @JsonProperty("commissionAmountCI")
     private BigDecimal commissionAmountCI;
 
 
     /**
      * 佣金费率（可能是调整后的费率，无单位，表示为小数，例如0.04表示4%）
      */
+    @JsonProperty("commissionRateCI")
     private BigDecimal commissionRateCI;
 
     /**
      * 日期信息
      */
+    @JsonProperty("date")
     private TKDateInfo date;
 
     /**
      * 驾驶员意外险信息
      */
+    @JsonProperty("driverAccidentVo")
     private TKDriverAccidentVo driverAccidentVo;
 
     /**
      * 预期折扣
      */
+    @JsonProperty("elr")
     private BigDecimal elr;
 
     /**
      * 整体费用折扣
      */
+    @JsonProperty("entireExpDiscount")
     private BigDecimal entireExpDiscount;
 
     /**
      * 整体推荐折扣
      */
+    @JsonProperty("entireRecommenDiscount")
     private BigDecimal entireRecommenDiscount;
 
     /**
      * 标志信息
      */
+    @JsonProperty("flag")
     private TKFlag flag;
 
     /**
      * 好开始折扣
      */
+    @JsonProperty("goodStartDiscount")
     private BigDecimal goodStartDiscount;
 
     /**
      * 其他信息
      */
+    @JsonProperty("other")
     private TKOther other;
 
     /**
      * 保费信息
      */
+    @JsonProperty("premium")
     private TKPremium premium;
 
     /**
      * 风险评分
      */
+    @JsonProperty("riskScore")
     private BigDecimal riskScore;
 
     /**
      * 增值服务
      */
+    @JsonProperty("valueAdded")
     private TKValueAdded valueAdded;
 
     /**
      * 设备列表
      */
+    @JsonProperty("deviceList")
     private List<TKDevice> deviceList;
 
     /**
      * 充电桩信息
      */
+    @JsonProperty("chargingPosts")
     private List<TKChargingPost> chargingPosts;
 
     /**
      * 风险类型
      */
+    @JsonProperty("riskType")
     private String riskType;
 
     /**
      * 车税信息
      */
+    @JsonProperty("carTax")
     private TKCarTax carTax;
     /**
      * 投保交强险信息
      */
+    @JsonProperty("carTaxInfo")
     private TKCarTaxInfo carTaxInfo;
 
     /** 投保信息 */
+    @JsonProperty("insureInfo")
     private TKInsureInfo insureInfo;
 
     /** 报价标志 */
+    @JsonProperty("quoteFlag")
     private String quoteFlag;
 
-
+    @JsonProperty("carProduct")
     private TKCarProduct carProduct;
 
 

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

@@ -19,11 +19,11 @@ import java.util.List;
 @Getter
 @Document("taikang.api.order")
 public class PreciseInitResult extends UnknownFieldEntity {
-
-    @Data
     public static final class Response extends BaseResponse<PreciseInitResult> {
-    }
 
+    }
+    @JsonProperty("insuredMemberFlag")
+    private String insuredMemberFlag;
     @Id
     private String mainOrderId;
 
@@ -171,7 +171,7 @@ public class PreciseInitResult extends UnknownFieldEntity {
      */
     private BigDecimal syclaimAdjust;
 
-    private String insuredMemberFlag;
+
 
     /**
      * 商业险类型
@@ -202,7 +202,7 @@ public class PreciseInitResult extends UnknownFieldEntity {
     @NoArgsConstructor
     @Data
     public static class ProductInfoListDTO {
-        private List<test.NonCarProductListDTO.ProductInfoListDTO.KindMapDTO> kindMap;
+        private List<KindMapDTO> kindMap;
         private String pageShowFlag;
         private String premium;
         private String productCode;

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

@@ -30,4 +30,6 @@ public class TKAgentQueryResult extends TKAgent {
      * 错误信息，如果状态码指示请求失败，则此字段可能包含具体的错误信息
      */
     private String errorMessage;
+
+    private String hwpTipMessage;
 }

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

@@ -4,14 +4,17 @@ import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Setter
 @Getter
 public class TKEntranceFor000038Param extends OrderRequest {
     /**
      * 渠道特约列表（此处为空）
      */
-    //private List<Object> channelEngages;
+    private List<Object> channelEngages;
 
+    private String collectFlag;
     /**
      * 潜在客户ID（此处为空）
      */
@@ -21,11 +24,16 @@ public class TKEntranceFor000038Param extends OrderRequest {
 
     private String readTime;
 
+
     /**
      * 注意这个不是 fromId
      */
     private String fromID;
 
+    private Integer proposalType;
+
+    private String retrospectId;
+
     public void setFromID(String fromID) {
         this.fromID = fromID;
         super.setFromId(fromID);

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

@@ -1,534 +0,0 @@
-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/service/TKHttpAPIService.java

@@ -24,9 +24,7 @@ import org.springframework.util.MultiValueMap;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Setter
 @Service
@@ -708,15 +706,18 @@ public class TKHttpAPIService {
         param.setInitFlag("vip_quote");
         param.setTplatLoginKey(tplatLoginKey);
         param.setInsureInfo(insureInfo);
+        param.setQuoteFlag("4");
 
         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();
+        PreciseInitResult decrypt = decrypt(response, PreciseInitResult.class);
+
+        return decrypt;
     }
 
     /**
@@ -843,7 +844,7 @@ public class TKHttpAPIService {
     public InitProposalResult initProposal(String token, String tplatformId, String tplatLoginKey, String orderId) {
         InitProposalParam param = new InitProposalParam();
         param.setChannelCode("OffWeb");
-        param.setOrderID(orderId);
+        param.setOrderId(orderId);
         param.setTplatformId(tplatformId);
         param.setTplatLoginKey(tplatLoginKey);
 
@@ -856,7 +857,7 @@ public class TKHttpAPIService {
 
         InitProposalResult.Response response1 = decrypt(response, InitProposalResult.Response.class);
 
-        checkResponseUnknownField(response1);
+//        checkResponseUnknownField(response1);
 
         return response1.getData();
     }
@@ -1015,7 +1016,13 @@ public class TKHttpAPIService {
         param.setTplatformId(tplatformId);
         param.setFromID(fromId);
         param.setOrderID(orderId);
-        param.setIdcardOcrFlag("0"); // todo
+        param.setIdcardOcrFlag("0");
+        param.setCollectFlag("");
+        param.setRetrospectId(UUID.randomUUID().toString());
+        param.setReadTime("");
+        param.setProposalType(2);
+        param.setLeadsid("");
+        param.setChannelEngages(new ArrayList<>());
 
         TKEntranceFor000038Result.Response response = entranceForDecrypt(token, param, "000038", TKEntranceFor000038Result.Response.class);
 

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

@@ -1140,7 +1140,7 @@ public class TKSimpleService {
             throw new RuntimeException("HttpService#preciseInitToQuote （报价）失败！");
         }
 
-        TKEntranceFor000038Result tkEntranceFor000038Result = httpService.entranceFor000038(token, tplatformId, tplatLoginKey, mainOrderId);
+        TKEntranceFor000038Result tkEntranceFor000038Result = httpService.entranceFor000038(token, tplatformId, fromId, mainOrderId);
 
         if (preciseQuoteResult == null) {
             throw new RuntimeException("HttpService#preciseQuoteResult （报价）失败！");

tenant/organization/src/main/java/com/jzg/organization/controller/UserAccountController.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.dto.AgreementAddParam;
 import com.jzg.commons.entity.dto.AmountAuditParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
+import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
@@ -14,6 +15,7 @@ import com.jzg.commons.entity.vo.UserAccountStatisVo;
 import com.jzg.organization.service.SysUserAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;