国任财险代码修改

src/main/java/com/ydtech/config/resttemplate/CustomResponseErrorHandler.java

@@ -21,6 +21,9 @@ public class CustomResponseErrorHandler implements ResponseErrorHandler {
         if (response.getStatusCode() == HttpStatus.REQUEST_TIMEOUT) {
             throw new SystemException("服务器请求超时, 请重试!");
         }
+        if (response.getStatusCode().value() > 500) {
+            throw new SystemException("远程服务器异常, 请重试!");
+        }
         throw new SystemException("请求异常" + response.getStatusText());
     }
 

src/main/java/com/ydtech/config/resttemplate/RestTemplateConfig.java

@@ -38,7 +38,7 @@ public class RestTemplateConfig {
         Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", SSLConnectionSocketFactory.getSocketFactory()).build();
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry);
         //设置整个连接池最大连接数
-        connectionManager.setMaxTotal(400);
+        connectionManager.setMaxTotal(1000);
 
         //路由是对maxTotal的细分
         connectionManager.setDefaultMaxPerRoute(100);

src/main/java/com/ydtech/modules/ins/model/guoRen/CarModelReq.java

@@ -1,10 +1,9 @@
 package com.ydtech.modules.ins.model.guoRen;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.ya.CarModel_Req;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,43 +16,70 @@ public class CarModelReq {
 
 
     @JsonProperty("codeType")
+    @JSONField(name = "codeType")
     private String codeType;
+
     @JsonProperty("validStatus")
+    @JSONField(name = "validStatus")
     private String validStatus;
+
     @JsonProperty("codeMethod")
+    @JSONField(name = "codeMethod")
     private String codeMethod;
+
     @JsonProperty("codeClass")
+    @JSONField(name = "codeClass")
     private String codeClass;
+
     @JsonProperty("codeValue")
+    @JSONField(name = "codeValue")
     private String codeValue;
+
     @JsonProperty("fieldext")
+    @JSONField(name = "fieldext")
     private String fieldext;
+
     @JsonProperty("riskCode")
+    @JSONField(name = "riskCode")
     private String riskCode;
+
     @JsonProperty("comCode")
+    @JSONField(name = "comCode")
     private String comCode;
+
     @JsonProperty("methodCode")
+    @JSONField(name = "methodCode")
     private String methodCode;
+
     @JsonProperty("reserve1")
+    @JSONField(name = "reserve1")
     private String reserve1;
+
     @JsonProperty("reserve2")
+    @JSONField(name = "reserve2")
     private String reserve2;
+
     @JsonProperty("reserve3")
+    @JSONField(name = "reserve3")
     private String reserve3;
+
     @JsonProperty("startDateBI")
+    @JSONField(name = "startDateBI")
     private String startDateBI;
+
     @JsonProperty("startDateCI")
+    @JSONField(name = "startDateCI")
     private String startDateCI;
 
 
     /**
-     *  构造车型请求参数
+     * 构造车型请求参数
      *
      * @author: lig
      * @date: 2023年08月14日 0014
      */
     @JsonIgnore
-    public static CarModelReq buildCarModelParam(CarInfoVo carInfo){
+    public static CarModelReq buildCarModelParam(CarInfoVo carInfo) {
 
         CarModelReq carModel = new CarModelReq();
         carModel.setCodeType("ModelCode");

src/main/java/com/ydtech/modules/ins/model/guoRen/CarModelResp.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.ins.model.guoRen;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,28 +16,38 @@ public class CarModelResp {
 
 
     @JsonProperty("content")
+    @JSONField(name = "content")
     private ContentDTO content;
     @JsonProperty("msg")
+    @JSONField(name = "msg")
     private String msg;
     @JsonProperty("code")
+    @JSONField(name = "code")
     private String code;
     @JsonProperty("codeType")
+    @JSONField(name = "codeType")
     private String codeType;
     @JsonProperty("codeData")
+    @JSONField(name = "codeData")
     private List<CodeDataDTO> codeData;
     @JsonProperty("list")
+    @JSONField(name = "list")
     private List<?> list;
 
     @NoArgsConstructor
     @Data
     public static class ContentDTO {
         @JsonProperty("msg")
+        @JSONField(name = "msg")
         private Object msg;
         @JsonProperty("code")
+        @JSONField(name = "code")
         private Object code;
         @JsonProperty("message")
+        @JSONField(name = "message")
         private Object message;
         @JsonProperty("messageStr")
+        @JSONField(name = "messageStr")
         private Object messageStr;
     }
 
@@ -44,150 +55,221 @@ public class CarModelResp {
     @Data
     public static class CodeDataDTO {
         @JsonProperty("codeCode")
+        @JSONField(name = "codeCode")
         private String codeCode;
         @JsonProperty("codeName")
+        @JSONField(name = "codeName")
         private String codeName;
         @JsonProperty("clausesContent")
+        @JSONField(name = "clausesContent")
         private String clausesContent;
         @JsonProperty("vehiclefgwCode")
+        @JSONField(name = "vehiclefgwCode")
         private String vehiclefgwCode;
         @JsonProperty("hfstarttime")
+        @JSONField(name = "hfstarttime")
         private String hfstarttime;
         @JsonProperty("hfendtime")
+        @JSONField(name = "hfendtime")
         private String hfendtime;
         @JsonProperty("ext")
+        @JSONField(name = "ext")
         private ExtDTO ext;
 
         @NoArgsConstructor
         @Data
         public static class ExtDTO {
             @JsonProperty("handlerCode")
+            @JSONField(name = "handlerCode")
             private Object handlerCode;
             @JsonProperty("prospectNo")
+            @JSONField(name = "prospectNo")
             private Object prospectNo;
             @JsonProperty("inteProspectNo")
+            @JSONField(name = "inteProspectNo")
             private Object inteProspectNo;
             @JsonProperty("comCode")
+            @JSONField(name = "comCode")
             private Object comCode;
             @JsonProperty("channelType")
+            @JSONField(name = "channelType")
             private Object channelType;
             @JsonProperty("organizeCode")
+            @JSONField(name = "organizeCode")
             private Object organizeCode;
             @JsonProperty("seatCount")
+            @JSONField(name = "seatCount")
             private String seatCount;
             @JsonProperty("rateTypeFlag")
+            @JSONField(name = "rateTypeFlag")
             private Object rateTypeFlag;
             @JsonProperty("calculateFlag1")
+            @JSONField(name = "calculateFlag1")
             private Object calculateFlag1;
             @JsonProperty("attachFlag")
+            @JSONField(name = "attachFlag")
             private Object attachFlag;
             @JsonProperty("userCode")
+            @JSONField(name = "userCode")
             private Object userCode;
             @JsonProperty("userName")
+            @JSONField(name = "userName")
             private Object userName;
             @JsonProperty("industry")
+            @JSONField(name = "industry")
             private Object industry;
             @JsonProperty("sonCodeCode")
+            @JSONField(name = "sonCodeCode")
             private Object sonCodeCode;
             @JsonProperty("sonCodeName")
+            @JSONField(name = "sonCodeName")
             private Object sonCodeName;
             @JsonProperty("profession")
+            @JSONField(name = "profession")
             private Object profession;
             @JsonProperty("power")
+            @JSONField(name = "power")
             private String power;
             @JsonProperty("powerLB")
+            @JSONField(name = "powerLB")
             private String powerLB;
             @JsonProperty("alarmFlag")
+            @JSONField(name = "alarmFlag")
             private Object alarmFlag;
             @JsonProperty("aliasName")
+            @JSONField(name = "aliasName")
             private Object aliasName;
             @JsonProperty("brandCode")
+            @JSONField(name = "brandCode")
             private Object brandCode;
             @JsonProperty("carbrand")
+            @JSONField(name = "carbrand")
             private String carbrand;
             @JsonProperty("carkind")
+            @JSONField(name = "carkind")
             private String carkind;
             @JsonProperty("carseriesCode")
+            @JSONField(name = "carseriesCode")
             private Object carseriesCode;
             @JsonProperty("carSeriesName")
+            @JSONField(name = "carSeriesName")
             private Object carSeriesName;
             @JsonProperty("carstyle")
+            @JSONField(name = "carstyle")
             private String carstyle;
             @JsonProperty("caryear")
+            @JSONField(name = "caryear")
             private Object caryear;
             @JsonProperty("coefficient1")
+            @JSONField(name = "coefficient1")
             private Object coefficient1;
             @JsonProperty("coefficient2")
+            @JSONField(name = "coefficient2")
             private Object coefficient2;
             @JsonProperty("completekerbmass")
+            @JSONField(name = "completekerbmass")
             private Integer completekerbmass;
             @JsonProperty("completekerbmassMin")
+            @JSONField(name = "completekerbmassMin")
             private Object completekerbmassMin;
             @JsonProperty("countryCode")
+            @JSONField(name = "countryCode")
             private Object countryCode;
             @JsonProperty("exhaustScale")
+            @JSONField(name = "exhaustScale")
             private Double exhaustScale;
             @JsonProperty("exhaustScalelb")
+            @JSONField(name = "exhaustScalelb")
             private String exhaustScalelb;
             @JsonProperty("factory")
+            @JSONField(name = "factory")
             private String factory;
             @JsonProperty("familyCode")
+            @JSONField(name = "familyCode")
             private Object familyCode;
             @JsonProperty("flag")
+            @JSONField(name = "flag")
             private Object flag;
             @JsonProperty("importFlag")
+            @JSONField(name = "importFlag")
             private Object importFlag;
             @JsonProperty("jqxclassName")
+            @JSONField(name = "jqxclassName")
             private Object jqxclassName;
             @JsonProperty("kindredPrice")
+            @JSONField(name = "kindredPrice")
             private Object kindredPrice;
             @JsonProperty("kindredPriceTax")
+            @JSONField(name = "kindredPriceTax")
             private Object kindredPriceTax;
             @JsonProperty("modelCode")
+            @JSONField(name = "modelCode")
             private Object modelCode;
             @JsonProperty("modelName")
+            @JSONField(name = "modelName")
             private Object modelName;
             @JsonProperty("newfuelModel")
+            @JSONField(name = "newfuelModel")
             private String newfuelModel;
             @JsonProperty("purchasePrice")
+            @JSONField(name = "purchasePrice")
             private String purchasePrice;
             @JsonProperty("purchasePricelb")
+            @JSONField(name = "purchasePricelb")
             private Double purchasePricelb;
             @JsonProperty("purchasePriceother")
+            @JSONField(name = "purchasePriceother")
             private Object purchasePriceother;
             @JsonProperty("purchasePricesz")
+            @JSONField(name = "purchasePricesz")
             private Object purchasePricesz;
             @JsonProperty("remark")
+            @JSONField(name = "remark")
             private Object remark;
             @JsonProperty("riskScope")
+            @JSONField(name = "riskScope")
             private Object riskScope;
             @JsonProperty("seatCountlb")
+            @JSONField(name = "seatCountlb")
             private Integer seatCountlb;
             @JsonProperty("seatMax")
+            @JSONField(name = "seatMax")
             private Object seatMax;
             @JsonProperty("seatMin")
+            @JSONField(name = "seatMin")
             private Object seatMin;
             @JsonProperty("shorthandCode")
+            @JSONField(name = "shorthandCode")
             private Object shorthandCode;
             @JsonProperty("stopFlag")
+            @JSONField(name = "stopFlag")
             private Object stopFlag;
             @JsonProperty("sumTon")
+            @JSONField(name = "sumTon")
             private Object sumTon;
             @JsonProperty("syxClassName")
+            @JSONField(name = "syxClassName")
             private Object syxClassName;
             @JsonProperty("tonCount")
+            @JSONField(name = "tonCount")
             private String tonCount;
             @JsonProperty("tonCountlb")
+            @JSONField(name = "tonCountlb")
             private String tonCountlb;
             @JsonProperty("transMissionType")
+            @JSONField(name = "transMissionType")
             private Object transMissionType;
             @JsonProperty("validDate")
+            @JSONField(name = "validDate")
             private Object validDate;
             @JsonProperty("validStatus")
+            @JSONField(name = "validStatus")
             private Object validStatus;
             @JsonProperty("vehiclealias")
+            @JSONField(name = "vehiclealias")
             private Object vehiclealias;
             @JsonProperty("vehiclefgwCode")
+            @JSONField(name = "vehiclefgwCode")
             private Object vehiclefgwCode;
         }
     }

src/main/java/com/ydtech/modules/ins/model/guoRen/CarPriceListResp.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.ins.model.guoRen;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,160 +13,234 @@ public class CarPriceListResp {
 
 
     @JsonProperty("resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
     @JsonProperty("resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
     @JsonProperty("data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
         @JsonProperty("cars")
+        @JSONField(name = "cars")
         private List<CarsDTO> cars;
         @JsonProperty("inputvo")
+        @JSONField(name = "inputvo")
         private String inputvo;
 
         @NoArgsConstructor
         @Data
         public static class CarsDTO {
             @JsonProperty("startDateBI")
+            @JSONField(name = "startDateBI")
             private String startDateBI;
             @JsonProperty("currentDate")
+            @JSONField(name = "currentDate")
             private String currentDate;
             @JsonProperty("clauseTypeBI")
+            @JSONField(name = "clauseTypeBI")
             private String clauseTypeBI;
             @JsonProperty("businessNatureFlag")
+            @JSONField(name = "businessNatureFlag")
             private String businessNatureFlag;
             @JsonProperty("searchSequenceNo")
+            @JSONField(name = "searchSequenceNo")
             private String searchSequenceNo;
             @JsonProperty("actualValue")
+            @JSONField(name = "actualValue")
             private String actualValue;
             @JsonProperty("compromisePrice")
+            @JSONField(name = "compromisePrice")
             private String compromisePrice;
             @JsonProperty("noticeType")
+            @JSONField(name = "noticeType")
             private String noticeType;
             @JsonProperty("countryNature")
+            @JSONField(name = "countryNature")
             private String countryNature;
             @JsonProperty("pureRiskPremiumFlag")
+            @JSONField(name = "pureRiskPremiumFlag")
             private String pureRiskPremiumFlag;
             @JsonProperty("carName")
+            @JSONField(name = "carName")
             private String carName;
             @JsonProperty("pureRiskPremium")
+            @JSONField(name = "pureRiskPremium")
             private String pureRiskPremium;
             @JsonProperty("totalVehicleWeight")
+            @JSONField(name = "totalVehicleWeight")
             private String totalVehicleWeight;
             @JsonProperty("carBrand")
+            @JSONField(name = "carBrand")
             private String carBrand;
             @JsonProperty("derailleurType")
+            @JSONField(name = "derailleurType")
             private String derailleurType;
             @JsonProperty("modelName")
+            @JSONField(name = "modelName")
             private String modelName;
             @JsonProperty("tonCount")
+            @JSONField(name = "tonCount")
             private String tonCount;
             @JsonProperty("modelDesc")
+            @JSONField(name = "modelDesc")
             private String modelDesc;
             @JsonProperty("riskFlag")
+            @JSONField(name = "riskFlag")
             private String riskFlag;
             @JsonProperty("carSeriesName")
+            @JSONField(name = "carSeriesName")
             private String carSeriesName;
             @JsonProperty("modelCode")
+            @JSONField(name = "modelCode")
             private String modelCode;
             @JsonProperty("printBrandName")
+            @JSONField(name = "printBrandName")
             private String printBrandName;
             @JsonProperty("makeDate")
+            @JSONField(name = "makeDate")
             private String makeDate;
             @JsonProperty("vehicleBrand")
+            @JSONField(name = "vehicleBrand")
             private String vehicleBrand;
             @JsonProperty("licenseCategory")
+            @JSONField(name = "licenseCategory")
             private String licenseCategory;
             @JsonProperty("licenseNo")
+            @JSONField(name = "licenseNo")
             private String licenseNo;
             @JsonProperty("licenseKindCode")
+            @JSONField(name = "licenseKindCode")
             private String licenseKindCode;
             @JsonProperty("frameNo")
+            @JSONField(name = "frameNo")
             private String frameNo;
             @JsonProperty("carOwner")
+            @JSONField(name = "carOwner")
             private String carOwner;
             @JsonProperty("purchasePriceSign")
+            @JSONField(name = "purchasePriceSign")
             private String purchasePriceSign;
             @JsonProperty("fuelType")
+            @JSONField(name = "fuelType")
             private String fuelType;
             @JsonProperty("carVhicleModel")
+            @JSONField(name = "carVhicleModel")
             private String carVhicleModel;
             @JsonProperty("modelCodeGX")
+            @JSONField(name = "modelCodeGX")
             private String modelCodeGX;
             @JsonProperty("oldModelCode")
+            @JSONField(name = "oldModelCode")
             private String oldModelCode;
             @JsonProperty("bjTradeName")
+            @JSONField(name = "bjTradeName")
             private String bjTradeName;
             @JsonProperty("bjBrand")
+            @JSONField(name = "bjBrand")
             private String bjBrand;
             @JsonProperty("bjSeries")
+            @JSONField(name = "bjSeries")
             private String bjSeries;
             @JsonProperty("bjCarName")
+            @JSONField(name = "bjCarName")
             private String bjCarName;
             @JsonProperty("bjNoticeType")
+            @JSONField(name = "bjNoticeType")
             private String bjNoticeType;
             @JsonProperty("bjCategoryName")
+            @JSONField(name = "bjCategoryName")
             private String bjCategoryName;
             @JsonProperty("bjDeptName")
+            @JSONField(name = "bjDeptName")
             private String bjDeptName;
             @JsonProperty("bjPureRiskPremium")
+            @JSONField(name = "bjPureRiskPremium")
             private String bjPureRiskPremium;
             @JsonProperty("brandName")
+            @JSONField(name = "brandName")
             private String brandName;
             @JsonProperty("seatCountLB")
+            @JSONField(name = "seatCountLB")
             private String seatCountLB;
             @JsonProperty("exhaustScale")
+            @JSONField(name = "exhaustScale")
             private String exhaustScale;
             @JsonProperty("exhaustScaleLB")
+            @JSONField(name = "exhaustScaleLB")
             private String exhaustScaleLB;
             @JsonProperty("tonCountLB")
+            @JSONField(name = "tonCountLB")
             private String tonCountLB;
             @JsonProperty("purchasePriceLB")
+            @JSONField(name = "purchasePriceLB")
             private String purchasePriceLB;
             @JsonProperty("purchasePriceOrigin")
+            @JSONField(name = "purchasePriceOrigin")
             private String purchasePriceOrigin;
             @JsonProperty("purchasePriceNoTaxFlag")
+            @JSONField(name = "purchasePriceNoTaxFlag")
             private String purchasePriceNoTaxFlag;
             @JsonProperty("completeKerbMassNew")
+            @JSONField(name = "completeKerbMassNew")
             private String completeKerbMassNew;
             @JsonProperty("aliasName")
+            @JSONField(name = "aliasName")
             private String aliasName;
             @JsonProperty("carYear")
+            @JSONField(name = "carYear")
             private String carYear;
             @JsonProperty("purchasePriceNotax")
+            @JSONField(name = "purchasePriceNotax")
             private String purchasePriceNotax;
             @JsonProperty("kindredPriceNotax")
+            @JSONField(name = "kindredPriceNotax")
             private String kindredPriceNotax;
             @JsonProperty("kindredPrice")
+            @JSONField(name = "kindredPrice")
             private String kindredPrice;
             @JsonProperty("remark")
+            @JSONField(name = "remark")
             private String remark;
             @JsonProperty("alarmFlag")
+            @JSONField(name = "alarmFlag")
             private String alarmFlag;
             @JsonProperty("carStyle")
+            @JSONField(name = "carStyle")
             private String carStyle;
             @JsonProperty("shTradeName")
+            @JSONField(name = "shTradeName")
             private String shTradeName;
             @JsonProperty("shSeries")
+            @JSONField(name = "shSeries")
             private String shSeries;
             @JsonProperty("shCarName")
+            @JSONField(name = "shCarName")
             private String shCarName;
             @JsonProperty("shCategoryName")
+            @JSONField(name = "shCategoryName")
             private String shCategoryName;
             @JsonProperty("shDeptName")
+            @JSONField(name = "shDeptName")
             private String shDeptName;
             @JsonProperty("shPureRiskPremium")
+            @JSONField(name = "shPureRiskPremium")
             private String shPureRiskPremium;
             @JsonProperty("completeKerbMass")
+            @JSONField(name = "completeKerbMass")
             private String completeKerbMass;
             @JsonProperty("errorCode")
+            @JSONField(name = "errorCode")
             private String errorCode;
             @JsonProperty("errorMessage")
+            @JSONField(name = "errorMessage")
             private String errorMessage;
             @JsonProperty("engineNo")
+            @JSONField(name = "engineNo")
             private String engineNo;
         }
     }

src/main/java/com/ydtech/modules/ins/model/guoRen/CarPriceMuchReq.java

@@ -2,12 +2,11 @@ package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- *  车价查询多条  请求
+ * 车价查询多条  请求
  *
  * @author: lig
  * @date: 2023年10月18日 0018
@@ -18,10 +17,12 @@ public class CarPriceMuchReq {
 
 
     //车价查询返回inputvo
-    @JSONField(name="uuid")
+    @JsonProperty(value = "uuid")
+    @JSONField(name = "uuid")
     private String uuid;
 
-    @JSONField(name ="carPriceQueryRespVo")
+    @JsonProperty(value = "carPriceQueryRespVo")
+    @JSONField(name = "carPriceQueryRespVo")
     private CarPriceMuchResp.DataDTO.CarsDTO carPriceMuchResp;
 
 

src/main/java/com/ydtech/modules/ins/model/guoRen/CarPriceMuchResp.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.ins.model.guoRen;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.List;
 
 /**
- *  车价 响应  多条
+ * 车价 响应  多条
  *
  * @author: lig
  * @date: 2023年10月17日 0017
@@ -15,168 +16,238 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class CarPriceMuchResp {
-    @JsonProperty("resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JsonProperty("resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JsonProperty("data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JsonProperty("cars")
+        @JsonProperty(value = "cars")
+        @JSONField(name = "cars")
         private List<CarsDTO> cars;
-        @JsonProperty("inputvo")
+        @JsonProperty(value = "inputvo")
+        @JSONField(name = "inputvo")
         private String inputvo;
 
         @NoArgsConstructor
         @Data
         public static class CarsDTO {
-            @JsonProperty("startDateBI")
+            @JsonProperty(value = "startDateBI")
+            @JSONField(name = "startDateBI")
             private String startDateBI;
-            @JsonProperty("currentDate")
+            @JsonProperty(value = "currentDate")
+            @JSONField(name = "currentDate")
             private String currentDate;
-            @JsonProperty("clauseTypeBI")
+            @JsonProperty(value = "clauseTypeBI")
+            @JSONField(name = "clauseTypeBI")
             private String clauseTypeBI;
-            @JsonProperty("businessNatureFlag")
+            @JsonProperty(value = "businessNatureFlag")
+            @JSONField(name = "businessNatureFlag")
             private String businessNatureFlag;
-            @JsonProperty("searchSequenceNo")
+            @JsonProperty(value = "searchSequenceNo")
+            @JSONField(name = "searchSequenceNo")
             private String searchSequenceNo;
-            @JsonProperty("actualValue")
+            @JsonProperty(value = "actualValue")
+            @JSONField(name = "actualValue")
             private String actualValue;
-            @JsonProperty("compromisePrice")
+            @JsonProperty(value = "compromisePrice")
+            @JSONField(name = "compromisePrice")
             private String compromisePrice;
-            @JsonProperty("noticeType")
+            @JsonProperty(value = "noticeType")
+            @JSONField(name = "noticeType")
             private String noticeType;
-            @JsonProperty("countryNature")
+            @JsonProperty(value = "countryNature")
+            @JSONField(name = "countryNature")
             private String countryNature;
-            @JsonProperty("pureRiskPremiumFlag")
+            @JsonProperty(value = "pureRiskPremiumFlag")
+            @JSONField(name = "pureRiskPremiumFlag")
             private String pureRiskPremiumFlag;
-            @JsonProperty("carName")
+            @JsonProperty(value = "carName")
+            @JSONField(name = "carName")
             private String carName;
-            @JsonProperty("pureRiskPremium")
+            @JsonProperty(value = "pureRiskPremium")
+            @JSONField(name = "pureRiskPremium")
             private String pureRiskPremium;
-            @JsonProperty("totalVehicleWeight")
+            @JsonProperty(value = "totalVehicleWeight")
+            @JSONField(name = "totalVehicleWeight")
             private String totalVehicleWeight;
-            @JsonProperty("carBrand")
+            @JsonProperty(value = "carBrand")
+            @JSONField(name = "carBrand")
             private String carBrand;
-            @JsonProperty("derailleurType")
+            @JsonProperty(value = "derailleurType")
+            @JSONField(name = "derailleurType")
             private String derailleurType;
-            @JsonProperty("modelName")
+            @JsonProperty(value = "modelName")
+            @JSONField(name = "modelName")
             private String modelName;
-            @JsonProperty("tonCount")
+            @JsonProperty(value = "tonCount")
+            @JSONField(name = "tonCount")
             private String tonCount;
-            @JsonProperty("modelDesc")
+            @JsonProperty(value = "modelDesc")
+            @JSONField(name = "modelDesc")
             private String modelDesc;
-            @JsonProperty("riskFlag")
+            @JsonProperty(value = "riskFlag")
+            @JSONField(name = "riskFlag")
             private String riskFlag;
-            @JsonProperty("carSeriesName")
+            @JsonProperty(value = "carSeriesName")
+            @JSONField(name = "carSeriesName")
             private String carSeriesName;
-            @JsonProperty("modelCode")
+            @JsonProperty(value = "modelCode")
+            @JSONField(name = "modelCode")
             private String modelCode;
-            @JsonProperty("printBrandName")
+            @JsonProperty(value = "printBrandName")
+            @JSONField(name = "printBrandName")
             private String printBrandName;
-            @JsonProperty("makeDate")
+            @JsonProperty(value = "makeDate")
+            @JSONField(name = "makeDate")
             private String makeDate;
-            @JsonProperty("vehicleBrand")
+            @JsonProperty(value = "vehicleBrand")
+            @JSONField(name = "vehicleBrand")
             private String vehicleBrand;
-            @JsonProperty("licenseCategory")
+            @JsonProperty(value = "licenseCategory")
+            @JSONField(name = "licenseCategory")
             private String licenseCategory;
-            @JsonProperty("licenseNo")
+            @JsonProperty(value = "licenseNo")
+            @JSONField(name = "licenseNo")
             private String licenseNo;
-            @JsonProperty("licenseKindCode")
+            @JsonProperty(value = "licenseKindCode")
+            @JSONField(name = "licenseKindCode")
             private String licenseKindCode;
-            @JsonProperty("frameNo")
+            @JsonProperty(value = "frameNo")
+            @JSONField(name = "frameNo")
             private String frameNo;
-            @JsonProperty("carOwner")
+            @JsonProperty(value = "carOwner")
+            @JSONField(name = "carOwner")
             private String carOwner;
-            @JsonProperty("purchasePriceSign")
+            @JsonProperty(value = "purchasePriceSign")
+            @JSONField(name = "purchasePriceSign")
             private String purchasePriceSign;
-            @JsonProperty("fuelType")
+            @JsonProperty(value = "fuelType")
+            @JSONField(name = "fuelType")
             private String fuelType;
-            @JsonProperty("carVhicleModel")
+            @JsonProperty(value = "carVhicleModel")
+            @JSONField(name = "carVhicleModel")
             private String carVhicleModel;
-            @JsonProperty("modelCodeGX")
+            @JsonProperty(value = "modelCodeGX")
+            @JSONField(name = "modelCodeGX")
             private String modelCodeGX;
-            @JsonProperty("oldModelCode")
+            @JsonProperty(value = "oldModelCode")
+            @JSONField(name = "oldModelCode")
             private String oldModelCode;
-            @JsonProperty("bjTradeName")
+            @JsonProperty(value = "bjTradeName")
+            @JSONField(name = "bjTradeName")
             private String bjTradeName;
-            @JsonProperty("bjBrand")
+            @JsonProperty(value = "bjBrand")
+            @JSONField(name = "bjBrand")
             private String bjBrand;
-            @JsonProperty("bjSeries")
+            @JsonProperty(value = "bjSeries")
+            @JSONField(name = "bjSeries")
             private String bjSeries;
-            @JsonProperty("bjCarName")
+            @JsonProperty(value = "bjCarName")
+            @JSONField(name = "bjCarName")
             private String bjCarName;
-            @JsonProperty("bjNoticeType")
+            @JsonProperty(value = "bjNoticeType")
+            @JSONField(name = "bjNoticeType")
             private String bjNoticeType;
-            @JsonProperty("bjCategoryName")
+            @JsonProperty(value = "bjCategoryName")
+            @JSONField(name = "bjCategoryName")
             private String bjCategoryName;
-            @JsonProperty("bjDeptName")
+            @JsonProperty(value = "bjDeptName")
+            @JSONField(name = "bjDeptName")
             private String bjDeptName;
-            @JsonProperty("bjPureRiskPremium")
+            @JsonProperty(value = "bjPureRiskPremium")
+            @JSONField(name = "bjPureRiskPremium")
             private String bjPureRiskPremium;
-            @JsonProperty("brandName")
+            @JsonProperty(value = "brandName")
+            @JSONField(name = "brandName")
             private String brandName;
-            @JsonProperty("seatCountLB")
+            @JsonProperty(value = "seatCountLB")
+            @JSONField(name = "seatCountLB")
             private String seatCountLB;
-            @JsonProperty("exhaustScale")
+            @JsonProperty(value = "exhaustScale")
+            @JSONField(name = "exhaustScale")
             private String exhaustScale;
-            @JsonProperty("exhaustScaleLB")
+            @JsonProperty(value = "exhaustScaleLB")
+            @JSONField(name = "exhaustScaleLB")
             private String exhaustScaleLB;
-            @JsonProperty("tonCountLB")
+            @JsonProperty(value = "tonCountLB")
+            @JSONField(name = "tonCountLB")
             private String tonCountLB;
-            @JsonProperty("purchasePriceLB")
+            @JsonProperty(value = "purchasePriceLB")
+            @JSONField(name = "purchasePriceLB")
             private String purchasePriceLB;
-            @JsonProperty("purchasePriceOrigin")
+            @JsonProperty(value = "purchasePriceOrigin")
+            @JSONField(name = "purchasePriceOrigin")
             private String purchasePriceOrigin;
-            @JsonProperty("purchasePriceNoTaxFlag")
+            @JsonProperty(value = "purchasePriceNoTaxFlag")
+            @JSONField(name = "purchasePriceNoTaxFlag")
             private String purchasePriceNoTaxFlag;
-            @JsonProperty("completeKerbMassNew")
+            @JsonProperty(value = "completeKerbMassNew")
+            @JSONField(name = "completeKerbMassNew")
             private String completeKerbMassNew;
-            @JsonProperty("aliasName")
+            @JsonProperty(value = "aliasName")
+            @JSONField(name = "aliasName")
             private String aliasName;
-            @JsonProperty("carYear")
+            @JsonProperty(value = "carYear")
+            @JSONField(name = "carYear")
             private String carYear;
-            @JsonProperty("purchasePriceNotax")
+            @JsonProperty(value = "purchasePriceNotax")
+            @JSONField(name = "purchasePriceNotax")
             private String purchasePriceNotax;
-            @JsonProperty("kindredPriceNotax")
+            @JsonProperty(value = "kindredPriceNotax")
+            @JSONField(name = "kindredPriceNotax")
             private String kindredPriceNotax;
-            @JsonProperty("kindredPrice")
+            @JsonProperty(value = "kindredPrice")
+            @JSONField(name = "kindredPrice")
             private String kindredPrice;
-            @JsonProperty("remark")
+            @JsonProperty(value = "remark")
+            @JSONField(name = "remark")
             private String remark;
-            @JsonProperty("alarmFlag")
+            @JsonProperty(value = "alarmFlag")
+            @JSONField(name = "alarmFlag")
             private String alarmFlag;
-            @JsonProperty("carStyle")
+            @JsonProperty(value = "carStyle")
+            @JSONField(name = "carStyle")
             private String carStyle;
-            @JsonProperty("shTradeName")
+            @JsonProperty(value = "shTradeName")
+            @JSONField(name = "shTradeName")
             private String shTradeName;
-            @JsonProperty("shSeries")
+            @JsonProperty(value = "shSeries")
+            @JSONField(name = "shSeries")
             private String shSeries;
-            @JsonProperty("shCarName")
+            @JsonProperty(value = "shCarName")
+            @JSONField(name = "shCarName")
             private String shCarName;
-            @JsonProperty("shCategoryName")
+            @JsonProperty(value = "shCategoryName")
+            @JSONField(name = "shCategoryName")
             private String shCategoryName;
-            @JsonProperty("shDeptName")
+            @JsonProperty(value = "shDeptName")
+            @JSONField(name = "shDeptName")
             private String shDeptName;
-            @JsonProperty("shPureRiskPremium")
+            @JsonProperty(value = "shPureRiskPremium")
+            @JSONField(name = "shPureRiskPremium")
             private String shPureRiskPremium;
-            @JsonProperty("completeKerbMass")
+            @JsonProperty(value = "completeKerbMass")
+            @JSONField(name = "completeKerbMass")
             private String completeKerbMass;
-            @JsonProperty("errorCode")
+            @JsonProperty(value = "errorCode")
+            @JSONField(name = "errorCode")
             private String errorCode;
-            @JsonProperty("errorMessage")
+            @JsonProperty(value = "errorMessage")
+            @JSONField(name = "errorMessage")
             private String errorMessage;
-            @JsonProperty("engineNo")
+            @JsonProperty(value = "engineNo")
+            @JSONField(name = "engineNo")
             private String engineNo;
         }
     }
 
 
-
-
-
-
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/CarPriceReq.java

@@ -21,239 +21,19 @@ import java.util.List;
 public class CarPriceReq {
 
 
-    @JsonProperty("bc")
+    @JsonProperty(value = "bc")
+    @JSONField(name = "bc")
     private BcDTO bc;
-    @JsonProperty("basePartVo")
+    @JsonProperty(value = "basePartVo")
+    @JSONField(name = "basePartVo")
     private BasePartVoDTO basePartVo;
-    @JsonProperty("bi")
+    @JsonProperty(value = "bi")
+    @JSONField(name = "bi")
     private BiDTO bi;
-    @JsonProperty("ci")
+    @JsonProperty(value = "ci")
+    @JSONField(name = "ci")
     private CiDTO ci;
 
-    @NoArgsConstructor
-    @Data
-    public static class BcDTO {
-        @JsonProperty("prpTitemCar")
-        private PrpTitemCarDTO prpTitemCar;
-        @JsonProperty("loginComCode")
-        private String loginComCode;
-        @JsonProperty("prpTmain")
-        private PrpTmainDTO prpTmain;
-        @JsonProperty("feeandDiscountFlag")
-        private String feeandDiscountFlag;
-        @JsonProperty("riskCode")
-        private String riskCode;
-        @JsonProperty("agriFlagBC")
-        private String agriFlagBC;
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTitemCarDTO {
-            @JsonProperty("frameNo")
-            private String frameNo;
-            @JsonProperty("licenseNo")
-            private String licenseNo;
-            @JsonProperty("newEnergyFlag")
-            private String newEnergyFlag;
-            @JsonProperty("exhaustScalelb")
-            private String exhaustScalelb;
-            @JsonProperty("tonCount")
-            private String tonCount;
-            @JsonProperty("newCarFlag")
-            private String newCarFlag;
-            @JsonProperty("licenseKindCode")
-            private String licenseKindCode;
-            @JsonProperty("purchasePrice")
-            private String purchasePrice;
-            @JsonProperty("clauseType")
-            private String clauseType;
-            @JsonProperty("vinNo")
-            private String vinNo;
-            @JsonProperty("vehicleBrand")
-            private String vehicleBrand;
-            @JsonProperty("carOwner")
-            private String carOwner;
-            @JsonProperty("modelCode")
-            private String modelCode;
-            @JsonProperty("exhaustScale")
-            private String exhaustScale;
-            @JsonProperty("completeKerbMass")
-            private String completeKerbMass;
-            @JsonProperty("loanVehicleFlag")
-            private String loanVehicleFlag;
-            @JsonProperty("chgOwnerFlag")
-            private String chgOwnerFlag;
-            @JsonProperty("carOwnerIdentifyNumber")
-            private String carOwnerIdentifyNumber;
-            @JsonProperty("productType")
-            private String productType;
-            @JsonProperty("brandCode")
-            private String brandCode;
-            @JsonProperty("chgOwnerDate")
-            private String chgOwnerDate;
-            @JsonProperty("clauseTypeSystem")
-            private String clauseTypeSystem;
-            @JsonProperty("engineNo")
-            private String engineNo;
-            @JsonProperty("brandName")
-            private String brandName;
-            @JsonProperty("certifiCateDate")
-            private String certifiCateDate;
-            @JsonProperty("useNatureCode")
-            private String useNatureCode;
-            @JsonProperty("enrollDate")
-            private String enrollDate;
-            @JsonProperty("seatCount")
-            private String seatCount;
-            @JsonProperty("carOwnerIdentifyType")
-            private String carOwnerIdentifyType;
-            @JsonProperty("carOwnerNature")
-            private String carOwnerNature;
-            @JsonProperty("modelName")
-            private String modelName;
-            @JsonProperty("fuelType")
-            private String fuelType;
-            @JsonProperty("termsSystem")
-            private String termsSystem;
-            @JsonProperty("tonCountlb")
-            private String tonCountlb;
-            @JsonProperty("newFuelModel")
-            private String newFuelModel;
-            @JsonProperty("vinClick")
-            private String vinClick;
-            @JsonProperty("maincarKindCode")
-            private String maincarKindCode;
-
-            //车主证件有效期起期
-//            @JsonProperty("IDValidStartDate")
-            @JSONField(name = "IDValidStartDate")
-            private String IDValidStartDate;
-            //车主证件有效期止期
-            @JsonProperty("idValidDate")
-            private String idValidDate;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainDTO {
-            //代理人代码
-            @JsonProperty("agentCode")
-            private String agentCode;
-            //代理协议
-            @JsonProperty("agreementNo")
-            private String agreementNo;
-            @JsonProperty("unitmainTenanceType2Name")
-            private String unitmainTenanceType2Name;
-            @JsonProperty("channeltypeone")
-            private String channeltypeone;
-            @JsonProperty("argueSolution")
-            private String argueSolution;
-            @JsonProperty("handler1Name")
-            private String handler1Name;
-            @JsonProperty("channeltypetwo")
-            private String channeltypetwo;
-            @JsonProperty("agentName")
-            private String agentName;
-            @JsonProperty("unitMaintenanceName")
-            private String unitMaintenanceName;
-            @JsonProperty("businessNature")
-            private String businessNature;
-            @JsonProperty("activityPlan")
-            private String activityPlan;
-            @JsonProperty("signDate")
-            private String signDate;
-            @JsonProperty("handlerCode")
-            private String handlerCode;
-            @JsonProperty("channeltypeoneName")
-            private String channeltypeoneName;
-            @JsonProperty("unitMaintenanceCode")
-            private String unitMaintenanceCode;
-            @JsonProperty("unitmainTenanceType1")
-            private String unitmainTenanceType1;
-            @JsonProperty("unitmainTenanceType2")
-            private String unitmainTenanceType2;
-            @JsonProperty("channeltypetwoName")
-            private String channeltypetwoName;
-            @JsonProperty("handler1Code")
-            private String handler1Code;
-            @JsonProperty("comName")
-            private String comName;
-            @JsonProperty("comCode")
-            private String comCode;
-            @JsonProperty("operateDate")
-            private String operateDate;
-            @JsonProperty("startDate")
-            private String startDate;
-            @JsonProperty("eProposalFlag")
-            private String eProposalFlag;
-            @JsonProperty("business")
-            private String business;
-        }
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class BasePartVoDTO {
-
-        /**
-         * 编辑类型
-         *  投保单录入 EditType_ProposalInput
-         * 投保单修改
-         * EditType_ProposalModify
-         */
-        @JsonProperty("editType")
-        private String editType;
-
-        /**
-         * 输入类型
-         * 34-同保
-         *
-         */
-        @JsonProperty("inputType")
-        private String inputType;
-
-        /**
-         * 登录机构
-         *
-         */
-        @JsonProperty("loginComCode")
-        private String loginComCode;
-
-        /**
-         * 登录机构地区编码
-         * 取登录机构前两位
-         *
-         */
-        @JsonProperty("loginComCodeSub")
-        private String loginComCodeSub;
-
-        /**
-         * 险种代码
-         * 0500同保
-         *
-         */
-        @JsonProperty("loginRiskCode")
-        private String loginRiskCode;
-
-        /**
-         * 业务员代码
-         *
-         */
-        @JsonProperty("userCode")
-        private String userCode;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class BiDTO {
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class CiDTO {
-    }
-
-
     @JsonIgnore
     public static CarPriceReq buildCarPriceParam(BaseQuoteInfoVo yaQuoteInfoVo, VinQueryResp.DataDTO vinQ, ChannelInfoDto channelInfo) {
         CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
@@ -322,7 +102,6 @@ public class CarPriceReq {
         prpTmain.setChanneltypetwo(channelInfo.getChannelTypeTwo());
 
 
-
         /**
          *  车辆信息====================
          */
@@ -409,18 +188,15 @@ public class CarPriceReq {
         bc.setAgriFlagBC("0");
 
 
-
         BasePartVoDTO basePartVo = new BasePartVoDTO();
         basePartVo.setEditType("EditType_ProposalInput");
         basePartVo.setInputType("34");
         basePartVo.setLoginComCode(channelInfo.getComCode());
-        basePartVo.setLoginComCodeSub(channelInfo.getComCode().substring(0,2));
+        basePartVo.setLoginComCodeSub(channelInfo.getComCode().substring(0, 2));
 //        basePartVo.setLoginRiskCode("0500");
         basePartVo.setUserCode(channelInfo.getAgentCode());
 
 
-
-
         req.setBi(new BiDTO());
         req.setCi(new CiDTO());
 
@@ -430,6 +206,300 @@ public class CarPriceReq {
 
     }
 
+    @NoArgsConstructor
+    @Data
+    public static class BcDTO {
+        @JsonProperty(value = "prpTitemCar")
+        @JSONField(name = "prpTitemCar")
+        private PrpTitemCarDTO prpTitemCar;
+        @JsonProperty(value = "loginComCode")
+        @JSONField(name = "loginComCode")
+        private String loginComCode;
+        @JsonProperty(value = "prpTmain")
+        @JSONField(name = "prpTmain")
+        private PrpTmainDTO prpTmain;
+        @JsonProperty(value = "feeandDiscountFlag")
+        @JSONField(name = "feeandDiscountFlag")
+        private String feeandDiscountFlag;
+        @JsonProperty(value = "riskCode")
+        @JSONField(name = "riskCode")
+        private String riskCode;
+        @JsonProperty(value = "agriFlagBC")
+        @JSONField(name = "agriFlagBC")
+        private String agriFlagBC;
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTitemCarDTO {
+            @JsonProperty(value = "frameNo")
+            @JSONField(name = "frameNo")
+            private String frameNo;
+            @JsonProperty(value = "licenseNo")
+            @JSONField(name = "licenseNo")
+            private String licenseNo;
+            @JsonProperty(value = "newEnergyFlag")
+            @JSONField(name = "newEnergyFlag")
+            private String newEnergyFlag;
+            @JsonProperty(value = "exhaustScalelb")
+            @JSONField(name = "exhaustScalelb")
+            private String exhaustScalelb;
+            @JsonProperty(value = "tonCount")
+            @JSONField(name = "tonCount")
+            private String tonCount;
+            @JsonProperty(value = "newCarFlag")
+            @JSONField(name = "newCarFlag")
+            private String newCarFlag;
+            @JsonProperty(value = "licenseKindCode")
+            @JSONField(name = "licenseKindCode")
+            private String licenseKindCode;
+            @JsonProperty(value = "purchasePrice")
+            @JSONField(name = "purchasePrice")
+            private String purchasePrice;
+            @JsonProperty(value = "clauseType")
+            @JSONField(name = "clauseType")
+            private String clauseType;
+            @JsonProperty(value = "vinNo")
+            @JSONField(name = "vinNo")
+            private String vinNo;
+            @JsonProperty(value = "vehicleBrand")
+            @JSONField(name = "vehicleBrand")
+            private String vehicleBrand;
+            @JsonProperty(value = "carOwner")
+            @JSONField(name = "carOwner")
+            private String carOwner;
+            @JsonProperty(value = "modelCode")
+            @JSONField(name = "modelCode")
+            private String modelCode;
+            @JsonProperty(value = "exhaustScale")
+            @JSONField(name = "exhaustScale")
+            private String exhaustScale;
+            @JsonProperty(value = "completeKerbMass")
+            @JSONField(name = "completeKerbMass")
+            private String completeKerbMass;
+            @JsonProperty(value = "loanVehicleFlag")
+            @JSONField(name = "loanVehicleFlag")
+            private String loanVehicleFlag;
+            @JsonProperty(value = "chgOwnerFlag")
+            @JSONField(name = "chgOwnerFlag")
+            private String chgOwnerFlag;
+            @JsonProperty(value = "carOwnerIdentifyNumber")
+            @JSONField(name = "carOwnerIdentifyNumber")
+            private String carOwnerIdentifyNumber;
+            @JsonProperty(value = "productType")
+            @JSONField(name = "productType")
+            private String productType;
+            @JsonProperty(value = "brandCode")
+            @JSONField(name = "brandCode")
+            private String brandCode;
+            @JsonProperty(value = "chgOwnerDate")
+            @JSONField(name = "chgOwnerDate")
+            private String chgOwnerDate;
+            @JsonProperty(value = "clauseTypeSystem")
+            @JSONField(name = "clauseTypeSystem")
+            private String clauseTypeSystem;
+            @JsonProperty(value = "engineNo")
+            @JSONField(name = "engineNo")
+            private String engineNo;
+            @JsonProperty(value = "brandName")
+            @JSONField(name = "brandName")
+            private String brandName;
+            @JsonProperty(value = "certifiCateDate")
+            @JSONField(name = "certifiCateDate")
+            private String certifiCateDate;
+            @JsonProperty(value = "useNatureCode")
+            @JSONField(name = "useNatureCode")
+            private String useNatureCode;
+            @JsonProperty(value = "enrollDate")
+            @JSONField(name = "enrollDate")
+            private String enrollDate;
+            @JsonProperty(value = "seatCount")
+            @JSONField(name = "seatCount")
+            private String seatCount;
+            @JsonProperty(value = "carOwnerIdentifyType")
+            @JSONField(name = "carOwnerIdentifyType")
+            private String carOwnerIdentifyType;
+            @JsonProperty(value = "carOwnerNature")
+            @JSONField(name = "carOwnerNature")
+            private String carOwnerNature;
+            @JsonProperty(value = "modelName")
+            @JSONField(name = "modelName")
+            private String modelName;
+            @JsonProperty(value = "fuelType")
+            @JSONField(name = "fuelType")
+            private String fuelType;
+            @JsonProperty(value = "termsSystem")
+            @JSONField(name = "termsSystem")
+            private String termsSystem;
+            @JsonProperty(value = "tonCountlb")
+            @JSONField(name = "tonCountlb")
+            private String tonCountlb;
+            @JsonProperty(value = "newFuelModel")
+            @JSONField(name = "newFuelModel")
+            private String newFuelModel;
+            @JsonProperty(value = "vinClick")
+            @JSONField(name = "vinClick")
+            private String vinClick;
+            @JsonProperty(value = "maincarKindCode")
+            @JSONField(name = "maincarKindCode")
+            private String maincarKindCode;
+
+            //车主证件有效期起期
+//            @JsonProperty(value = "IDValidStartDate")
+            @JSONField(name = "IDValidStartDate")
+            @JsonProperty(value = "IDValidStartDate")
+            private String IDValidStartDate;
+            //车主证件有效期止期
+            @JsonProperty(value = "idValidDate")
+            @JSONField(name = "idValidDate")
+            private String idValidDate;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTmainDTO {
+            //代理人代码
+            @JsonProperty(value = "agentCode")
+            @JSONField(name = "agentCode")
+            private String agentCode;
+            //代理协议
+            @JsonProperty(value = "agreementNo")
+            @JSONField(name = "agreementNo")
+            private String agreementNo;
+            @JsonProperty(value = "unitmainTenanceType2Name")
+            @JSONField(name = "unitmainTenanceType2Name")
+            private String unitmainTenanceType2Name;
+            @JsonProperty(value = "channeltypeone")
+            @JSONField(name = "channeltypeone")
+            private String channeltypeone;
+            @JsonProperty(value = "argueSolution")
+            @JSONField(name = "argueSolution")
+            private String argueSolution;
+            @JsonProperty(value = "handler1Name")
+            @JSONField(name = "handler1Name")
+            private String handler1Name;
+            @JsonProperty(value = "channeltypetwo")
+            @JSONField(name = "channeltypetwo")
+            private String channeltypetwo;
+            @JsonProperty(value = "agentName")
+            @JSONField(name = "agentName")
+            private String agentName;
+            @JsonProperty(value = "unitMaintenanceName")
+            @JSONField(name = "unitMaintenanceName")
+            private String unitMaintenanceName;
+            @JsonProperty(value = "businessNature")
+            @JSONField(name = "businessNature")
+            private String businessNature;
+            @JsonProperty(value = "activityPlan")
+            @JSONField(name = "activityPlan")
+            private String activityPlan;
+            @JsonProperty(value = "signDate")
+            @JSONField(name = "signDate")
+            private String signDate;
+            @JsonProperty(value = "handlerCode")
+            @JSONField(name = "handlerCode")
+            private String handlerCode;
+            @JsonProperty(value = "channeltypeoneName")
+            @JSONField(name = "channeltypeoneName")
+            private String channeltypeoneName;
+            @JsonProperty(value = "unitMaintenanceCode")
+            @JSONField(name = "unitMaintenanceCode")
+            private String unitMaintenanceCode;
+            @JsonProperty(value = "unitmainTenanceType1")
+            @JSONField(name = "unitmainTenanceType1")
+            private String unitmainTenanceType1;
+            @JsonProperty(value = "unitmainTenanceType2")
+            @JSONField(name = "unitmainTenanceType2")
+            private String unitmainTenanceType2;
+            @JsonProperty(value = "channeltypetwoName")
+            @JSONField(name = "channeltypetwoName")
+            private String channeltypetwoName;
+            @JsonProperty(value = "handler1Code")
+            @JSONField(name = "handler1Code")
+            private String handler1Code;
+            @JsonProperty(value = "comName")
+            @JSONField(name = "comName")
+            private String comName;
+            @JsonProperty(value = "comCode")
+            @JSONField(name = "comCode")
+            private String comCode;
+            @JsonProperty(value = "operateDate")
+            @JSONField(name = "operateDate")
+            private String operateDate;
+            @JsonProperty(value = "startDate")
+            @JSONField(name = "startDate")
+            private String startDate;
+            @JsonProperty(value = "eProposalFlag")
+            @JSONField(name = "eProposalFlag")
+            private String eProposalFlag;
+            @JsonProperty(value = "business")
+            @JSONField(name = "business")
+            private String business;
+        }
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class BasePartVoDTO {
+
+        /**
+         * 编辑类型
+         * 投保单录入 EditType_ProposalInput
+         * 投保单修改
+         * EditType_ProposalModify
+         */
+        @JsonProperty(value = "editType")
+        @JSONField(name = "editType")
+        private String editType;
+
+        /**
+         * 输入类型
+         * 34-同保
+         */
+        @JsonProperty(value = "inputType")
+        @JSONField(name = "inputType")
+        private String inputType;
+
+        /**
+         * 登录机构
+         */
+        @JsonProperty(value = "loginComCode")
+        @JSONField(name = "loginComCode")
+        private String loginComCode;
+
+        /**
+         * 登录机构地区编码
+         * 取登录机构前两位
+         */
+        @JsonProperty(value = "loginComCodeSub")
+        @JSONField(name = "loginComCodeSub")
+        private String loginComCodeSub;
+
+        /**
+         * 险种代码
+         * 0500同保
+         */
+        @JsonProperty(value = "loginRiskCode")
+        @JSONField(name = "loginRiskCode")
+        private String loginRiskCode;
+
+        /**
+         * 业务员代码
+         */
+        @JsonProperty(value = "userCode")
+        @JSONField(name = "userCode")
+        private String userCode;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class BiDTO {
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class CiDTO {
+    }
+
 
 //    private static BcDTO.PrpTmainDTO buildPrpTmain(){
 //        BcDTO.PrpTmainDTO tmain = new BcDTO.PrpTmainDTO();

src/main/java/com/ydtech/modules/ins/model/guoRen/CarPriceResp.java

@@ -1,12 +1,13 @@
 package com.ydtech.modules.ins.model.guoRen;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 
 /**
- *  车价 响应  单条
+ * 车价 响应  单条
  *
  * @author: lig
  * @date: 2023年10月17日 0017
@@ -16,32 +17,41 @@ import lombok.NoArgsConstructor;
 public class CarPriceResp {
 
 
-    @JsonProperty("resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JsonProperty("resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JsonProperty("data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JsonProperty("basepureriskpremium")
+        @JsonProperty(value = "basepureriskpremium")
+        @JSONField(name = "basepureriskpremium")
         private String basepureriskpremium;
-        @JsonProperty("modelCode")
+        @JsonProperty(value = "modelCode")
+        @JSONField(name = "modelCode")
         private String modelCode;
-        @JsonProperty("inputvo")
+        @JsonProperty(value = "inputvo")
+        @JSONField(name = "inputvo")
         private String inputvo;
-        @JsonProperty("actualValue")
+        @JsonProperty(value = "actualValue")
+        @JSONField(name = "actualValue")
         private Double actualValue;
-        @JsonProperty("noticeType")
+        @JsonProperty(value = "noticeType")
+        @JSONField(name = "noticeType")
         private String noticeType;
-        @JsonProperty("derailleurType")
+        @JsonProperty(value = "derailleurType")
+        @JSONField(name = "derailleurType")
         private String derailleurType;
-        @JsonProperty("carCountryNature")
+        @JsonProperty(value = "carCountryNature")
+        @JSONField(name = "carCountryNature")
         private String carCountryNature;
 
 
-
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/ChannelInfoDto.java

@@ -1,12 +1,11 @@
 package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.config.ConfigureParameters;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * 渠道信息 获取配置的信息
  */
@@ -14,51 +13,74 @@ import java.util.List;
 @Data
 public class ChannelInfoDto implements ConfigureParameters {
 
+    @JsonProperty(value = "areaCode")
     @JSONField(name = "areaCode")
     private String areaCode;
+    @JsonProperty(value = "areaName")
     @JSONField(name = "areaName")
     private String areaName;
+    @JsonProperty(value = "comName")
     @JSONField(name = "comName")
     private String comName;
+    @JsonProperty(value = "businessNature")
     @JSONField(name = "businessNature")
     private String businessNature;
+    @JsonProperty(value = "comCode")
     @JSONField(name = "comCode")
     private String comCode;
     //userCode
+    @JsonProperty(value = "handlerCode")
     @JSONField(name = "handlerCode")
     private String handlerCode;
+    @JsonProperty(value = "agentCode")
     @JSONField(name = "agentCode")
     private String agentCode;
+    @JsonProperty(value = "agreementNo")
     @JSONField(name = "agreementNo")
     private String agreementNo;
+    @JsonProperty(value = "unitMaintenanceCode")
     @JSONField(name = "unitMaintenanceCode")
     private String unitMaintenanceCode;
+    @JsonProperty(value = "unitmainTenanceType1")
     @JSONField(name = "unitmainTenanceType1")
     private String unitmainTenanceType1;
+    @JsonProperty(value = "unitmainTenanceType2")
     @JSONField(name = "unitmainTenanceType2")
     private String unitmainTenanceType2;
+    @JsonProperty(value = "unitMaintenanceName")
     @JSONField(name = "unitMaintenanceName")
     private String unitMaintenanceName;
+    @JsonProperty(value = "unitmainTenanceType1Name")
     @JSONField(name = "unitmainTenanceType1Name")
     private String unitmainTenanceType1Name;
+    @JsonProperty(value = "unitmainTenanceType2Name")
     @JSONField(name = "unitmainTenanceType2Name")
     private String unitmainTenanceType2Name;
+    @JsonProperty(value = "channelTypeOne")
     @JSONField(name = "channelTypeOne")
     private String channelTypeOne;
+    @JsonProperty(value = "channelTypeOneName")
     @JSONField(name = "channelTypeOneName")
     private String channelTypeOneName;
+    @JsonProperty(value = "channelTypeTwo")
     @JSONField(name = "channelTypeTwo")
     private String channelTypeTwo;
+    @JsonProperty(value = "channelTypeTwoName")
     @JSONField(name = "channelTypeTwoName")
     private String channelTypeTwoName;
+    @JsonProperty(value = "upDateTime")
     @JSONField(name = "upDateTime")
     private String upDateTime;
+    @JsonProperty(value = "handler1Name")
     @JSONField(name = "handler1Name")
     private String handler1Name;
+    @JsonProperty(value = "agentName")
     @JSONField(name = "agentName")
     private String agentName;
+    @JsonProperty(value = "deGentType")
     @JSONField(name = "deGentType")
     private String deGentType;
+    @JsonProperty(value = "saleGentType")
     @JSONField(name = "saleGentType")
     private String saleGentType;
     //归属业务员名称

src/main/java/com/ydtech/modules/ins/model/guoRen/ChannelInfoResp.java

@@ -16,67 +16,93 @@ import java.util.List;
 public class ChannelInfoResp {
 
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private List<DataDTO> data;
 
     @NoArgsConstructor
     @Data
-    public static class DataDTO implements ConfigureParameters{
-        @JSONField(name="prptmain")
+    public static class DataDTO implements ConfigureParameters {
+        @JsonProperty(value = "prptmain")
+        @JSONField(name = "prptmain")
         private PrptmainDTO prptmain;
-        @JSONField(name="areaCode")
+        @JsonProperty(value = "areaCode")
+        @JSONField(name = "areaCode")
         private String areaCode;
-        @JSONField(name="areaName")
+        @JsonProperty(value = "areaName")
+        @JSONField(name = "areaName")
         private String areaName;
 
         @NoArgsConstructor
         @Data
-        public static class PrptmainDTO  {
-            @JSONField(name="comName")
+        public static class PrptmainDTO {
+            @JsonProperty(value = "comName")
+            @JSONField(name = "comName")
             private String comName;
-            @JSONField(name="businessNature")
+            @JsonProperty(value = "businessNature")
+            @JSONField(name = "businessNature")
             private String businessNature;
-            @JSONField(name="comCode")
+            @JsonProperty(value = "comCode")
+            @JSONField(name = "comCode")
             private String comCode;
 
             //userCode
-            @JSONField(name="handlerCode")
+            @JsonProperty(value = "handlerCode")
+            @JSONField(name = "handlerCode")
             private String handlerCode;
-            @JSONField(name="agentCode")
+            @JsonProperty(value = "agentCode")
+            @JSONField(name = "agentCode")
             private String agentCode;
-            @JSONField(name="agreementNo")
+            @JsonProperty(value = "agreementNo")
+            @JSONField(name = "agreementNo")
             private String agreementNo;
-            @JSONField(name="unitMaintenanceCode")
+            @JsonProperty(value = "unitMaintenanceCode")
+            @JSONField(name = "unitMaintenanceCode")
             private String unitMaintenanceCode;
-            @JSONField(name="unitmainTenanceType1")
+            @JsonProperty(value = "unitmainTenanceType1")
+            @JSONField(name = "unitmainTenanceType1")
             private String unitmainTenanceType1;
-            @JSONField(name="unitmainTenanceType2")
+            @JsonProperty(value = "unitmainTenanceType2")
+            @JSONField(name = "unitmainTenanceType2")
             private String unitmainTenanceType2;
-            @JSONField(name="unitMaintenanceName")
+            @JsonProperty(value = "unitMaintenanceName")
+            @JSONField(name = "unitMaintenanceName")
             private String unitMaintenanceName;
-            @JSONField(name="unitmainTenanceType1Name")
+            @JsonProperty(value = "unitmainTenanceType1Name")
+            @JSONField(name = "unitmainTenanceType1Name")
             private String unitmainTenanceType1Name;
-            @JSONField(name="unitmainTenanceType2Name")
+            @JsonProperty(value = "unitmainTenanceType2Name")
+            @JSONField(name = "unitmainTenanceType2Name")
             private String unitmainTenanceType2Name;
-            @JSONField(name="channelTypeOne")
+            @JsonProperty(value = "channelTypeOne")
+            @JSONField(name = "channelTypeOne")
             private String channelTypeOne;
-            @JSONField(name="channelTypeOneName")
+            @JsonProperty(value = "channelTypeOneName")
+            @JSONField(name = "channelTypeOneName")
             private String channelTypeOneName;
-            @JSONField(name="channelTypeTwo")
+            @JsonProperty(value = "channelTypeTwo")
+            @JSONField(name = "channelTypeTwo")
             private String channelTypeTwo;
-            @JSONField(name="channelTypeTwoName")
+            @JsonProperty(value = "channelTypeTwoName")
+            @JSONField(name = "channelTypeTwoName")
             private String channelTypeTwoName;
-            @JSONField(name="upDateTime")
+            @JsonProperty(value = "upDateTime")
+            @JSONField(name = "upDateTime")
             private String upDateTime;
-            @JSONField(name="handler1Name")
+            @JsonProperty(value = "handler1Name")
+            @JSONField(name = "handler1Name")
             private String handler1Name;
-            @JSONField(name="agentName")
+            @JsonProperty(value = "agentName")
+            @JSONField(name = "agentName")
             private String agentName;
-            @JSONField(name="deGentType")
+            @JsonProperty(value = "deGentType")
+            @JSONField(name = "deGentType")
             private String deGentType;
-            @JSONField(name="saleGentType")
+            @JsonProperty(value = "saleGentType")
+            @JSONField(name = "saleGentType")
             private String saleGentType;
             //归属业务员名称
             private String handlerName;

src/main/java/com/ydtech/modules/ins/model/guoRen/InsOrderStatusResp.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -13,11 +14,14 @@ import java.util.List;
 @Data
 public class InsOrderStatusResp {
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private List<DataDTO> data;
 
     @NoArgsConstructor
@@ -27,27 +31,31 @@ public class InsOrderStatusResp {
         /**
          * 投保单号
          */
-        @JSONField(name="proposalNo")
+        @JsonProperty(value = "proposalNo")
+        @JSONField(name = "proposalNo")
         private String proposalNo;
 
         /**
          * 保单号
          */
-        @JSONField(name="policyNo")
+        @JsonProperty(value = "policyNo")
+        @JSONField(name = "policyNo")
         private String policyNo;
 
         /**
          * 核保状态
          * (0初始值/1通过/2不通过/3 无需核保 /9待核保/)
          */
-        @JSONField(name="underwriteFlag")
+        @JsonProperty(value = "underwriteFlag")
+        @JSONField(name = "underwriteFlag")
         private String underwriteFlag;
 
         /**
          * 其他状态
          * 0是正常，2是删除
          */
-        @JSONField(name="othFlag")
+        @JsonProperty(value = "othFlag")
+        @JSONField(name = "othFlag")
         private String othFlag;
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/InsuranceSlipReq.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.ins.model.guoRen;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
@@ -19,21 +18,25 @@ import java.util.List;
 public class InsuranceSlipReq {
 
 
-    @JSONField(name="uuid")
+    @JsonProperty(value = "uuid")
+    @JSONField(name = "uuid")
     private String uuid;
-    @JSONField(name="prpTinsured")
+    @JsonProperty(value = "prpTinsured")
+    @JSONField(name = "prpTinsured")
     private PrpTinsuredDTO prpTinsured;
-    @JSONField(name="biPrptenages")
+    @JsonProperty(value = "biPrptenages")
+    @JSONField(name = "biPrptenages")
     private List<?> biPrptenages;
-    @JSONField(name="ciPrptenages")
+    @JsonProperty(value = "ciPrptenages")
+    @JSONField(name = "ciPrptenages")
     private List<CiPrptenagesDTO> ciPrptenages;
 
 
     /**
-     *  构造请求参数
+     * 构造请求参数
      */
     @JsonIgnore
-    public static InsuranceSlipReq buildParam(BaseQuoteInfoVo yaQuoteInfoVo,String carPriceNum){
+    public static InsuranceSlipReq buildParam(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum) {
 
         //投保人
         CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
@@ -62,7 +65,6 @@ public class InsuranceSlipReq {
         prpTinsured.setAppliNationality("中国");
 
 
-
         /**
          *  被保人信息
          */
@@ -80,9 +82,6 @@ public class InsuranceSlipReq {
         prpTinsured.setInsuredNationality("中国");
 
 
-
-
-
         req.setPrpTinsured(prpTinsured);
         req.setBiPrptenages(null);
         req.setCiPrptenages(null);
@@ -93,66 +92,94 @@ public class InsuranceSlipReq {
     @NoArgsConstructor
     @Data
     public static class PrpTinsuredDTO {
-        @JSONField(name="appliName")
+        @JsonProperty(value = "appliName")
+        @JSONField(name = "appliName")
         private String appliName;
-        @JSONField(name="appliInsuredNature")
+        @JsonProperty(value = "appliInsuredNature")
+        @JSONField(name = "appliInsuredNature")
         private String appliInsuredNature;
-        @JSONField(name="appliIdentifyType")
+        @JsonProperty(value = "appliIdentifyType")
+        @JSONField(name = "appliIdentifyType")
         private String appliIdentifyType;
-        @JSONField(name="appliIdentifyNumber")
+        @JsonProperty(value = "appliIdentifyNumber")
+        @JSONField(name = "appliIdentifyNumber")
         private String appliIdentifyNumber;
-        @JSONField(name="appliMobile")
+        @JsonProperty(value = "appliMobile")
+        @JSONField(name = "appliMobile")
         private String appliMobile;
-        @JSONField(name="appliAddress")
+        @JsonProperty(value = "appliAddress")
+        @JSONField(name = "appliAddress")
         private String appliAddress;
-        @JSONField(name="appliPostCode")
+        @JsonProperty(value = "appliPostCode")
+        @JSONField(name = "appliPostCode")
         private String appliPostCode;
-        @JSONField(name="insuredName")
+        @JsonProperty(value = "insuredName")
+        @JSONField(name = "insuredName")
         private String insuredName;
-        @JSONField(name="insuredInsuredNature")
+        @JsonProperty(value = "insuredInsuredNature")
+        @JSONField(name = "insuredInsuredNature")
         private String insuredInsuredNature;
-        @JSONField(name="insuredMobile")
+        @JsonProperty(value = "insuredMobile")
+        @JSONField(name = "insuredMobile")
         private String insuredMobile;
-        @JSONField(name="insuredIdentifyType")
+        @JsonProperty(value = "insuredIdentifyType")
+        @JSONField(name = "insuredIdentifyType")
         private String insuredIdentifyType;
-        @JSONField(name="insuredIdentifyNumber")
+        @JsonProperty(value = "insuredIdentifyNumber")
+        @JSONField(name = "insuredIdentifyNumber")
         private String insuredIdentifyNumber;
-        @JSONField(name="insuredAddress")
+        @JsonProperty(value = "insuredAddress")
+        @JSONField(name = "insuredAddress")
         private String insuredAddress;
-        @JSONField(name="insuredPostCode")
+        @JsonProperty(value = "insuredPostCode")
+        @JSONField(name = "insuredPostCode")
         private String insuredPostCode;
-        @JSONField(name="appliIDValidStartDate")
+        @JsonProperty(value = "appliIDValidStartDate")
+        @JSONField(name = "appliIDValidStartDate")
         private String appliIDValidStartDate;
-        @JSONField(name="appliIDValidDate")
+        @JsonProperty(value = "appliIDValidDate")
+        @JSONField(name = "appliIDValidDate")
         private String appliIDValidDate;
-        @JSONField(name="appliValidDateLongFlag")
+        @JsonProperty(value = "appliValidDateLongFlag")
+        @JSONField(name = "appliValidDateLongFlag")
         private String appliValidDateLongFlag;
-        @JSONField(name="appliNationality")
+        @JsonProperty(value = "appliNationality")
+        @JSONField(name = "appliNationality")
         private String appliNationality;
-        @JSONField(name="insuredIDValidStartDate")
+        @JsonProperty(value = "insuredIDValidStartDate")
+        @JSONField(name = "insuredIDValidStartDate")
         private String insuredIDValidStartDate;
-        @JSONField(name="insuredValidDateLongFlag")
+        @JsonProperty(value = "insuredValidDateLongFlag")
+        @JSONField(name = "insuredValidDateLongFlag")
         private String insuredValidDateLongFlag;
-        @JSONField(name="insuredNationality")
+        @JsonProperty(value = "insuredNationality")
+        @JSONField(name = "insuredNationality")
         private String insuredNationality;
-        @JSONField(name="insuredIDValidDate")
+        @JsonProperty(value = "insuredIDValidDate")
+        @JSONField(name = "insuredIDValidDate")
         private String insuredIDValidDate;
     }
 
     @NoArgsConstructor
     @Data
     public static class CiPrptenagesDTO {
-        @JSONField(name="serialNo")
+        @JsonProperty(value = "serialNo")
+        @JSONField(name = "serialNo")
         private Integer serialNo;
-        @JSONField(name="clauseCode")
+        @JsonProperty(value = "clauseCode")
+        @JSONField(name = "clauseCode")
         private String clauseCode;
-        @JSONField(name="clauses")
+        @JsonProperty(value = "clauses")
+        @JSONField(name = "clauses")
         private String clauses;
-        @JSONField(name="clausesContext")
+        @JsonProperty(value = "clausesContext")
+        @JSONField(name = "clausesContext")
         private String clausesContext;
-        @JSONField(name="flag")
+        @JsonProperty(value = "flag")
+        @JSONField(name = "flag")
         private String flag;
-        @JSONField(name="select")
+        @JsonProperty(value = "select")
+        @JSONField(name = "select")
         private Boolean select;
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/InsuranceSlipResp.java

@@ -15,94 +15,127 @@ import java.util.List;
 public class InsuranceSlipResp {
 
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="itemVOList")
+        @JsonProperty(value = "itemVOList")
+        @JSONField(name = "itemVOList")
         private List<ItemVOListDTO> itemVOList;
-        @JSONField(name="prpTitemCarVo")
+        @JsonProperty(value = "prpTitemCarVo")
+        @JSONField(name = "prpTitemCarVo")
         private PrpTitemCarVoDTO prpTitemCarVo;
-        @JSONField(name="proposalNoDetailVo")
+        @JsonProperty(value = "proposalNoDetailVo")
+        @JSONField(name = "proposalNoDetailVo")
         private ProposalNoDetailVoDTO proposalNoDetailVo;
-        @JSONField(name="minsuredVo")
+        @JsonProperty(value = "minsuredVo")
+        @JSONField(name = "minsuredVo")
         private MinsuredVoDTO minsuredVo;
 
         @NoArgsConstructor
         @Data
         public static class PrpTitemCarVoDTO {
-            @JSONField(name="licenseNo")
+            @JsonProperty(value = "licenseNo")
+            @JSONField(name = "licenseNo")
             private String licenseNo;
-            @JSONField(name="frameNo")
+            @JsonProperty(value = "frameNo")
+            @JSONField(name = "frameNo")
             private String frameNo;
-            @JSONField(name="engineNo")
+            @JsonProperty(value = "engineNo")
+            @JSONField(name = "engineNo")
             private String engineNo;
-            @JSONField(name="brandName")
+            @JsonProperty(value = "brandName")
+            @JSONField(name = "brandName")
             private String brandName;
-            @JSONField(name="enrollDate")
+            @JsonProperty(value = "enrollDate")
+            @JSONField(name = "enrollDate")
             private String enrollDate;
-            @JSONField(name="chgOwnerFlag")
+            @JsonProperty(value = "chgOwnerFlag")
+            @JSONField(name = "chgOwnerFlag")
             private String chgOwnerFlag;
-            @JSONField(name="carOwner")
+            @JsonProperty(value = "carOwner")
+            @JSONField(name = "carOwner")
             private String carOwner;
-            @JSONField(name="carOwnerIdentifyType")
+            @JsonProperty(value = "carOwnerIdentifyType")
+            @JSONField(name = "carOwnerIdentifyType")
             private String carOwnerIdentifyType;
-            @JSONField(name="carOwnerIdentifyNumber")
+            @JsonProperty(value = "carOwnerIdentifyNumber")
+            @JSONField(name = "carOwnerIdentifyNumber")
             private String carOwnerIdentifyNumber;
         }
 
         @NoArgsConstructor
         @Data
         public static class ProposalNoDetailVoDTO {
-            @JSONField(name="proposalNoBI")
+            @JsonProperty(value = "proposalNoBI")
+            @JSONField(name = "proposalNoBI")
             private String proposalNoBI;
-            @JSONField(name="proposalNoCI")
+            @JsonProperty(value = "proposalNoCI")
+            @JSONField(name = "proposalNoCI")
             private String proposalNoCI;
-            @JSONField(name="companyName")
+            @JsonProperty(value = "companyName")
+            @JSONField(name = "companyName")
             private String companyName;
-            @JSONField(name="orderNo")
+            @JsonProperty(value = "orderNo")
+            @JSONField(name = "orderNo")
             private String orderNo;
-            @JSONField(name="sumPremium")
+            @JsonProperty(value = "sumPremium")
+            @JSONField(name = "sumPremium")
             private Double sumPremium;
         }
 
         @NoArgsConstructor
         @Data
         public static class MinsuredVoDTO {
-            @JSONField(name="appliName")
+            @JsonProperty(value = "appliName")
+            @JSONField(name = "appliName")
             private String appliName;
-            @JSONField(name="appliIdentifyType")
+            @JsonProperty(value = "appliIdentifyType")
+            @JSONField(name = "appliIdentifyType")
             private String appliIdentifyType;
-            @JSONField(name="appliIdentifyNumber")
+            @JsonProperty(value = "appliIdentifyNumber")
+            @JSONField(name = "appliIdentifyNumber")
             private String appliIdentifyNumber;
-            @JSONField(name="appliMobile")
+            @JsonProperty(value = "appliMobile")
+            @JSONField(name = "appliMobile")
             private String appliMobile;
-            @JSONField(name="insuredName")
+            @JsonProperty(value = "insuredName")
+            @JSONField(name = "insuredName")
             private String insuredName;
-            @JSONField(name="insuredMobile")
+            @JsonProperty(value = "insuredMobile")
+            @JSONField(name = "insuredMobile")
             private String insuredMobile;
-            @JSONField(name="insuredIdentifyType")
+            @JsonProperty(value = "insuredIdentifyType")
+            @JSONField(name = "insuredIdentifyType")
             private String insuredIdentifyType;
-            @JSONField(name="insuredIdentifyNumber")
+            @JsonProperty(value = "insuredIdentifyNumber")
+            @JSONField(name = "insuredIdentifyNumber")
             private String insuredIdentifyNumber;
         }
 
         @NoArgsConstructor
         @Data
         public static class ItemVOListDTO {
-            @JSONField(name="kindCode")
+            @JsonProperty(value = "kindCode")
+            @JSONField(name = "kindCode")
             private String kindCode;
-            @JSONField(name="noTaxPremium")
+            @JsonProperty(value = "noTaxPremium")
+            @JSONField(name = "noTaxPremium")
             private Double noTaxPremium;
-            @JSONField(name="premium")
+            @JsonProperty(value = "premium")
+            @JSONField(name = "premium")
             private Double premium;
-            @JSONField(name="taxFee")
+            @JsonProperty(value = "taxFee")
+            @JSONField(name = "taxFee")
             private Double taxFee;
         }
     }

src/main/java/com/ydtech/modules/ins/model/guoRen/NonAutoInsOrderReq.java

@@ -3,17 +3,13 @@ package com.ydtech.modules.ins.model.guoRen;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.ins.model.yc.ruote.Applicant;
-import com.ydtech.modules.ins.model.yc.ruote.Insured;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,7 +18,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 非车保险订单 入参
@@ -32,170 +27,19 @@ import java.util.UUID;
 public class NonAutoInsOrderReq {
 
 
+    @JsonProperty(value = "channelCode")
     @JSONField(name = "channelCode")
     private String channelCode;
+    @JsonProperty(value = "data")
     @JSONField(name = "data")
     private DataDTO data;
+    @JsonProperty(value = "othBusinessNo")
     @JSONField(name = "othBusinessNo")
     private String othBusinessNo;
+    @JsonProperty(value = "requestTime")
     @JSONField(name = "requestTime")
     private String requestTime;
 
-    @NoArgsConstructor
-    @Data
-    public static class DataDTO {
-        @JSONField(name = "orderList")
-        private List<OrderListDTO> orderList;
-
-        @NoArgsConstructor
-        @Data
-        public static class OrderListDTO {
-            @JSONField(name = "insuredList")
-            private List<InsuredListDTO> insuredList;
-            @JSONField(name = "objCarList")
-            private List<ObjCarListDTO> objCarList;
-            @JSONField(name = "orderAppl")
-            private OrderApplDTO orderAppl;
-            @JSONField(name = "orderMain")
-            private OrderMainDTO orderMain;
-            @JSONField(name = "planList")
-            private List<PlanListDTO> planList;
-            @JSONField(name = "salesmanList")
-            private List<SalesmanListDTO> salesmanList;
-
-            @NoArgsConstructor
-            @Data
-            public static class OrderApplDTO {
-                @JSONField(name = "applName")
-                private String applName;
-                @JSONField(name = "applType")
-                private String applType;
-                @JSONField(name = "certfNo")
-                private String certfNo;
-                @JSONField(name = "certfType")
-                private String certfType;
-                @JSONField(name = "contactName")
-                private String contactName;
-                @JSONField(name = "phoneNo")
-                private String phoneNo;
-            }
-
-            @NoArgsConstructor
-            @Data
-            public static class OrderMainDTO {
-                @JSONField(name = "amount")
-                private Integer amount;
-                @JSONField(name = "endDate")
-                private String endDate;
-                @JSONField(name = "goodsCode")
-                private String goodsCode;
-                @JSONField(name = "operatorCode")
-                private String operatorCode;
-                @JSONField(name = "othOrderNo")
-                private String othOrderNo;
-                @JSONField(name = "premium")
-                private Integer premium;
-                @JSONField(name = "prodCode")
-                private String prodCode;
-                @JSONField(name = "renewalInd")
-                private Integer renewalInd;
-                @JSONField(name = "riskCode")
-                private List<String> riskCode;
-                @JSONField(name = "startDate")
-                private String startDate;
-                @JSONField(name = "uwCount")
-                private Integer uwCount;
-                @JSONField(name = "businessMode")
-                private String businessMode;
-                @JSONField(name = "businessSource")
-                private String businessSource;
-            }
-
-            @NoArgsConstructor
-            @Data
-            public static class InsuredListDTO {
-                @JSONField(name = "certfNo")
-                private String certfNo;
-                @JSONField(name = "certfType")
-                private String certfType;
-                @JSONField(name = "countryName")
-                private String countryName;
-                @JSONField(name = "insuredName")
-                private String insuredName;
-                @JSONField(name = "insuredType")
-                private String insuredType;
-                @JSONField(name = "phoneNo")
-                private String phoneNo;
-                @JSONField(name = "planNo")
-                private String planNo;
-            }
-
-            @NoArgsConstructor
-            @Data
-            public static class ObjCarListDTO {
-                @JSONField(name = "carModels")
-                private String carModels;
-                @JSONField(name = "carType")
-                private String carType;
-                @JSONField(name = "carTypeCode")
-                private String carTypeCode;
-                @JSONField(name = "clnt")
-                private String clnt;
-                @JSONField(name = "frameNo")
-                private String frameNo;
-                @JSONField(name = "licenseNo")
-                private String licenseNo;
-                @JSONField(name = "planNo")
-                private String planNo;
-                @JSONField(name = "purchasePrice")
-                private Integer purchasePrice;
-                @JSONField(name = "seatNum")
-                private Integer seatNum;
-                @JSONField(name = "toncount")
-                private Double toncount;
-            }
-
-            @NoArgsConstructor
-            @Data
-            public static class PlanListDTO {
-                @JSONField(name = "occupationCode")
-                private String occupationCode;
-                @JSONField(name = "occupationGrade")
-                private String occupationGrade;
-                @JSONField(name = "occupationName")
-                private String occupationName;
-                @JSONField(name = "planNo")
-                private String planNo;
-                @JSONField(name = "quantity")
-                private String quantity;
-                @JSONField(name = "socialSecInd")
-                private String socialSecInd;
-            }
-
-            @NoArgsConstructor
-            @Data
-            public static class SalesmanListDTO {
-                @JSONField(name = "agentCode")
-                private String agentCode;
-                @JSONField(name = "companyCode")
-                private String companyCode;
-                @JSONField(name = "salesmanCode")
-                private String salesmanCode;
-                @JSONField(name = "salesmanFlag")
-                private Integer salesmanFlag;
-                @JSONField(name = "salesmanName")
-                private String salesmanName;
-                @JSONField(name = "serialNo")
-                private Integer serialNo;
-                @JSONField(name = "teamCode")
-                private String teamCode;
-                @JSONField(name = "teamName")
-                private String teamName;
-            }
-        }
-    }
-
-
     /**
      * 构造报价请求参数
      */
@@ -386,8 +230,6 @@ public class NonAutoInsOrderReq {
         salesmanList.add(salesmanListDTO);
 
 
-
-
         orderListDto.setInsuredList(insuredList);
         orderListDto.setOrderAppl(orderAppl);
         orderListDto.setOrderMain(orderMain);
@@ -409,5 +251,216 @@ public class NonAutoInsOrderReq {
 
     }
 
+    @NoArgsConstructor
+    @Data
+    public static class DataDTO {
+        @JsonProperty(value = "orderList")
+        @JSONField(name = "orderList")
+        private List<OrderListDTO> orderList;
+
+        @NoArgsConstructor
+        @Data
+        public static class OrderListDTO {
+            @JsonProperty(value = "insuredList")
+            @JSONField(name = "insuredList")
+            private List<InsuredListDTO> insuredList;
+            @JsonProperty(value = "objCarList")
+            @JSONField(name = "objCarList")
+            private List<ObjCarListDTO> objCarList;
+            @JsonProperty(value = "orderAppl")
+            @JSONField(name = "orderAppl")
+            private OrderApplDTO orderAppl;
+            @JsonProperty(value = "orderMain")
+            @JSONField(name = "orderMain")
+            private OrderMainDTO orderMain;
+            @JsonProperty(value = "planList")
+            @JSONField(name = "planList")
+            private List<PlanListDTO> planList;
+            @JsonProperty(value = "salesmanList")
+            @JSONField(name = "salesmanList")
+            private List<SalesmanListDTO> salesmanList;
+
+            @NoArgsConstructor
+            @Data
+            public static class OrderApplDTO {
+                @JsonProperty(value = "applName")
+                @JSONField(name = "applName")
+                private String applName;
+                @JsonProperty(value = "applType")
+                @JSONField(name = "applType")
+                private String applType;
+                @JsonProperty(value = "certfNo")
+                @JSONField(name = "certfNo")
+                private String certfNo;
+                @JsonProperty(value = "certfType")
+                @JSONField(name = "certfType")
+                private String certfType;
+                @JsonProperty(value = "contactName")
+                @JSONField(name = "contactName")
+                private String contactName;
+                @JsonProperty(value = "phoneNo")
+                @JSONField(name = "phoneNo")
+                private String phoneNo;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class OrderMainDTO {
+                @JsonProperty(value = "amount")
+                @JSONField(name = "amount")
+                private Integer amount;
+                @JsonProperty(value = "endDate")
+                @JSONField(name = "endDate")
+                private String endDate;
+                @JsonProperty(value = "goodsCode")
+                @JSONField(name = "goodsCode")
+                private String goodsCode;
+                @JsonProperty(value = "operatorCode")
+                @JSONField(name = "operatorCode")
+                private String operatorCode;
+                @JsonProperty(value = "othOrderNo")
+                @JSONField(name = "othOrderNo")
+                private String othOrderNo;
+                @JsonProperty(value = "premium")
+                @JSONField(name = "premium")
+                private Integer premium;
+                @JsonProperty(value = "prodCode")
+                @JSONField(name = "prodCode")
+                private String prodCode;
+                @JsonProperty(value = "renewalInd")
+                @JSONField(name = "renewalInd")
+                private Integer renewalInd;
+                @JsonProperty(value = "riskCode")
+                @JSONField(name = "riskCode")
+                private List<String> riskCode;
+                @JsonProperty(value = "startDate")
+                @JSONField(name = "startDate")
+                private String startDate;
+                @JsonProperty(value = "uwCount")
+                @JSONField(name = "uwCount")
+                private Integer uwCount;
+                @JsonProperty(value = "businessMode")
+                @JSONField(name = "businessMode")
+                private String businessMode;
+                @JsonProperty(value = "businessSource")
+                @JSONField(name = "businessSource")
+                private String businessSource;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class InsuredListDTO {
+                @JsonProperty(value = "certfNo")
+                @JSONField(name = "certfNo")
+                private String certfNo;
+                @JsonProperty(value = "certfType")
+                @JSONField(name = "certfType")
+                private String certfType;
+                @JsonProperty(value = "countryName")
+                @JSONField(name = "countryName")
+                private String countryName;
+                @JsonProperty(value = "insuredName")
+                @JSONField(name = "insuredName")
+                private String insuredName;
+                @JsonProperty(value = "insuredType")
+                @JSONField(name = "insuredType")
+                private String insuredType;
+                @JsonProperty(value = "phoneNo")
+                @JSONField(name = "phoneNo")
+                private String phoneNo;
+                @JsonProperty(value = "planNo")
+                @JSONField(name = "planNo")
+                private String planNo;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class ObjCarListDTO {
+                @JsonProperty(value = "carModels")
+                @JSONField(name = "carModels")
+                private String carModels;
+                @JsonProperty(value = "carType")
+                @JSONField(name = "carType")
+                private String carType;
+                @JsonProperty(value = "carTypeCode")
+                @JSONField(name = "carTypeCode")
+                private String carTypeCode;
+                @JsonProperty(value = "clnt")
+                @JSONField(name = "clnt")
+                private String clnt;
+                @JsonProperty(value = "frameNo")
+                @JSONField(name = "frameNo")
+                private String frameNo;
+                @JsonProperty(value = "licenseNo")
+                @JSONField(name = "licenseNo")
+                private String licenseNo;
+                @JsonProperty(value = "planNo")
+                @JSONField(name = "planNo")
+                private String planNo;
+                @JsonProperty(value = "purchasePrice")
+                @JSONField(name = "purchasePrice")
+                private Integer purchasePrice;
+                @JsonProperty(value = "seatNum")
+                @JSONField(name = "seatNum")
+                private Integer seatNum;
+                @JsonProperty(value = "toncount")
+                @JSONField(name = "toncount")
+                private Double toncount;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class PlanListDTO {
+                @JsonProperty(value = "occupationCode")
+                @JSONField(name = "occupationCode")
+                private String occupationCode;
+                @JsonProperty(value = "occupationGrade")
+                @JSONField(name = "occupationGrade")
+                private String occupationGrade;
+                @JsonProperty(value = "occupationName")
+                @JSONField(name = "occupationName")
+                private String occupationName;
+                @JsonProperty(value = "planNo")
+                @JSONField(name = "planNo")
+                private String planNo;
+                @JsonProperty(value = "quantity")
+                @JSONField(name = "quantity")
+                private String quantity;
+                @JsonProperty(value = "socialSecInd")
+                @JSONField(name = "socialSecInd")
+                private String socialSecInd;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class SalesmanListDTO {
+                @JsonProperty(value = "agentCode")
+                @JSONField(name = "agentCode")
+                private String agentCode;
+                @JsonProperty(value = "companyCode")
+                @JSONField(name = "companyCode")
+                private String companyCode;
+                @JsonProperty(value = "salesmanCode")
+                @JSONField(name = "salesmanCode")
+                private String salesmanCode;
+                @JsonProperty(value = "salesmanFlag")
+                @JSONField(name = "salesmanFlag")
+                private Integer salesmanFlag;
+                @JsonProperty(value = "salesmanName")
+                @JSONField(name = "salesmanName")
+                private String salesmanName;
+                @JsonProperty(value = "serialNo")
+                @JSONField(name = "serialNo")
+                private Integer serialNo;
+                @JsonProperty(value = "teamCode")
+                @JSONField(name = "teamCode")
+                private String teamCode;
+                @JsonProperty(value = "teamName")
+                @JSONField(name = "teamName")
+                private String teamName;
+            }
+        }
+    }
+
 
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/NonAutoInsResp.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,7 +9,7 @@ import java.util.List;
 
 
 /**
- *  非车险   入参
+ * 非车险   入参
  *
  * @author: lig
  * @date: 2023-09-28
@@ -18,188 +19,261 @@ import java.util.List;
 public class NonAutoInsResp {
 
 
-    @JSONField(name="code")
+    @JsonProperty(value = "code")
+    @JSONField(name = "code")
     private Integer code;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="goods")
+        @JsonProperty(value = "goods")
+        @JSONField(name = "goods")
         private GoodsDTO goods;
-        @JSONField(name="goodsAgentSalesmanList")
+        @JsonProperty(value = "goodsAgentSalesmanList")
+        @JSONField(name = "goodsAgentSalesmanList")
         private List<GoodsAgentSalesmanListDTO> goodsAgentSalesmanList;
-        @JSONField(name="goodsSalesInfo")
+        @JsonProperty(value = "goodsSalesInfo")
+        @JSONField(name = "goodsSalesInfo")
         private GoodsSalesInfoDTO goodsSalesInfo;
-        @JSONField(name="goodsPrpallConfList")
+        @JsonProperty(value = "goodsPrpallConfList")
+        @JSONField(name = "goodsPrpallConfList")
         private List<GoodsPrpallConfListDTO> goodsPrpallConfList;
-        @JSONField(name="goodsIntroduction")
+        @JsonProperty(value = "goodsIntroduction")
+        @JSONField(name = "goodsIntroduction")
         private GoodsIntroductionDTO goodsIntroduction;
-        @JSONField(name="channelContactList")
+        @JsonProperty(value = "channelContactList")
+        @JSONField(name = "channelContactList")
         private List<ChannelContactListDTO> channelContactList;
-        @JSONField(name="prodList")
+        @JsonProperty(value = "prodList")
+        @JSONField(name = "prodList")
         private List<ProdListDTO> prodList;
-        @JSONField(name="checkRepeat")
+        @JsonProperty(value = "checkRepeat")
+        @JSONField(name = "checkRepeat")
         private CheckRepeatDTO checkRepeat;
-        @JSONField(name="checkInsureDef")
+        @JsonProperty(value = "checkInsureDef")
+        @JSONField(name = "checkInsureDef")
         private CheckInsureDefDTO checkInsureDef;
 
         @NoArgsConstructor
         @Data
         public static class GoodsDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="goodsCode")
+            @JsonProperty(value = "goodsCode")
+            @JSONField(name = "goodsCode")
             private String goodsCode;
-            @JSONField(name="goodsCName")
+            @JsonProperty(value = "goodsCName")
+            @JSONField(name = "goodsCName")
             private String goodsCName;
-            @JSONField(name="goodsStatus")
+            @JsonProperty(value = "goodsStatus")
+            @JSONField(name = "goodsStatus")
             private String goodsStatus;
-            @JSONField(name="businessType")
+            @JsonProperty(value = "businessType")
+            @JSONField(name = "businessType")
             private String businessType;
-            @JSONField(name="businessSource")
+            @JsonProperty(value = "businessSource")
+            @JSONField(name = "businessSource")
             private String businessSource;
-            @JSONField(name="issueWay")
+            @JsonProperty(value = "issueWay")
+            @JSONField(name = "issueWay")
             private String issueWay;
-            @JSONField(name="underwritingType")
+            @JsonProperty(value = "underwritingType")
+            @JSONField(name = "underwritingType")
             private String underwritingType;
-            @JSONField(name="codInd")
+            @JsonProperty(value = "codInd")
+            @JSONField(name = "codInd")
             private String codInd;
-            @JSONField(name="demandNo")
+            @JsonProperty(value = "demandNo")
+            @JSONField(name = "demandNo")
             private String demandNo;
-            @JSONField(name="backPolicyFlag")
+            @JsonProperty(value = "backPolicyFlag")
+            @JSONField(name = "backPolicyFlag")
             private String backPolicyFlag;
-            @JSONField(name="payExpired")
+            @JsonProperty(value = "payExpired")
+            @JSONField(name = "payExpired")
             private Integer payExpired;
-            @JSONField(name="auditStatus")
+            @JsonProperty(value = "auditStatus")
+            @JSONField(name = "auditStatus")
             private String auditStatus;
-            @JSONField(name="enableInd")
+            @JsonProperty(value = "enableInd")
+            @JSONField(name = "enableInd")
             private Integer enableInd;
-            @JSONField(name="officialInd")
+            @JsonProperty(value = "officialInd")
+            @JSONField(name = "officialInd")
             private String officialInd;
-            @JSONField(name="printPlatformFlag")
+            @JsonProperty(value = "printPlatformFlag")
+            @JSONField(name = "printPlatformFlag")
             private String printPlatformFlag;
         }
 
         @NoArgsConstructor
         @Data
         public static class GoodsSalesInfoDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="goodsId")
+            @JsonProperty(value = "goodsId")
+            @JSONField(name = "goodsId")
             private Integer goodsId;
-            @JSONField(name="groupFlag")
+            @JsonProperty(value = "groupFlag")
+            @JSONField(name = "groupFlag")
             private String groupFlag;
-            @JSONField(name="lossRatio")
+            @JsonProperty(value = "lossRatio")
+            @JSONField(name = "lossRatio")
             private Double lossRatio;
-            @JSONField(name="expectedCapacity")
+            @JsonProperty(value = "expectedCapacity")
+            @JSONField(name = "expectedCapacity")
             private Integer expectedCapacity;
-            @JSONField(name="salesLine")
+            @JsonProperty(value = "salesLine")
+            @JSONField(name = "salesLine")
             private String salesLine;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
         }
 
         @NoArgsConstructor
         @Data
         public static class GoodsIntroductionDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="goodsId")
+            @JsonProperty(value = "goodsId")
+            @JSONField(name = "goodsId")
             private Integer goodsId;
         }
 
         @NoArgsConstructor
         @Data
         public static class CheckRepeatDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="chkRepCode")
+            @JsonProperty(value = "chkRepCode")
+            @JSONField(name = "chkRepCode")
             private String chkRepCode;
-            @JSONField(name="chkRepDesc")
+            @JsonProperty(value = "chkRepDesc")
+            @JSONField(name = "chkRepDesc")
             private String chkRepDesc;
-            @JSONField(name="chkType")
+            @JsonProperty(value = "chkType")
+            @JSONField(name = "chkType")
             private String chkType;
-            @JSONField(name="batchInd")
+            @JsonProperty(value = "batchInd")
+            @JSONField(name = "batchInd")
             private String batchInd;
-            @JSONField(name="scopeType")
+            @JsonProperty(value = "scopeType")
+            @JSONField(name = "scopeType")
             private String scopeType;
-            @JSONField(name="cacheType")
+            @JsonProperty(value = "cacheType")
+            @JSONField(name = "cacheType")
             private String cacheType;
-            @JSONField(name="repeatFlag")
+            @JsonProperty(value = "repeatFlag")
+            @JSONField(name = "repeatFlag")
             private String repeatFlag;
-            @JSONField(name="chlRepeatFlag")
+            @JsonProperty(value = "chlRepeatFlag")
+            @JSONField(name = "chlRepeatFlag")
             private String chlRepeatFlag;
-            @JSONField(name="chlCountLimit")
+            @JsonProperty(value = "chlCountLimit")
+            @JSONField(name = "chlCountLimit")
             private Integer chlCountLimit;
-            @JSONField(name="enableInd")
+            @JsonProperty(value = "enableInd")
+            @JSONField(name = "enableInd")
             private Integer enableInd;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
         }
 
         @NoArgsConstructor
         @Data
         public static class CheckInsureDefDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="chkInsureCode")
+            @JsonProperty(value = "chkInsureCode")
+            @JSONField(name = "chkInsureCode")
             private String chkInsureCode;
-            @JSONField(name="chkInsureDesc")
+            @JsonProperty(value = "chkInsureDesc")
+            @JSONField(name = "chkInsureDesc")
             private String chkInsureDesc;
-            @JSONField(name="enableInd")
+            @JsonProperty(value = "enableInd")
+            @JSONField(name = "enableInd")
             private Integer enableInd;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
-            @JSONField(name="checkDate")
+            @JsonProperty(value = "checkDate")
+            @JSONField(name = "checkDate")
             private CheckDateDTO checkDate;
-            @JSONField(name="checkBase")
+            @JsonProperty(value = "checkBase")
+            @JSONField(name = "checkBase")
             private CheckBaseDTO checkBase;
 
             @NoArgsConstructor
             @Data
             public static class CheckDateDTO {
-                @JSONField(name="id")
+                @JsonProperty(value = "id")
+                @JSONField(name = "id")
                 private Integer id;
-                @JSONField(name="chkDateCode")
+                @JsonProperty(value = "chkDateCode")
+                @JSONField(name = "chkDateCode")
                 private String chkDateCode;
-                @JSONField(name="chkDateDesc")
+                @JsonProperty(value = "chkDateDesc")
+                @JSONField(name = "chkDateDesc")
                 private String chkDateDesc;
-                @JSONField(name="chkDateFlag")
+                @JsonProperty(value = "chkDateFlag")
+                @JSONField(name = "chkDateFlag")
                 private String chkDateFlag;
-                @JSONField(name="dateImdFlag")
+                @JsonProperty(value = "dateImdFlag")
+                @JSONField(name = "dateImdFlag")
                 private String dateImdFlag;
-                @JSONField(name="lowerUnit")
+                @JsonProperty(value = "lowerUnit")
+                @JSONField(name = "lowerUnit")
                 private String lowerUnit;
-                @JSONField(name="lower")
+                @JsonProperty(value = "lower")
+                @JSONField(name = "lower")
                 private Integer lower;
-                @JSONField(name="upperUnit")
+                @JsonProperty(value = "upperUnit")
+                @JSONField(name = "upperUnit")
                 private String upperUnit;
-                @JSONField(name="upper")
+                @JsonProperty(value = "upper")
+                @JSONField(name = "upper")
                 private Integer upper;
-                @JSONField(name="startDateFormat")
+                @JsonProperty(value = "startDateFormat")
+                @JSONField(name = "startDateFormat")
                 private String startDateFormat;
-                @JSONField(name="endDateFormat")
+                @JsonProperty(value = "endDateFormat")
+                @JSONField(name = "endDateFormat")
                 private String endDateFormat;
-                @JSONField(name="intervalUnit")
+                @JsonProperty(value = "intervalUnit")
+                @JSONField(name = "intervalUnit")
                 private String intervalUnit;
-                @JSONField(name="invalidFlag")
+                @JsonProperty(value = "invalidFlag")
+                @JSONField(name = "invalidFlag")
                 private Integer invalidFlag;
             }
 
             @NoArgsConstructor
             @Data
             public static class CheckBaseDTO {
-                @JSONField(name="id")
+                @JsonProperty(value = "id")
+                @JSONField(name = "id")
                 private Integer id;
-                @JSONField(name="chkBaseCode")
+                @JsonProperty(value = "chkBaseCode")
+                @JSONField(name = "chkBaseCode")
                 private String chkBaseCode;
-                @JSONField(name="chkBaseDesc")
+                @JsonProperty(value = "chkBaseDesc")
+                @JSONField(name = "chkBaseDesc")
                 private String chkBaseDesc;
-                @JSONField(name="chkPremiumType")
+                @JsonProperty(value = "chkPremiumType")
+                @JSONField(name = "chkPremiumType")
                 private String chkPremiumType;
-                @JSONField(name="invalidFlag")
+                @JsonProperty(value = "invalidFlag")
+                @JSONField(name = "invalidFlag")
                 private Integer invalidFlag;
             }
         }
@@ -207,279 +281,397 @@ public class NonAutoInsResp {
         @NoArgsConstructor
         @Data
         public static class GoodsAgentSalesmanListDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="goodsId")
+            @JsonProperty(value = "goodsId")
+            @JSONField(name = "goodsId")
             private Integer goodsId;
-            @JSONField(name="serialNo")
+            @JsonProperty(value = "serialNo")
+            @JSONField(name = "serialNo")
             private Integer serialNo;
-            @JSONField(name="agentFlag")
+            @JsonProperty(value = "agentFlag")
+            @JSONField(name = "agentFlag")
             private String agentFlag;
-            @JSONField(name="businessSource")
+            @JsonProperty(value = "businessSource")
+            @JSONField(name = "businessSource")
             private String businessSource;
-            @JSONField(name="businessType")
+            @JsonProperty(value = "businessType")
+            @JSONField(name = "businessType")
             private String businessType;
-            @JSONField(name="branchCom")
+            @JsonProperty(value = "branchCom")
+            @JSONField(name = "branchCom")
             private String branchCom;
-            @JSONField(name="branchComName")
+            @JsonProperty(value = "branchComName")
+            @JSONField(name = "branchComName")
             private String branchComName;
-            @JSONField(name="comCode")
+            @JsonProperty(value = "comCode")
+            @JSONField(name = "comCode")
             private String comCode;
-            @JSONField(name="comName")
+            @JsonProperty(value = "comName")
+            @JSONField(name = "comName")
             private String comName;
-            @JSONField(name="salesmanCode")
+            @JsonProperty(value = "salesmanCode")
+            @JSONField(name = "salesmanCode")
             private String salesmanCode;
-            @JSONField(name="salesmanName")
+            @JsonProperty(value = "salesmanName")
+            @JSONField(name = "salesmanName")
             private String salesmanName;
-            @JSONField(name="salesmanPhone")
+            @JsonProperty(value = "salesmanPhone")
+            @JSONField(name = "salesmanPhone")
             private String salesmanPhone;
-            @JSONField(name="salesFlag")
+            @JsonProperty(value = "salesFlag")
+            @JSONField(name = "salesFlag")
             private String salesFlag;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
         }
 
         @NoArgsConstructor
         @Data
         public static class GoodsPrpallConfListDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="goodsId")
+            @JsonProperty(value = "goodsId")
+            @JSONField(name = "goodsId")
             private Integer goodsId;
-            @JSONField(name="confType")
+            @JsonProperty(value = "confType")
+            @JSONField(name = "confType")
             private String confType;
-            @JSONField(name="codInd")
+            @JsonProperty(value = "codInd")
+            @JSONField(name = "codInd")
             private String codInd;
-            @JSONField(name="underwritingType")
+            @JsonProperty(value = "underwritingType")
+            @JSONField(name = "underwritingType")
             private String underwritingType;
-            @JSONField(name="issueWay")
+            @JsonProperty(value = "issueWay")
+            @JSONField(name = "issueWay")
             private String issueWay;
-            @JSONField(name="officialInd")
+            @JsonProperty(value = "officialInd")
+            @JSONField(name = "officialInd")
             private String officialInd;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
         }
 
         @NoArgsConstructor
         @Data
         public static class ChannelContactListDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="comCode")
+            @JsonProperty(value = "comCode")
+            @JSONField(name = "comCode")
             private String comCode;
-            @JSONField(name="comName")
+            @JsonProperty(value = "comName")
+            @JSONField(name = "comName")
             private String comName;
-            @JSONField(name="channelCode")
+            @JsonProperty(value = "channelCode")
+            @JSONField(name = "channelCode")
             private String channelCode;
-            @JSONField(name="channelName")
+            @JsonProperty(value = "channelName")
+            @JSONField(name = "channelName")
             private String channelName;
-            @JSONField(name="channelDesc")
+            @JsonProperty(value = "channelDesc")
+            @JSONField(name = "channelDesc")
             private String channelDesc;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
-            @JSONField(name="demandNo")
+            @JsonProperty(value = "demandNo")
+            @JSONField(name = "demandNo")
             private String demandNo;
         }
 
         @NoArgsConstructor
         @Data
         public static class ProdListDTO {
-            @JSONField(name="id")
+            @JsonProperty(value = "id")
+            @JSONField(name = "id")
             private Integer id;
-            @JSONField(name="prodCode")
+            @JsonProperty(value = "prodCode")
+            @JSONField(name = "prodCode")
             private String prodCode;
-            @JSONField(name="prodCName")
+            @JsonProperty(value = "prodCName")
+            @JSONField(name = "prodCName")
             private String prodCName;
-            @JSONField(name="prodVersion")
+            @JsonProperty(value = "prodVersion")
+            @JSONField(name = "prodVersion")
             private String prodVersion;
-            @JSONField(name="freeInsurance")
+            @JsonProperty(value = "freeInsurance")
+            @JSONField(name = "freeInsurance")
             private String freeInsurance;
-            @JSONField(name="prodCategory")
+            @JsonProperty(value = "prodCategory")
+            @JSONField(name = "prodCategory")
             private String prodCategory;
-            @JSONField(name="prodType")
+            @JsonProperty(value = "prodType")
+            @JSONField(name = "prodType")
             private String prodType;
-            @JSONField(name="standardProdInd")
+            @JsonProperty(value = "standardProdInd")
+            @JSONField(name = "standardProdInd")
             private String standardProdInd;
-            @JSONField(name="prodRisk")
+            @JsonProperty(value = "prodRisk")
+            @JSONField(name = "prodRisk")
             private String prodRisk;
-            @JSONField(name="prodLine")
+            @JsonProperty(value = "prodLine")
+            @JSONField(name = "prodLine")
             private String prodLine;
-            @JSONField(name="diyProdInd")
+            @JsonProperty(value = "diyProdInd")
+            @JSONField(name = "diyProdInd")
             private String diyProdInd;
-            @JSONField(name="rescueInd")
+            @JsonProperty(value = "rescueInd")
+            @JSONField(name = "rescueInd")
             private String rescueInd;
-            @JSONField(name="acciInd")
+            @JsonProperty(value = "acciInd")
+            @JSONField(name = "acciInd")
             private String acciInd;
-            @JSONField(name="reinInd")
+            @JsonProperty(value = "reinInd")
+            @JSONField(name = "reinInd")
             private String reinInd;
-            @JSONField(name="coinsInd")
+            @JsonProperty(value = "coinsInd")
+            @JSONField(name = "coinsInd")
             private String coinsInd;
-            @JSONField(name="mnemonicCode")
+            @JsonProperty(value = "mnemonicCode")
+            @JSONField(name = "mnemonicCode")
             private String mnemonicCode;
-            @JSONField(name="repeatCode")
+            @JsonProperty(value = "repeatCode")
+            @JSONField(name = "repeatCode")
             private String repeatCode;
-            @JSONField(name="prodStatus")
+            @JsonProperty(value = "prodStatus")
+            @JSONField(name = "prodStatus")
             private String prodStatus;
-            @JSONField(name="premium")
+            @JsonProperty(value = "premium")
+            @JSONField(name = "premium")
             private Integer premium;
-            @JSONField(name="amount")
+            @JsonProperty(value = "amount")
+            @JSONField(name = "amount")
             private Integer amount;
-            @JSONField(name="auditStatus")
+            @JsonProperty(value = "auditStatus")
+            @JSONField(name = "auditStatus")
             private String auditStatus;
-            @JSONField(name="enableInd")
+            @JsonProperty(value = "enableInd")
+            @JSONField(name = "enableInd")
             private Integer enableInd;
-            @JSONField(name="invalidFlag")
+            @JsonProperty(value = "invalidFlag")
+            @JSONField(name = "invalidFlag")
             private Integer invalidFlag;
-            @JSONField(name="prodRiskList")
+            @JsonProperty(value = "prodRiskList")
+            @JSONField(name = "prodRiskList")
             private List<ProdRiskListDTO> prodRiskList;
-            @JSONField(name="technologyInd")
+            @JsonProperty(value = "technologyInd")
+            @JSONField(name = "technologyInd")
             private String technologyInd;
 
             @NoArgsConstructor
             @Data
             public static class ProdRiskListDTO {
-                @JSONField(name="id")
+                @JsonProperty(value = "id")
+                @JSONField(name = "id")
                 private Integer id;
-                @JSONField(name="prodId")
+                @JsonProperty(value = "prodId")
+                @JSONField(name = "prodId")
                 private Integer prodId;
-                @JSONField(name="riskCode")
+                @JsonProperty(value = "riskCode")
+                @JSONField(name = "riskCode")
                 private String riskCode;
-                @JSONField(name="riskName")
+                @JsonProperty(value = "riskName")
+                @JSONField(name = "riskName")
                 private String riskName;
-                @JSONField(name="requiredRisk")
+                @JsonProperty(value = "requiredRisk")
+                @JSONField(name = "requiredRisk")
                 private String requiredRisk;
-                @JSONField(name="calcType")
+                @JsonProperty(value = "calcType")
+                @JSONField(name = "calcType")
                 private String calcType;
-                @JSONField(name="displayNo")
+                @JsonProperty(value = "displayNo")
+                @JSONField(name = "displayNo")
                 private Integer displayNo;
-                @JSONField(name="invalidFlag")
+                @JsonProperty(value = "invalidFlag")
+                @JSONField(name = "invalidFlag")
                 private Integer invalidFlag;
-                @JSONField(name="prodCvgList")
+                @JsonProperty(value = "prodCvgList")
+                @JSONField(name = "prodCvgList")
                 private List<ProdCvgListDTO> prodCvgList;
-                @JSONField(name="prodEngageList")
+                @JsonProperty(value = "prodEngageList")
+                @JSONField(name = "prodEngageList")
                 private List<ProdEngageListDTO> prodEngageList;
-                @JSONField(name="prodClauseList")
+                @JsonProperty(value = "prodClauseList")
+                @JSONField(name = "prodClauseList")
                 private List<ProdClauseListDTO> prodClauseList;
-                @JSONField(name="prodCvgLiabList")
+                @JsonProperty(value = "prodCvgLiabList")
+                @JSONField(name = "prodCvgLiabList")
                 private List<ProdCvgLiabListDTO> prodCvgLiabList;
 
                 @NoArgsConstructor
                 @Data
                 public static class ProdCvgListDTO {
-                    @JSONField(name="id")
+                    @JsonProperty(value = "id")
+                    @JSONField(name = "id")
                     private Integer id;
-                    @JSONField(name="prodId")
+                    @JsonProperty(value = "prodId")
+                    @JSONField(name = "prodId")
                     private Integer prodId;
-                    @JSONField(name="prodRiskId")
+                    @JsonProperty(value = "prodRiskId")
+                    @JSONField(name = "prodRiskId")
                     private Integer prodRiskId;
-                    @JSONField(name="serialNo")
+                    @JsonProperty(value = "serialNo")
+                    @JSONField(name = "serialNo")
                     private Integer serialNo;
-                    @JSONField(name="cvgCode")
+                    @JsonProperty(value = "cvgCode")
+                    @JSONField(name = "cvgCode")
                     private String cvgCode;
-                    @JSONField(name="cvgName")
+                    @JsonProperty(value = "cvgName")
+                    @JSONField(name = "cvgName")
                     private String cvgName;
-                    @JSONField(name="cvgFlag")
+                    @JsonProperty(value = "cvgFlag")
+                    @JSONField(name = "cvgFlag")
                     private String cvgFlag;
-                    @JSONField(name="requiredCvg")
+                    @JsonProperty(value = "requiredCvg")
+                    @JSONField(name = "requiredCvg")
                     private String requiredCvg;
-                    @JSONField(name="calculateInd")
+                    @JsonProperty(value = "calculateInd")
+                    @JSONField(name = "calculateInd")
                     private String calculateInd;
-                    @JSONField(name="currency")
+                    @JsonProperty(value = "currency")
+                    @JSONField(name = "currency")
                     private String currency;
-                    @JSONField(name="premium")
+                    @JsonProperty(value = "premium")
+                    @JSONField(name = "premium")
                     private Integer premium;
-                    @JSONField(name="amount")
+                    @JsonProperty(value = "amount")
+                    @JSONField(name = "amount")
                     private Integer amount;
-                    @JSONField(name="rate")
+                    @JsonProperty(value = "rate")
+                    @JSONField(name = "rate")
                     private Integer rate;
-                    @JSONField(name="invalidFlag")
+                    @JsonProperty(value = "invalidFlag")
+                    @JSONField(name = "invalidFlag")
                     private Integer invalidFlag;
                 }
 
                 @NoArgsConstructor
                 @Data
                 public static class ProdEngageListDTO {
-                    @JSONField(name="id")
+                    @JsonProperty(value = "id")
+                    @JSONField(name = "id")
                     private Integer id;
-                    @JSONField(name="prodId")
+                    @JsonProperty(value = "prodId")
+                    @JSONField(name = "prodId")
                     private Integer prodId;
-                    @JSONField(name="prodRiskId")
+                    @JsonProperty(value = "prodRiskId")
+                    @JSONField(name = "prodRiskId")
                     private Integer prodRiskId;
-                    @JSONField(name="serialNo")
+                    @JsonProperty(value = "serialNo")
+                    @JSONField(name = "serialNo")
                     private Integer serialNo;
-                    @JSONField(name="engageCode")
+                    @JsonProperty(value = "engageCode")
+                    @JSONField(name = "engageCode")
                     private String engageCode;
-                    @JSONField(name="engageName")
+                    @JsonProperty(value = "engageName")
+                    @JSONField(name = "engageName")
                     private String engageName;
-                    @JSONField(name="engageContext")
+                    @JsonProperty(value = "engageContext")
+                    @JSONField(name = "engageContext")
                     private String engageContext;
-                    @JSONField(name="boldInd")
+                    @JsonProperty(value = "boldInd")
+                    @JSONField(name = "boldInd")
                     private String boldInd;
-                    @JSONField(name="invalidFlag")
+                    @JsonProperty(value = "invalidFlag")
+                    @JSONField(name = "invalidFlag")
                     private Integer invalidFlag;
                 }
 
                 @NoArgsConstructor
                 @Data
                 public static class ProdClauseListDTO {
-                    @JSONField(name="id")
+                    @JsonProperty(value = "id")
+                    @JSONField(name = "id")
                     private Integer id;
-                    @JSONField(name="prodId")
+                    @JsonProperty(value = "prodId")
+                    @JSONField(name = "prodId")
                     private Integer prodId;
-                    @JSONField(name="prodRiskId")
+                    @JsonProperty(value = "prodRiskId")
+                    @JSONField(name = "prodRiskId")
                     private Integer prodRiskId;
-                    @JSONField(name="prodCvgId")
+                    @JsonProperty(value = "prodCvgId")
+                    @JSONField(name = "prodCvgId")
                     private Integer prodCvgId;
-                    @JSONField(name="serialNo")
+                    @JsonProperty(value = "serialNo")
+                    @JSONField(name = "serialNo")
                     private Integer serialNo;
-                    @JSONField(name="displayNo")
+                    @JsonProperty(value = "displayNo")
+                    @JSONField(name = "displayNo")
                     private Integer displayNo;
-                    @JSONField(name="clauseCode")
+                    @JsonProperty(value = "clauseCode")
+                    @JSONField(name = "clauseCode")
                     private String clauseCode;
-                    @JSONField(name="clauseName")
+                    @JsonProperty(value = "clauseName")
+                    @JSONField(name = "clauseName")
                     private String clauseName;
-                    @JSONField(name="clauseFileName")
+                    @JsonProperty(value = "clauseFileName")
+                    @JSONField(name = "clauseFileName")
                     private String clauseFileName;
-                    @JSONField(name="clauseFilePath")
+                    @JsonProperty(value = "clauseFilePath")
+                    @JSONField(name = "clauseFilePath")
                     private String clauseFilePath;
-                    @JSONField(name="invalidFlag")
+                    @JsonProperty(value = "invalidFlag")
+                    @JSONField(name = "invalidFlag")
                     private Integer invalidFlag;
-                    @JSONField(name="cvgCode")
+                    @JsonProperty(value = "cvgCode")
+                    @JSONField(name = "cvgCode")
                     private String cvgCode;
                 }
 
                 @NoArgsConstructor
                 @Data
                 public static class ProdCvgLiabListDTO {
-                    @JSONField(name="id")
+                    @JsonProperty(value = "id")
+                    @JSONField(name = "id")
                     private Integer id;
-                    @JSONField(name="prodId")
+                    @JsonProperty(value = "prodId")
+                    @JSONField(name = "prodId")
                     private Integer prodId;
-                    @JSONField(name="prodCvgId")
+                    @JsonProperty(value = "prodCvgId")
+                    @JSONField(name = "prodCvgId")
                     private Integer prodCvgId;
-                    @JSONField(name="prodCvgCode")
+                    @JsonProperty(value = "prodCvgCode")
+                    @JSONField(name = "prodCvgCode")
                     private String prodCvgCode;
-                    @JSONField(name="serialNo")
+                    @JsonProperty(value = "serialNo")
+                    @JSONField(name = "serialNo")
                     private Integer serialNo;
-                    @JSONField(name="liabCode")
+                    @JsonProperty(value = "liabCode")
+                    @JSONField(name = "liabCode")
                     private String liabCode;
-                    @JSONField(name="liabName")
+                    @JsonProperty(value = "liabName")
+                    @JSONField(name = "liabName")
                     private String liabName;
-                    @JSONField(name="requiredLiab")
+                    @JsonProperty(value = "requiredLiab")
+                    @JSONField(name = "requiredLiab")
                     private String requiredLiab;
-                    @JSONField(name="liabCalculateInd")
+                    @JsonProperty(value = "liabCalculateInd")
+                    @JSONField(name = "liabCalculateInd")
                     private String liabCalculateInd;
-                    @JSONField(name="currency")
+                    @JsonProperty(value = "currency")
+                    @JSONField(name = "currency")
                     private String currency;
-                    @JSONField(name="liabPremium")
+                    @JsonProperty(value = "liabPremium")
+                    @JSONField(name = "liabPremium")
                     private Integer liabPremium;
-                    @JSONField(name="liabAmount")
+                    @JsonProperty(value = "liabAmount")
+                    @JSONField(name = "liabAmount")
                     private Integer liabAmount;
-                    @JSONField(name="liabRate")
+                    @JsonProperty(value = "liabRate")
+                    @JSONField(name = "liabRate")
                     private Integer liabRate;
-                    @JSONField(name="unit")
+                    @JsonProperty(value = "unit")
+                    @JSONField(name = "unit")
                     private String unit;
-                    @JSONField(name="invalidFlag")
+                    @JsonProperty(value = "invalidFlag")
+                    @JSONField(name = "invalidFlag")
                     private Integer invalidFlag;
                 }
             }
@@ -487,5 +679,4 @@ public class NonAutoInsResp {
     }
 
 
-
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/PayReq.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
@@ -12,7 +13,7 @@ import java.util.List;
 
 
 /**
- *  支付   入参
+ * 支付   入参
  *
  * @author: lig
  * @date: 2023年08月23日 0023
@@ -22,23 +23,32 @@ import java.util.List;
 public class PayReq {
 
 
-    @JSONField(name="proposalNo")
+    @JsonProperty(value = "proposalNo")
+    @JSONField(name = "proposalNo")
     private List<String> proposalNo;
-    @JSONField(name="channelFlag")
+    @JsonProperty(value = "channelFlag")
+    @JSONField(name = "channelFlag")
     private String channelFlag;
-    @JSONField(name="amount")
+    @JsonProperty(value = "amount")
+    @JSONField(name = "amount")
     private Double amount;
-    @JSONField(name="riskType")
+    @JsonProperty(value = "riskType")
+    @JSONField(name = "riskType")
     private String riskType;
-    @JSONField(name="redirectUrl")
+    @JsonProperty(value = "redirectUrl")
+    @JSONField(name = "redirectUrl")
     private String redirectUrl;
-    @JSONField(name="comCode")
+    @JsonProperty(value = "comCode")
+    @JSONField(name = "comCode")
     private String comCode;
-    @JSONField(name="verificationCode")
+    @JsonProperty(value = "verificationCode")
+    @JSONField(name = "verificationCode")
     private String verificationCode;
-    @JSONField(name="productCode")
+    @JsonProperty(value = "productCode")
+    @JSONField(name = "productCode")
     private String productCode;
-    @JSONField(name="orderCode")
+    @JsonProperty(value = "orderCode")
+    @JSONField(name = "orderCode")
     private String orderCode;
 
     @JsonIgnore
@@ -49,10 +59,10 @@ public class PayReq {
         List<String> proposalNoList = new ArrayList<>();
         String ciStr = iac.getJqapplyno();
         String biStr = iac.getSyapplyno();
-        if(StringUtils.isNotEmpty(ciStr)){
+        if (StringUtils.isNotEmpty(ciStr)) {
             proposalNoList.add(ciStr);
         }
-        if(StringUtils.isNotEmpty(biStr)){
+        if (StringUtils.isNotEmpty(biStr)) {
             proposalNoList.add(biStr);
         }
         req.setProposalNo(proposalNoList);
@@ -70,7 +80,6 @@ public class PayReq {
 //        req.setOrderCode();
 
 
-
         return req;
 
     }

src/main/java/com/ydtech/modules/ins/model/guoRen/PayResp.java

@@ -1,12 +1,13 @@
 package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 
 /**
- *  支付   出参
+ * 支付   出参
  *
  * @author: lig
  * @date: 2023-08-23
@@ -16,25 +17,33 @@ import lombok.NoArgsConstructor;
 public class PayResp {
 
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="orderId")
+        @JsonProperty(value = "orderId")
+        @JSONField(name = "orderId")
         private String orderId;
-        @JSONField(name="payUrl")
+        @JsonProperty(value = "payUrl")
+        @JSONField(name = "payUrl")
         private String payUrl;
-        @JSONField(name="resultCode")
+        @JsonProperty(value = "resultCode")
+        @JSONField(name = "resultCode")
         private String resultCode;
-        @JSONField(name="signmsg")
+        @JsonProperty(value = "signmsg")
+        @JSONField(name = "signmsg")
         private String signmsg;
-        @JSONField(name="basePicture")
+        @JsonProperty(value = "basePicture")
+        @JSONField(name = "basePicture")
         private String basePicture;
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/PolicyResp.java

@@ -5,11 +5,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 
 /**
- *  保单   出参
+ * 保单   出参
  *
  * @author: lig
  * @date: 2023-08-23
@@ -19,11 +17,14 @@ import java.util.List;
 public class PolicyResp {
 
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private String data;
 
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/PremiumReq.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.ins.model.guoRen;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsurKind;
@@ -11,19 +12,15 @@ import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.InsUtils;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.http.client.utils.DateUtils;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 
 /**
@@ -34,330 +31,19 @@ import java.util.Optional;
 public class PremiumReq {
 
 
-    @JsonProperty("ci")
+    @JsonProperty(value = "ci")
+    @JSONField(name = "ci")
     private CiDTO ci;
-    @JsonProperty("bi")
+    @JsonProperty(value = "bi")
+    @JSONField(name = "bi")
     private BiDTO bi;
-    @JsonProperty("actualValue")
+    @JsonProperty(value = "actualValue")
+    @JSONField(name = "actualValue")
     private String actualValue;
-    @JsonProperty("uuid")
+    @JsonProperty(value = "uuid")
+    @JSONField(name = "uuid")
     private String uuid;
 
-    @NoArgsConstructor
-    @Data
-    public static class CiDTO {
-        @JsonProperty("prpTrenewal")
-        private List<?> prpTrenewal;
-        @JsonProperty("prpTitemCar")
-        private PrpTitemCarDTO prpTitemCar;
-        @JsonProperty("prpTmain")
-        private PrpTmainDTO prpTmain;
-        @JsonProperty("inputRisk")
-        private String inputRisk;
-        @JsonProperty("prptitemkindList")
-        private List<PrptitemkindListDTO> prptitemkindList;
-        @JsonProperty("calculateFlagCI")
-        private String calculateFlagCI;
-        @JsonProperty("ciInsureDemand")
-        private CiInsureDemandDTO ciInsureDemand;
-        @JsonProperty("editType")
-        private String editType;
-        @JsonProperty("prpTmainRate")
-        private PrpTmainRateDTO prpTmainRate;
-        @JsonProperty("prpTcarshipTax")
-        private PrpTcarshipTaxDTO prpTcarshipTax;
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTitemCarDTO {
-            @JsonProperty("clauseTypeSystem")
-            private String clauseTypeSystem;
-            @JsonProperty("clauseType")
-            private String clauseType;
-            @JsonProperty("termsSystem")
-            private String termsSystem;
-            @JsonProperty("carOwner")
-            private String carOwner;
-            @JsonProperty("otherNature")
-            private String otherNature;
-            @JsonProperty("carOwnerIdentifyNumber")
-            private String carOwnerIdentifyNumber;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainDTO {
-            @JsonProperty("endDate")
-            private String endDate;
-            @JsonProperty("noCarFlag")
-            private String noCarFlag;
-            @JsonProperty("immeValiFlag")
-            private String immeValiFlag;
-            @JsonProperty("signDate")
-            private String signDate;
-            @JsonProperty("inputDate")
-            private String inputDate;
-            @JsonProperty("endHour")
-            private String endHour;
-            @JsonProperty("immeValidEndDate")
-            private String immeValidEndDate;
-            @JsonProperty("answer")
-            private String answer;
-            @JsonProperty("startHour")
-            private String startHour;
-            @JsonProperty("orderFlag")
-            private String orderFlag;
-            @JsonProperty("immeValidStartDate")
-            private String immeValidStartDate;
-            @JsonProperty("simpleOrderFlag")
-            private String simpleOrderFlag;
-            @JsonProperty("startDate")
-            private String startDate;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class CiInsureDemandDTO {
-            @JsonProperty("demandNo")
-            private String demandNo;
-
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainRateDTO {
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTcarshipTaxDTO {
-            @JsonProperty("taxRelifFlag")
-            private String taxRelifFlag;
-            @JsonProperty("paidCertificate")
-            private String paidCertificate;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrptitemkindListDTO {
-            @JsonProperty("amount")
-            private String amount;
-            @JsonProperty("kindCode")
-            private String kindCode;
-            @JsonProperty("flag")
-            private String flag;
-            @JsonProperty("endDate")
-            private String endDate;
-            @JsonProperty("isDeductible")
-            private String isDeductible;
-            @JsonProperty("rate")
-            private String rate;
-            @JsonProperty("deductible")
-            private String deductible;
-            @JsonProperty("kindName")
-            private String kindName;
-            @JsonProperty("taxFee")
-            private String taxFee;
-            @JsonProperty("noTaxPremium")
-            private String noTaxPremium;
-            @JsonProperty("startDate")
-            private String startDate;
-        }
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class BiDTO {
-        @JsonProperty("prpTrenewal")
-        private List<?> prpTrenewal;
-        @JsonProperty("prptengageList")
-        private List<?> prptengageList;
-        @JsonProperty("prpTitemCar")
-        private PrpTitemCarDTO prpTitemCar;
-        @JsonProperty("prpTmain")
-        private PrpTmainDTO prpTmain;
-        @JsonProperty("inputRisk")
-        private String inputRisk;
-        @JsonProperty("calculateFlagBI")
-        private String calculateFlagBI;
-        @JsonProperty("prptitemkindList")
-        private List<PrptitemkindListDTO> prptitemkindList;
-        @JsonProperty("ciInsureDemand")
-        private CiInsureDemandDTO ciInsureDemand;
-        @JsonProperty("prpTChargingPostDataList")
-        private List<?> prpTChargingPostDataList;
-        @JsonProperty("ciInsureDemandPay")
-        private List<?> ciInsureDemandPay;
-        @JsonProperty("editType")
-        private String editType;
-        @JsonProperty("ciInsureDemandWarningClaim")
-        private List<?> ciInsureDemandWarningClaim;
-        @JsonProperty("prpTmainRate")
-        private PrpTmainRateDTO prpTmainRate;
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTitemCarDTO {
-
-
-            /**
-             * 商业险体系
-             * 2020综改-04，新能源-05
-             */
-            @JsonProperty("termsSystem")
-            private String termsSystem;
-
-            /**
-             * 条款体系
-             * 商业险家庭自用对应F54，
-             */
-            @JsonProperty("clauseType")
-            private String clauseType;
-
-            /**
-             * 输入标志
-             * 选了对应险种传1，否则传0
-             */
-            @JsonProperty("inputRisk")
-            private String inputRisk;
-
-            /**
-             * 保费计算标志
-             * 选了对应险种传1，否则传0
-             */
-            @JsonProperty("calculateFlagBI")
-            private String calculateFlagBI;
-
-            /**
-             * 理赔对象
-             * 默认传空
-             */
-            @JsonProperty("ciInsureDemandPay")
-            private List ciInsureDemandPay;
-
-            /**
-             * 风险警示信息对象
-             * 默认传空
-             */
-            @JsonProperty("ciInsureDemandWarningClaim")
-            private List ciInsureDemandWarningClaim;
-
-            /**
-             * 续保对象
-             * 默认传空
-             */
-            @JsonProperty("prpTrenewal")
-            private String prpTrenewal;
-
-            /**
-             * 特别约定对象
-             * 默认传空
-             */
-            @JsonProperty("prptengageList")
-            private String prptengageList;
-
-            /**
-             * 费率对象
-             * 默认传空
-             */
-            @JsonProperty("prpTmainRate")
-            private String prpTmainRate;
-
-            /**
-             * 电池类型
-             * 上海必传
-             */
-            @JsonProperty("pureElectricBatteryType")
-            private String pureElectricBatteryType;
-
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainDTO {
-            @JsonProperty("endDate")
-            private String endDate;
-            @JsonProperty("noCarFlag")
-            private String noCarFlag;
-            @JsonProperty("immeValiFlag")
-            private String immeValiFlag;
-            @JsonProperty("feeandDiscountFlag")
-            private String feeandDiscountFlag;
-            @JsonProperty("signDate")
-            private String signDate;
-            @JsonProperty("inputDate")
-            private String inputDate;
-            @JsonProperty("expectDiscount")
-            private String expectDiscount;
-            @JsonProperty("endHour")
-            private String endHour;
-            @JsonProperty("immeValidEndDate")
-            private String immeValidEndDate;
-            @JsonProperty("answer")
-            private String answer;
-            @JsonProperty("startHour")
-            private String startHour;
-            @JsonProperty("orderFlag")
-            private String orderFlag;
-            @JsonProperty("immeValidStartDate")
-            private String immeValidStartDate;
-            @JsonProperty("simpleOrderFlag")
-            private String simpleOrderFlag;
-            @JsonProperty("startDate")
-            private String startDate;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class CiInsureDemandDTO {
-            @JsonProperty("demandNo")
-            private String demandNo;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrpTmainRateDTO {
-            @JsonProperty("demandNo")
-            private String demandNo;
-        }
-
-        @NoArgsConstructor
-        @Data
-        public static class PrptitemkindListDTO {
-            @JsonProperty("amount")
-            private String amount;
-            @JsonProperty("kindCode")
-            private String kindCode;
-            @JsonProperty("quantity")
-            private String quantity;
-            @JsonProperty("flag")
-            private String flag;
-            @JsonProperty("endDate")
-            private String endDate;
-            @JsonProperty("mainKindFlag")
-            private String mainKindFlag;
-            @JsonProperty("isDeductible")
-            private String isDeductible;
-            @JsonProperty("rate")
-            private String rate;
-            @JsonProperty("modeCode")
-            private String modeCode;
-            @JsonProperty("deductible")
-            private String deductible;
-            @JsonProperty("kindName")
-            private String kindName;
-            @JsonProperty("checked")
-            private String checked;
-            @JsonProperty("unitAmount")
-            private String unitAmount;
-            @JsonProperty("itemKindNo")
-            private String itemKindNo;
-            @JsonProperty("startDate")
-            private String startDate;
-        }
-    }
-
-
     /**
      * 构造保费计算请求参数
      *
@@ -412,7 +98,6 @@ public class PremiumReq {
 
     }
 
-
     /**
      * 构造 交强险
      *
@@ -467,9 +152,9 @@ public class PremiumReq {
             //即时起保标识	immeValiFlag	字符串	N	即时起保必传1
             ciPrpTmain.setImmeValiFlag(cidd.isForthwith() ? "1" : "");
             //即时终保时间	immeValidEndDate	字符串	N	即时起保必传
-            ciPrpTmain.setImmeValidStartDate(cidd.isForthwith() ?cidd.getStartDate():"");
+            ciPrpTmain.setImmeValidStartDate(cidd.isForthwith() ? cidd.getStartDate() : "");
             //即时终保时间	immeValidEndDate	字符串	N	即时起保必传 （YYYY-MM-DD HH:MM:SS）
-            ciPrpTmain.setImmeValidEndDate(cidd.isForthwith() ?cidd.getEndDate():"");
+            ciPrpTmain.setImmeValidEndDate(cidd.isForthwith() ? cidd.getEndDate() : "");
 
 
             //非车标识      车+非车必传:1
@@ -526,7 +211,6 @@ public class PremiumReq {
         return ciDto;
     }
 
-
     /**
      * 构造 商业险
      *
@@ -559,7 +243,6 @@ public class PremiumReq {
         biPrpTmain.setImmeValidEndDate("");
 
 
-
         /**
          * 车辆信息对象
          */
@@ -638,7 +321,6 @@ public class PremiumReq {
         return biDto;
     }
 
-
     private static List<BiDTO.PrptitemkindListDTO> buildBiKindList(List<KindInfoVo> kindInfoVList, CarPriceResp.DataDTO carPriceResult, RiskInfoVo biRiskInfo, VinQueryResp.DataDTO vinQ) {
         List<BiDTO.PrptitemkindListDTO> prptitemkindList = new ArrayList<>();
         kindInfoVList.stream().forEach(k -> {
@@ -848,6 +530,418 @@ public class PremiumReq {
         return prptitemkindList;
 
     }
+
+    @NoArgsConstructor
+    @Data
+    public static class CiDTO {
+        @JsonProperty(value = "prpTrenewal")
+        @JSONField(name = "prpTrenewal")
+        private List<?> prpTrenewal;
+        @JsonProperty(value = "prpTitemCar")
+        @JSONField(name = "prpTitemCar")
+        private PrpTitemCarDTO prpTitemCar;
+        @JsonProperty(value = "prpTmain")
+        @JSONField(name = "prpTmain")
+        private PrpTmainDTO prpTmain;
+        @JsonProperty(value = "inputRisk")
+        @JSONField(name = "inputRisk")
+        private String inputRisk;
+        @JsonProperty(value = "prptitemkindList")
+        @JSONField(name = "prptitemkindList")
+        private List<PrptitemkindListDTO> prptitemkindList;
+        @JsonProperty(value = "calculateFlagCI")
+        @JSONField(name = "calculateFlagCI")
+        private String calculateFlagCI;
+        @JsonProperty(value = "ciInsureDemand")
+        @JSONField(name = "ciInsureDemand")
+        private CiInsureDemandDTO ciInsureDemand;
+        @JsonProperty(value = "editType")
+        @JSONField(name = "editType")
+        private String editType;
+        @JsonProperty(value = "prpTmainRate")
+        @JSONField(name = "prpTmainRate")
+        private PrpTmainRateDTO prpTmainRate;
+        @JsonProperty(value = "prpTcarshipTax")
+        @JSONField(name = "prpTcarshipTax")
+        private PrpTcarshipTaxDTO prpTcarshipTax;
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTitemCarDTO {
+            @JsonProperty(value = "clauseTypeSystem")
+            @JSONField(name = "clauseTypeSystem")
+            private String clauseTypeSystem;
+            @JsonProperty(value = "clauseType")
+            @JSONField(name = "clauseType")
+            private String clauseType;
+            @JsonProperty(value = "termsSystem")
+            @JSONField(name = "termsSystem")
+            private String termsSystem;
+            @JsonProperty(value = "carOwner")
+            @JSONField(name = "carOwner")
+            private String carOwner;
+            @JsonProperty(value = "otherNature")
+            @JSONField(name = "otherNature")
+            private String otherNature;
+            @JsonProperty(value = "carOwnerIdentifyNumber")
+            @JSONField(name = "carOwnerIdentifyNumber")
+            private String carOwnerIdentifyNumber;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTmainDTO {
+            @JsonProperty(value = "endDate")
+            @JSONField(name = "endDate")
+            private String endDate;
+            @JsonProperty(value = "noCarFlag")
+            @JSONField(name = "noCarFlag")
+            private String noCarFlag;
+            @JsonProperty(value = "immeValiFlag")
+            @JSONField(name = "immeValiFlag")
+            private String immeValiFlag;
+            @JsonProperty(value = "signDate")
+            @JSONField(name = "signDate")
+            private String signDate;
+            @JsonProperty(value = "inputDate")
+            @JSONField(name = "inputDate")
+            private String inputDate;
+            @JsonProperty(value = "endHour")
+            @JSONField(name = "endHour")
+            private String endHour;
+            @JsonProperty(value = "immeValidEndDate")
+            @JSONField(name = "immeValidEndDate")
+            private String immeValidEndDate;
+            @JsonProperty(value = "answer")
+            @JSONField(name = "answer")
+            private String answer;
+            @JsonProperty(value = "startHour")
+            @JSONField(name = "startHour")
+            private String startHour;
+            @JsonProperty(value = "orderFlag")
+            @JSONField(name = "orderFlag")
+            private String orderFlag;
+            @JsonProperty(value = "immeValidStartDate")
+            @JSONField(name = "immeValidStartDate")
+            private String immeValidStartDate;
+            @JsonProperty(value = "simpleOrderFlag")
+            @JSONField(name = "simpleOrderFlag")
+            private String simpleOrderFlag;
+            @JsonProperty(value = "startDate")
+            @JSONField(name = "startDate")
+            private String startDate;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class CiInsureDemandDTO {
+            @JsonProperty(value = "demandNo")
+            @JSONField(name = "demandNo")
+            private String demandNo;
+
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTmainRateDTO {
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTcarshipTaxDTO {
+            @JsonProperty(value = "taxRelifFlag")
+            @JSONField(name = "taxRelifFlag")
+            private String taxRelifFlag;
+            @JsonProperty(value = "paidCertificate")
+            @JSONField(name = "paidCertificate")
+            private String paidCertificate;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrptitemkindListDTO {
+            @JsonProperty(value = "amount")
+            @JSONField(name = "amount")
+            private String amount;
+            @JsonProperty(value = "kindCode")
+            @JSONField(name = "kindCode")
+            private String kindCode;
+            @JsonProperty(value = "flag")
+            @JSONField(name = "flag")
+            private String flag;
+            @JsonProperty(value = "endDate")
+            @JSONField(name = "endDate")
+            private String endDate;
+            @JsonProperty(value = "isDeductible")
+            @JSONField(name = "isDeductible")
+            private String isDeductible;
+            @JsonProperty(value = "rate")
+            @JSONField(name = "rate")
+            private String rate;
+            @JsonProperty(value = "deductible")
+            @JSONField(name = "deductible")
+            private String deductible;
+            @JsonProperty(value = "kindName")
+            @JSONField(name = "kindName")
+            private String kindName;
+            @JsonProperty(value = "taxFee")
+            @JSONField(name = "taxFee")
+            private String taxFee;
+            @JsonProperty(value = "noTaxPremium")
+            @JSONField(name = "noTaxPremium")
+            private String noTaxPremium;
+            @JsonProperty(value = "startDate")
+            @JSONField(name = "startDate")
+            private String startDate;
+        }
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class BiDTO {
+        @JsonProperty(value = "prpTrenewal")
+        @JSONField(name = "prpTrenewal")
+        private List<?> prpTrenewal;
+        @JsonProperty(value = "prptengageList")
+        @JSONField(name = "prptengageList")
+        private List<?> prptengageList;
+        @JsonProperty(value = "prpTitemCar")
+        @JSONField(name = "prpTitemCar")
+        private PrpTitemCarDTO prpTitemCar;
+        @JsonProperty(value = "prpTmain")
+        @JSONField(name = "prpTmain")
+        private PrpTmainDTO prpTmain;
+        @JsonProperty(value = "inputRisk")
+        @JSONField(name = "inputRisk")
+        private String inputRisk;
+        @JsonProperty(value = "calculateFlagBI")
+        @JSONField(name = "calculateFlagBI")
+        private String calculateFlagBI;
+        @JsonProperty(value = "prptitemkindList")
+        @JSONField(name = "prptitemkindList")
+        private List<PrptitemkindListDTO> prptitemkindList;
+        @JsonProperty(value = "ciInsureDemand")
+        @JSONField(name = "ciInsureDemand")
+        private CiInsureDemandDTO ciInsureDemand;
+        @JsonProperty(value = "prpTChargingPostDataList")
+        @JSONField(name = "prpTChargingPostDataList")
+        private List<?> prpTChargingPostDataList;
+        @JsonProperty(value = "ciInsureDemandPay")
+        @JSONField(name = "ciInsureDemandPay")
+        private List<?> ciInsureDemandPay;
+        @JsonProperty(value = "editType")
+        @JSONField(name = "editType")
+        private String editType;
+        @JsonProperty(value = "ciInsureDemandWarningClaim")
+        @JSONField(name = "ciInsureDemandWarningClaim")
+        private List<?> ciInsureDemandWarningClaim;
+        @JsonProperty(value = "prpTmainRate")
+        @JSONField(name = "prpTmainRate")
+        private PrpTmainRateDTO prpTmainRate;
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTitemCarDTO {
+
+
+            /**
+             * 商业险体系
+             * 2020综改-04，新能源-05
+             */
+            @JsonProperty(value = "termsSystem")
+            @JSONField(name = "termsSystem")
+            private String termsSystem;
+
+            /**
+             * 条款体系
+             * 商业险家庭自用对应F54，
+             */
+            @JsonProperty(value = "clauseType")
+            @JSONField(name = "clauseType")
+            private String clauseType;
+
+            /**
+             * 输入标志
+             * 选了对应险种传1，否则传0
+             */
+            @JsonProperty(value = "inputRisk")
+            @JSONField(name = "inputRisk")
+            private String inputRisk;
+
+            /**
+             * 保费计算标志
+             * 选了对应险种传1，否则传0
+             */
+            @JsonProperty(value = "calculateFlagBI")
+            @JSONField(name = "calculateFlagBI")
+            private String calculateFlagBI;
+
+            /**
+             * 理赔对象
+             * 默认传空
+             */
+            @JsonProperty(value = "ciInsureDemandPay")
+            @JSONField(name = "ciInsureDemandPay")
+            private List ciInsureDemandPay;
+
+            /**
+             * 风险警示信息对象
+             * 默认传空
+             */
+            @JsonProperty(value = "ciInsureDemandWarningClaim")
+            @JSONField(name = "ciInsureDemandWarningClaim")
+            private List ciInsureDemandWarningClaim;
+
+            /**
+             * 续保对象
+             * 默认传空
+             */
+            @JsonProperty(value = "prpTrenewal")
+            @JSONField(name = "prpTrenewal")
+            private String prpTrenewal;
+
+            /**
+             * 特别约定对象
+             * 默认传空
+             */
+            @JsonProperty(value = "prptengageList")
+            @JSONField(name = "prptengageList")
+            private String prptengageList;
+
+            /**
+             * 费率对象
+             * 默认传空
+             */
+            @JsonProperty(value = "prpTmainRate")
+            @JSONField(name = "prpTmainRate")
+            private String prpTmainRate;
+
+            /**
+             * 电池类型
+             * 上海必传
+             */
+            @JsonProperty(value = "pureElectricBatteryType")
+            @JSONField(name = "pureElectricBatteryType")
+            private String pureElectricBatteryType;
+
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTmainDTO {
+            @JsonProperty(value = "endDate")
+            @JSONField(name = "endDate")
+            private String endDate;
+            @JsonProperty(value = "noCarFlag")
+            @JSONField(name = "noCarFlag")
+            private String noCarFlag;
+            @JsonProperty(value = "immeValiFlag")
+            @JSONField(name = "immeValiFlag")
+            private String immeValiFlag;
+            @JsonProperty(value = "feeandDiscountFlag")
+            @JSONField(name = "feeandDiscountFlag")
+            private String feeandDiscountFlag;
+            @JsonProperty(value = "signDate")
+            @JSONField(name = "signDate")
+            private String signDate;
+            @JsonProperty(value = "inputDate")
+            @JSONField(name = "inputDate")
+            private String inputDate;
+            @JsonProperty(value = "expectDiscount")
+            @JSONField(name = "expectDiscount")
+            private String expectDiscount;
+            @JsonProperty(value = "endHour")
+            @JSONField(name = "endHour")
+            private String endHour;
+            @JsonProperty(value = "immeValidEndDate")
+            @JSONField(name = "immeValidEndDate")
+            private String immeValidEndDate;
+            @JsonProperty(value = "answer")
+            @JSONField(name = "answer")
+            private String answer;
+            @JsonProperty(value = "startHour")
+            @JSONField(name = "startHour")
+            private String startHour;
+            @JsonProperty(value = "orderFlag")
+            @JSONField(name = "orderFlag")
+            private String orderFlag;
+            @JsonProperty(value = "immeValidStartDate")
+            @JSONField(name = "immeValidStartDate")
+            private String immeValidStartDate;
+            @JsonProperty(value = "simpleOrderFlag")
+            @JSONField(name = "simpleOrderFlag")
+            private String simpleOrderFlag;
+            @JsonProperty(value = "startDate")
+            @JSONField(name = "startDate")
+            private String startDate;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class CiInsureDemandDTO {
+            @JsonProperty(value = "demandNo")
+            @JSONField(name = "demandNo")
+            private String demandNo;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrpTmainRateDTO {
+            @JsonProperty(value = "demandNo")
+            @JSONField(name = "demandNo")
+            private String demandNo;
+        }
+
+        @NoArgsConstructor
+        @Data
+        public static class PrptitemkindListDTO {
+            @JsonProperty(value = "amount")
+            @JSONField(name = "amount")
+            private String amount;
+            @JsonProperty(value = "kindCode")
+            @JSONField(name = "kindCode")
+            private String kindCode;
+            @JsonProperty(value = "quantity")
+            @JSONField(name = "quantity")
+            private String quantity;
+            @JsonProperty(value = "flag")
+            @JSONField(name = "flag")
+            private String flag;
+            @JsonProperty(value = "endDate")
+            @JSONField(name = "endDate")
+            private String endDate;
+            @JsonProperty(value = "mainKindFlag")
+            @JSONField(name = "mainKindFlag")
+            private String mainKindFlag;
+            @JsonProperty(value = "isDeductible")
+            @JSONField(name = "isDeductible")
+            private String isDeductible;
+            @JsonProperty(value = "rate")
+            @JSONField(name = "rate")
+            private String rate;
+            @JsonProperty(value = "modeCode")
+            @JSONField(name = "modeCode")
+            private String modeCode;
+            @JsonProperty(value = "deductible")
+            @JSONField(name = "deductible")
+            private String deductible;
+            @JsonProperty(value = "kindName")
+            @JSONField(name = "kindName")
+            private String kindName;
+            @JsonProperty(value = "checked")
+            @JSONField(name = "checked")
+            private String checked;
+            @JsonProperty(value = "unitAmount")
+            @JSONField(name = "unitAmount")
+            private String unitAmount;
+            @JsonProperty(value = "itemKindNo")
+            @JSONField(name = "itemKindNo")
+            private String itemKindNo;
+            @JsonProperty(value = "startDate")
+            @JSONField(name = "startDate")
+            private String startDate;
+        }
+    }
 }
 
 

src/main/java/com/ydtech/modules/ins/model/guoRen/PremiumResp.java

@@ -17,10 +17,13 @@ import java.util.List;
 public class PremiumResp {
 
 
+    @JsonProperty(value = "resultCode")
     @JSONField(name = "resultCode")
     private Integer resultCode;
+    @JsonProperty(value = "resultMsg")
     @JSONField(name = "resultMsg")
     private String resultMsg;
+    @JsonProperty(value = "data")
     @JSONField(name = "data")
     private DataDTO data;
 
@@ -37,124 +40,182 @@ public class PremiumResp {
         @JsonIgnore
         private String biEndDate;
 
+        @JsonProperty(value = "itemVOList")
         @JSONField(name = "itemVOList")
         private List<ItemVOListDTO> itemVOList;
+        @JsonProperty(value = "carShipTaxRespVO")
         @JSONField(name = "carShipTaxRespVO")
         private CarShipTaxRespVODTO carShipTaxRespVO;
+        @JsonProperty(value = "sumPremiumBI")
         @JSONField(name = "sumPremiumBI")
         private Double sumPremiumBI;
+        @JsonProperty(value = "sumPremiumCI")
         @JSONField(name = "sumPremiumCI")
         private Double sumPremiumCI;
+        @JsonProperty(value = "sumPayTax")
         @JSONField(name = "sumPayTax")
         private Integer sumPayTax;
+        @JsonProperty(value = "biPrptenages")
         @JSONField(name = "biPrptenages")
         private List<BiPrptenagesDTO> biPrptenages;
+        @JsonProperty(value = "ciPrptenages")
         @JSONField(name = "ciPrptenages")
         private List<CiPrptenagesDTO> ciPrptenages;
+        @JsonProperty(value = "comlossCondition")
         @JSONField(name = "comlossCondition")
         private String comlossCondition;
+        @JsonProperty(value = "signDiscount")
         @JSONField(name = "signDiscount")
         private String signDiscount;
+        @JsonProperty(value = "sumTopRate")
         @JSONField(name = "sumTopRate")
         private String sumTopRate;
+        @JsonProperty(value = "sumLowerRate")
         @JSONField(name = "sumLowerRate")
         private String sumLowerRate;
+        @JsonProperty(value = "selfAdjustRate")
         @JSONField(name = "selfAdjustRate")
         private Double selfAdjustRate;
+        @JsonProperty(value = "selfChannelRate")
         @JSONField(name = "selfChannelRate")
         private Integer selfChannelRate;
+        @JsonProperty(value = "noclaimRate")
         @JSONField(name = "noclaimRate")
         private Integer noclaimRate;
+        @JsonProperty(value = "addonRate")
         @JSONField(name = "addonRate")
         private Integer addonRate;
+        @JsonProperty(value = "autoPriceOutputXOMRespVo")
         @JSONField(name = "autoPriceOutputXOMRespVo")
         private AutoPriceOutputXOMRespVoDTO autoPriceOutputXOMRespVo;
+        @JsonProperty(value = "biClaimTimes")
         @JSONField(name = "biClaimTimes")
         private Integer biClaimTimes;
+        @JsonProperty(value = "biClaimAmount")
         @JSONField(name = "biClaimAmount")
         private Integer biClaimAmount;
+        @JsonProperty(value = "ciClaimTimes")
         @JSONField(name = "ciClaimTimes")
         private Integer ciClaimTimes;
+        @JsonProperty(value = "ciClaimAmount")
         @JSONField(name = "ciClaimAmount")
         private Integer ciClaimAmount;
+        @JsonProperty(value = "lastYearEndDate")
         @JSONField(name = "lastYearEndDate")
         private Object lastYearEndDate;
+        @JsonProperty(value = "prpTChargingPostDataList")
         @JSONField(name = "prpTChargingPostDataList")
         private List<?> prpTChargingPostDataList;
+        @JsonProperty(value = "ciLossCondition")
         @JSONField(name = "ciLossCondition")
         private Integer ciLossCondition;
+        @JsonProperty(value = "lossFeeSum")
         @JSONField(name = "lossFeeSum")
         private Integer lossFeeSum;
+        @JsonProperty(value = "birate")
         @JSONField(name = "birate")
         private BirateDTO birate;
+        @JsonProperty(value = "cicheckCode")
         @JSONField(name = "cicheckCode")
         private String cicheckCode;
+        @JsonProperty(value = "cidemandNo")
         @JSONField(name = "cidemandNo")
         private Object cidemandNo;
+        @JsonProperty(value = "ciprofit")
         @JSONField(name = "ciprofit")
         private Integer ciprofit;
+        @JsonProperty(value = "cirate")
         @JSONField(name = "cirate")
         private CirateDTO cirate;
+        @JsonProperty(value = "uuid")
         @JSONField(name = "uuid")
         private String uuid;
+        @JsonProperty(value = "bicheckCode")
         @JSONField(name = "bicheckCode")
         private String bicheckCode;
+        @JsonProperty(value = "bidemandNo")
         @JSONField(name = "bidemandNo")
         private Object bidemandNo;
+        @JsonProperty(value = "bireCoverMsg")
         @JSONField(name = "bireCoverMsg")
         private Object bireCoverMsg;
+        @JsonProperty(value = "biprofit")
         @JSONField(name = "biprofit")
         private Integer biprofit;
+        @JsonProperty(value = "prpTenGearAllocationFeeList")
         @JSONField(name = "prpTenGearAllocationFeeList")
         private List<?> prpTenGearAllocationFeeList;
+        @JsonProperty(value = "ciInsureDemandPay")
         @JSONField(name = "ciInsureDemandPay")
         private List<CIInsureDemandPayVo> ciInsureDemandPay;
 
         @NoArgsConstructor
         @Data
         public static class CIInsureDemandPayVo {
+            @JsonProperty(value = "DemandNo")
             @JSONField(name = "DemandNo")
             private String DemandNo;
+            @JsonProperty(value = "SerialNo")
             @JSONField(name = "SerialNo")
             private String SerialNo;
+            @JsonProperty(value = "payCompany")
             @JSONField(name = "payCompany")
             private String payCompany;
+            @JsonProperty(value = "PolicyNo")
             @JSONField(name = "PolicyNo")
             private String PolicyNo;
+            @JsonProperty(value = "KindCode")
             @JSONField(name = "KindCode")
             private String KindCode;
+            @JsonProperty(value = "PayType")
             @JSONField(name = "PayType")
             private String PayType;
+            @JsonProperty(value = "PersonPayType")
             @JSONField(name = "PersonPayType")
             private String PersonPayType;
+            @JsonProperty(value = "compensateNo")
             @JSONField(name = "compensateNo")
             private String compensateNo;
+            @JsonProperty(value = "lossTime")
             @JSONField(name = "lossTime")
             private String lossTime;
+            @JsonProperty(value = "lossFee")
             @JSONField(name = "lossFee")
             private String lossFee;
+            @JsonProperty(value = "Remark")
             @JSONField(name = "Remark")
             private String Remark;
+            @JsonProperty(value = "Flag")
             @JSONField(name = "Flag")
             private String Flag;
+            @JsonProperty(value = "endCaseTime")
             @JSONField(name = "endCaseTime")
             private String endCaseTime;
+            @JsonProperty(value = "AccidentDeathFlag")
             @JSONField(name = "AccidentDeathFlag")
             private String AccidentDeathFlag;
+            @JsonProperty(value = "OptionType")
             @JSONField(name = "OptionType")
             private String OptionType;
+            @JsonProperty(value = "totalAmount")
             @JSONField(name = "totalAmount")
             private String totalAmount;
+            @JsonProperty(value = "claimNotificationNo")
             @JSONField(name = "claimNotificationNo")
             private String claimNotificationNo;
+            @JsonProperty(value = "claimRegistrationNo")
             @JSONField(name = "claimRegistrationNo")
             private String claimRegistrationNo;
+            @JsonProperty(value = "caseID")
             @JSONField(name = "caseID")
             private String caseID;
+            @JsonProperty(value = "effectiveDate")
             @JSONField(name = "effectiveDate")
             private String effectiveDate;
+            @JsonProperty(value = "expireDate")
             @JSONField(name = "expireDate")
             private String expireDate;
+            @JsonProperty(value = "InsurerArea")
             @JSONField(name = "InsurerArea")
             private String InsurerArea;
         }
@@ -162,12 +223,16 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class CarShipTaxRespVODTO {
+            @JsonProperty(value = "riskCode")
             @JSONField(name = "riskCode")
             private String riskCode;
+            @JsonProperty(value = "taxRelifFlag")
             @JSONField(name = "taxRelifFlag")
             private String taxRelifFlag;
+            @JsonProperty(value = "taxActual")
             @JSONField(name = "taxActual")
             private Integer taxActual;
+            @JsonProperty(value = "sumPayTax")
             @JSONField(name = "sumPayTax")
             private Integer sumPayTax;
         }
@@ -175,58 +240,85 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class AutoPriceOutputXOMRespVoDTO {
+            @JsonProperty(value = "entireRecommenDiscount")
             @JSONField(name = "entireRecommenDiscount")
             private String entireRecommenDiscount;
+            @JsonProperty(value = "entireUWritingDiscount")
             @JSONField(name = "entireUWritingDiscount")
             private String entireUWritingDiscount;
+            @JsonProperty(value = "entireInitialDiscount")
             @JSONField(name = "entireInitialDiscount")
             private String entireInitialDiscount;
+            @JsonProperty(value = "comCostPrem")
             @JSONField(name = "comCostPrem")
             private String comCostPrem;
+            @JsonProperty(value = "ctpCostPrem")
             @JSONField(name = "ctpCostPrem")
             private String ctpCostPrem;
+            @JsonProperty(value = "billCTPELR")
             @JSONField(name = "billCTPELR")
             private String billCTPELR;
+            @JsonProperty(value = "billCOMELR")
             @JSONField(name = "billCOMELR")
             private String billCOMELR;
+            @JsonProperty(value = "billELR")
             @JSONField(name = "billELR")
             private String billELR;
+            @JsonProperty(value = "sunlightScore")
             @JSONField(name = "sunlightScore")
             private String sunlightScore;
+            @JsonProperty(value = "comSunlightScore")
             @JSONField(name = "comSunlightScore")
             private Object comSunlightScore;
+            @JsonProperty(value = "ctpSunlightScore")
             @JSONField(name = "ctpSunlightScore")
             private Object ctpSunlightScore;
+            @JsonProperty(value = "reasonCde")
             @JSONField(name = "reasonCde")
             private Object reasonCde;
+            @JsonProperty(value = "ruleType")
             @JSONField(name = "ruleType")
             private Object ruleType;
+            @JsonProperty(value = "uwDiscFloor")
             @JSONField(name = "uwDiscFloor")
             private Object uwDiscFloor;
+            @JsonProperty(value = "businessCode")
             @JSONField(name = "businessCode")
             private String businessCode;
+            @JsonProperty(value = "strComCostPrem2")
             @JSONField(name = "strComCostPrem2")
             private String strComCostPrem2;
+            @JsonProperty(value = "strCtpCostPrem2")
             @JSONField(name = "strCtpCostPrem2")
             private String strCtpCostPrem2;
+            @JsonProperty(value = "strBillCTPELR2")
             @JSONField(name = "strBillCTPELR2")
             private String strBillCTPELR2;
+            @JsonProperty(value = "strBillCOMELR2")
             @JSONField(name = "strBillCOMELR2")
             private String strBillCOMELR2;
+            @JsonProperty(value = "strBillELR2")
             @JSONField(name = "strBillELR2")
             private String strBillELR2;
+            @JsonProperty(value = "strUwRel")
             @JSONField(name = "strUwRel")
             private String strUwRel;
+            @JsonProperty(value = "strUwRelVersion")
             @JSONField(name = "strUwRelVersion")
             private String strUwRelVersion;
+            @JsonProperty(value = "strTargetLR")
             @JSONField(name = "strTargetLR")
             private String strTargetLR;
+            @JsonProperty(value = "uwELRrel2BC")
             @JSONField(name = "uwELRrel2BC")
             private Object uwELRrel2BC;
+            @JsonProperty(value = "strUwELRrel")
             @JSONField(name = "strUwELRrel")
             private String strUwELRrel;
+            @JsonProperty(value = "strUwELR")
             @JSONField(name = "strUwELR")
             private String strUwELR;
+            @JsonProperty(value = "recommenDiscountScore")
             @JSONField(name = "recommenDiscountScore")
             private String recommenDiscountScore;
         }
@@ -234,98 +326,145 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class BirateDTO {
+            @JsonProperty(value = "proposalno")
             @JSONField(name = "proposalno")
             private String proposalno;
+            @JsonProperty(value = "riskcode")
             @JSONField(name = "riskcode")
             private String riskcode;
+            @JsonProperty(value = "classcode")
             @JSONField(name = "classcode")
             private String classcode;
+            @JsonProperty(value = "coefficient1")
             @JSONField(name = "coefficient1")
             private Integer coefficient1;
+            @JsonProperty(value = "coefficient2")
             @JSONField(name = "coefficient2")
             private Integer coefficient2;
+            @JsonProperty(value = "coefficient3")
             @JSONField(name = "coefficient3")
             private Integer coefficient3;
+            @JsonProperty(value = "coefficient4")
             @JSONField(name = "coefficient4")
             private Integer coefficient4;
+            @JsonProperty(value = "coefficient5")
             @JSONField(name = "coefficient5")
             private Integer coefficient5;
+            @JsonProperty(value = "coefficient6")
             @JSONField(name = "coefficient6")
             private Integer coefficient6;
+            @JsonProperty(value = "coefficient7")
             @JSONField(name = "coefficient7")
             private Integer coefficient7;
+            @JsonProperty(value = "coefficient8")
             @JSONField(name = "coefficient8")
             private Integer coefficient8;
+            @JsonProperty(value = "coefficient9")
             @JSONField(name = "coefficient9")
             private Integer coefficient9;
+            @JsonProperty(value = "coefficient10")
             @JSONField(name = "coefficient10")
             private Integer coefficient10;
+            @JsonProperty(value = "coefficient11")
             @JSONField(name = "coefficient11")
             private Integer coefficient11;
+            @JsonProperty(value = "remark")
             @JSONField(name = "remark")
             private String remark;
+            @JsonProperty(value = "flag")
             @JSONField(name = "flag")
             private String flag;
+            @JsonProperty(value = "businesscategory")
             @JSONField(name = "businesscategory")
             private String businesscategory;
+            @JsonProperty(value = "attribute1")
             @JSONField(name = "attribute1")
             private String attribute1;
+            @JsonProperty(value = "attribute2")
             @JSONField(name = "attribute2")
             private String attribute2;
+            @JsonProperty(value = "attribute3")
             @JSONField(name = "attribute3")
             private String attribute3;
+            @JsonProperty(value = "attribute4")
             @JSONField(name = "attribute4")
             private String attribute4;
+            @JsonProperty(value = "attribute5")
             @JSONField(name = "attribute5")
             private String attribute5;
+            @JsonProperty(value = "costratio")
             @JSONField(name = "costratio")
             private Object costratio;
+            @JsonProperty(value = "chargedecimal")
             @JSONField(name = "chargedecimal")
             private Object chargedecimal;
+            @JsonProperty(value = "billcomtransfeerate")
             @JSONField(name = "billcomtransfeerate")
             private Integer billcomtransfeerate;
+            @JsonProperty(value = "billcomallowance")
             @JSONField(name = "billcomallowance")
             private Integer billcomallowance;
+            @JsonProperty(value = "billcomacquisitionfeerate")
             @JSONField(name = "billcomacquisitionfeerate")
             private Integer billcomacquisitionfeerate;
+            @JsonProperty(value = "billcomotherfeerate")
             @JSONField(name = "billcomotherfeerate")
             private Integer billcomotherfeerate;
+            @JsonProperty(value = "totalcost")
             @JSONField(name = "totalcost")
             private Integer totalcost;
+            @JsonProperty(value = "accruedexpenses")
             @JSONField(name = "accruedexpenses")
             private String accruedexpenses;
+            @JsonProperty(value = "managelimit")
             @JSONField(name = "managelimit")
             private String managelimit;
+            @JsonProperty(value = "controllimit")
             @JSONField(name = "controllimit")
             private String controllimit;
+            @JsonProperty(value = "mutualback")
             @JSONField(name = "mutualback")
             private String mutualback;
+            @JsonProperty(value = "limitflag")
             @JSONField(name = "limitflag")
             private String limitflag;
+            @JsonProperty(value = "autoFeeType")
             @JSONField(name = "autoFeeType")
             private Object autoFeeType;
+            @JsonProperty(value = "isteamflag")
             @JSONField(name = "isteamflag")
             private Object isteamflag;
+            @JsonProperty(value = "tempLateID")
             @JSONField(name = "tempLateID")
             private String tempLateID;
+            @JsonProperty(value = "tempLateName")
             @JSONField(name = "tempLateName")
             private String tempLateName;
+            @JsonProperty(value = "chargenumber")
             @JSONField(name = "chargenumber")
             private String chargenumber;
+            @JsonProperty(value = "billcomeGroup")
             @JSONField(name = "billcomeGroup")
             private String billcomeGroup;
+            @JsonProperty(value = "ryblogo")
             @JSONField(name = "ryblogo")
             private String ryblogo;
+            @JsonProperty(value = "respAttrExt1")
             @JSONField(name = "respAttrExt1")
             private String respAttrExt1;
+            @JsonProperty(value = "respAttrExt2")
             @JSONField(name = "respAttrExt2")
             private String respAttrExt2;
+            @JsonProperty(value = "respOnlineExt1")
             @JSONField(name = "respOnlineExt1")
             private String respOnlineExt1;
+            @JsonProperty(value = "respOnlineExt2")
             @JSONField(name = "respOnlineExt2")
             private String respOnlineExt2;
+            @JsonProperty(value = "respOnlineExt3")
             @JSONField(name = "respOnlineExt3")
             private String respOnlineExt3;
+            @JsonProperty(value = "respOnlineExt4")
             @JSONField(name = "respOnlineExt4")
             private String respOnlineExt4;
         }
@@ -333,98 +472,145 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class CirateDTO {
+            @JsonProperty(value = "proposalno")
             @JSONField(name = "proposalno")
             private String proposalno;
+            @JsonProperty(value = "riskcode")
             @JSONField(name = "riskcode")
             private String riskcode;
+            @JsonProperty(value = "classcode")
             @JSONField(name = "classcode")
             private String classcode;
+            @JsonProperty(value = "coefficient1")
             @JSONField(name = "coefficient1")
             private Integer coefficient1;
+            @JsonProperty(value = "coefficient2")
             @JSONField(name = "coefficient2")
             private Integer coefficient2;
+            @JsonProperty(value = "coefficient3")
             @JSONField(name = "coefficient3")
             private Integer coefficient3;
+            @JsonProperty(value = "coefficient4")
             @JSONField(name = "coefficient4")
             private Integer coefficient4;
+            @JsonProperty(value = "coefficient5")
             @JSONField(name = "coefficient5")
             private Integer coefficient5;
+            @JsonProperty(value = "coefficient6")
             @JSONField(name = "coefficient6")
             private Integer coefficient6;
+            @JsonProperty(value = "coefficient7")
             @JSONField(name = "coefficient7")
             private Integer coefficient7;
+            @JsonProperty(value = "coefficient8")
             @JSONField(name = "coefficient8")
             private Integer coefficient8;
+            @JsonProperty(value = "coefficient9")
             @JSONField(name = "coefficient9")
             private Integer coefficient9;
+            @JsonProperty(value = "coefficient10")
             @JSONField(name = "coefficient10")
             private Integer coefficient10;
+            @JsonProperty(value = "coefficient11")
             @JSONField(name = "coefficient11")
             private Integer coefficient11;
+            @JsonProperty(value = "remark")
             @JSONField(name = "remark")
             private String remark;
+            @JsonProperty(value = "flag")
             @JSONField(name = "flag")
             private String flag;
+            @JsonProperty(value = "businesscategory")
             @JSONField(name = "businesscategory")
             private String businesscategory;
+            @JsonProperty(value = "attribute1")
             @JSONField(name = "attribute1")
             private String attribute1;
+            @JsonProperty(value = "attribute2")
             @JSONField(name = "attribute2")
             private String attribute2;
+            @JsonProperty(value = "attribute3")
             @JSONField(name = "attribute3")
             private String attribute3;
+            @JsonProperty(value = "attribute4")
             @JSONField(name = "attribute4")
             private String attribute4;
+            @JsonProperty(value = "attribute5")
             @JSONField(name = "attribute5")
             private String attribute5;
+            @JsonProperty(value = "costratio")
             @JSONField(name = "costratio")
             private Object costratio;
+            @JsonProperty(value = "chargedecimal")
             @JSONField(name = "chargedecimal")
             private Object chargedecimal;
+            @JsonProperty(value = "billcomtransfeerate")
             @JSONField(name = "billcomtransfeerate")
             private Integer billcomtransfeerate;
+            @JsonProperty(value = "billcomallowance")
             @JSONField(name = "billcomallowance")
             private Integer billcomallowance;
+            @JsonProperty(value = "billcomacquisitionfeerate")
             @JSONField(name = "billcomacquisitionfeerate")
             private Integer billcomacquisitionfeerate;
+            @JsonProperty(value = "billcomotherfeerate")
             @JSONField(name = "billcomotherfeerate")
             private Integer billcomotherfeerate;
+            @JsonProperty(value = "totalcost")
             @JSONField(name = "totalcost")
             private Integer totalcost;
+            @JsonProperty(value = "accruedexpenses")
             @JSONField(name = "accruedexpenses")
             private String accruedexpenses;
+            @JsonProperty(value = "managelimit")
             @JSONField(name = "managelimit")
             private String managelimit;
+            @JsonProperty(value = "controllimit")
             @JSONField(name = "controllimit")
             private String controllimit;
+            @JsonProperty(value = "mutualback")
             @JSONField(name = "mutualback")
             private String mutualback;
+            @JsonProperty(value = "limitflag")
             @JSONField(name = "limitflag")
             private String limitflag;
+            @JsonProperty(value = "autoFeeType")
             @JSONField(name = "autoFeeType")
             private Object autoFeeType;
+            @JsonProperty(value = "isteamflag")
             @JSONField(name = "isteamflag")
             private Object isteamflag;
+            @JsonProperty(value = "tempLateID")
             @JSONField(name = "tempLateID")
             private String tempLateID;
+            @JsonProperty(value = "tempLateName")
             @JSONField(name = "tempLateName")
             private String tempLateName;
+            @JsonProperty(value = "chargenumber")
             @JSONField(name = "chargenumber")
             private String chargenumber;
+            @JsonProperty(value = "billcomeGroup")
             @JSONField(name = "billcomeGroup")
             private String billcomeGroup;
+            @JsonProperty(value = "ryblogo")
             @JSONField(name = "ryblogo")
             private String ryblogo;
+            @JsonProperty(value = "respAttrExt1")
             @JSONField(name = "respAttrExt1")
             private String respAttrExt1;
+            @JsonProperty(value = "respAttrExt2")
             @JSONField(name = "respAttrExt2")
             private String respAttrExt2;
+            @JsonProperty(value = "respOnlineExt1")
             @JSONField(name = "respOnlineExt1")
             private String respOnlineExt1;
+            @JsonProperty(value = "respOnlineExt2")
             @JSONField(name = "respOnlineExt2")
             private String respOnlineExt2;
+            @JsonProperty(value = "respOnlineExt3")
             @JSONField(name = "respOnlineExt3")
             private String respOnlineExt3;
+            @JsonProperty(value = "respOnlineExt4")
             @JSONField(name = "respOnlineExt4")
             private String respOnlineExt4;
         }
@@ -432,112 +618,166 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class ItemVOListDTO {
+            @JsonProperty(value = "proposalNo")
             @JSONField(name = "proposalNo")
             private String proposalNo;
+            @JsonProperty(value = "riskCode")
             @JSONField(name = "riskCode")
             private String riskCode;
+            @JsonProperty(value = "itemKindNo")
             @JSONField(name = "itemKindNo")
             private Integer itemKindNo;
+            @JsonProperty(value = "familyNo")
             @JSONField(name = "familyNo")
             private Object familyNo;
+            @JsonProperty(value = "familyName")
             @JSONField(name = "familyName")
             private String familyName;
+            @JsonProperty(value = "rationType")
             @JSONField(name = "rationType")
             private String rationType;
+            @JsonProperty(value = "kindCode")
             @JSONField(name = "kindCode")
             private String kindCode;
+            @JsonProperty(value = "kindName")
             @JSONField(name = "kindName")
             private String kindName;
+            @JsonProperty(value = "itemNo")
             @JSONField(name = "itemNo")
             private Integer itemNo;
+            @JsonProperty(value = "itemCode")
             @JSONField(name = "itemCode")
             private String itemCode;
+            @JsonProperty(value = "itemDetailName")
             @JSONField(name = "itemDetailName")
             private String itemDetailName;
+            @JsonProperty(value = "modeCode")
             @JSONField(name = "modeCode")
             private String modeCode;
+            @JsonProperty(value = "modeName")
             @JSONField(name = "modeName")
             private String modeName;
+            @JsonProperty(value = "startDate")
             @JSONField(name = "startDate")
             private String startDate;
+            @JsonProperty(value = "startHour")
             @JSONField(name = "startHour")
             private Integer startHour;
+            @JsonProperty(value = "endDate")
             @JSONField(name = "endDate")
             private String endDate;
+            @JsonProperty(value = "endHour")
             @JSONField(name = "endHour")
             private Integer endHour;
+            @JsonProperty(value = "model")
             @JSONField(name = "model")
             private String model;
+            @JsonProperty(value = "buyDate")
             @JSONField(name = "buyDate")
             private Object buyDate;
+            @JsonProperty(value = "addressNo")
             @JSONField(name = "addressNo")
             private Object addressNo;
+            @JsonProperty(value = "calculateFlag")
             @JSONField(name = "calculateFlag")
             private String calculateFlag;
+            @JsonProperty(value = "currency")
             @JSONField(name = "currency")
             private String currency;
+            @JsonProperty(value = "unitAmount")
             @JSONField(name = "unitAmount")
             private Object unitAmount;
+            @JsonProperty(value = "quantity")
             @JSONField(name = "quantity")
             private Object quantity;
+            @JsonProperty(value = "unit")
             @JSONField(name = "unit")
             private String unit;
+            @JsonProperty(value = "value")
             @JSONField(name = "value")
             private Object value;
+            @JsonProperty(value = "amount")
             @JSONField(name = "amount")
             private Double amount;
+            @JsonProperty(value = "ratePeriod")
             @JSONField(name = "ratePeriod")
             private Integer ratePeriod;
+            @JsonProperty(value = "rate")
             @JSONField(name = "rate")
             private Integer rate;
+            @JsonProperty(value = "shortRateFlag")
             @JSONField(name = "shortRateFlag")
             private String shortRateFlag;
+            @JsonProperty(value = "shortRate")
             @JSONField(name = "shortRate")
             private Integer shortRate;
+            @JsonProperty(value = "basePremium")
             @JSONField(name = "basePremium")
             private Integer basePremium;
+            @JsonProperty(value = "benchMarkPremium")
             @JSONField(name = "benchMarkPremium")
             private Double benchMarkPremium;
+            @JsonProperty(value = "discount")
             @JSONField(name = "discount")
             private Integer discount;
+            @JsonProperty(value = "adjustRate")
             @JSONField(name = "adjustRate")
             private Double adjustRate;
+            @JsonProperty(value = "premium")
             @JSONField(name = "premium")
             private Double premium;
+            @JsonProperty(value = "deductibleRate")
             @JSONField(name = "deductibleRate")
             private Integer deductibleRate;
+            @JsonProperty(value = "deductible")
             @JSONField(name = "deductible")
             private Integer deductible;
+            @JsonProperty(value = "flag")
             @JSONField(name = "flag")
             private String flag;
+            @JsonProperty(value = "feeStart")
             @JSONField(name = "feeStart")
             private Object feeStart;
+            @JsonProperty(value = "feeEnd")
             @JSONField(name = "feeEnd")
             private Object feeEnd;
+            @JsonProperty(value = "standardPremuim")
             @JSONField(name = "standardPremuim")
             private Double standardPremuim;
+            @JsonProperty(value = "additionalCostRate")
             @JSONField(name = "additionalCostRate")
             private Double additionalCostRate;
+            @JsonProperty(value = "basePureRiskPremium")
             @JSONField(name = "basePureRiskPremium")
             private Object basePureRiskPremium;
+            @JsonProperty(value = "totalLossRate")
             @JSONField(name = "totalLossRate")
             private Double totalLossRate;
+            @JsonProperty(value = "channelrate")
             @JSONField(name = "channelrate")
             private Integer channelrate;
+            @JsonProperty(value = "noTaxPremium")
             @JSONField(name = "noTaxPremium")
             private Double noTaxPremium;
+            @JsonProperty(value = "taxRate")
             @JSONField(name = "taxRate")
             private Double taxRate;
+            @JsonProperty(value = "taxFee")
             @JSONField(name = "taxFee")
             private Double taxFee;
+            @JsonProperty(value = "taxFlag")
             @JSONField(name = "taxFlag")
             private String taxFlag;
+            @JsonProperty(value = "insurePlan")
             @JSONField(name = "insurePlan")
             private String insurePlan;
+            @JsonProperty(value = "itemKind_Flag5")
             @JSONField(name = "itemKind_Flag5")
             private Object itemkindFlag5;
+            @JsonProperty(value = "mainKindFlag")
             @JSONField(name = "mainKindFlag")
             private Object mainKindFlag;
+            @JsonProperty(value = "vipPremium")
             @JSONField(name = "vipPremium")
             private Integer vipPremium;
         }
@@ -545,24 +785,34 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class BiPrptenagesDTO {
+            @JsonProperty(value = "proposalNo")
             @JSONField(name = "proposalNo")
             private Object proposalNo;
+            @JsonProperty(value = "riskCode")
             @JSONField(name = "riskCode")
             private Object riskCode;
+            @JsonProperty(value = "serialNo")
             @JSONField(name = "serialNo")
             private Integer serialNo;
+            @JsonProperty(value = "lineNo")
             @JSONField(name = "lineNo")
             private Object lineNo;
+            @JsonProperty(value = "clauseCode")
             @JSONField(name = "clauseCode")
             private String clauseCode;
+            @JsonProperty(value = "clauses")
             @JSONField(name = "clauses")
             private String clauses;
+            @JsonProperty(value = "titleFlag")
             @JSONField(name = "titleFlag")
             private Object titleFlag;
+            @JsonProperty(value = "clauseName")
             @JSONField(name = "clauseName")
             private Object clauseName;
+            @JsonProperty(value = "clausesContext")
             @JSONField(name = "clausesContext")
             private String clausesContext;
+            @JsonProperty(value = "flag")
             @JSONField(name = "flag")
             private String flag;
         }
@@ -570,24 +820,34 @@ public class PremiumResp {
         @NoArgsConstructor
         @Data
         public static class CiPrptenagesDTO {
+            @JsonProperty(value = "proposalNo")
             @JSONField(name = "proposalNo")
             private Object proposalNo;
+            @JsonProperty(value = "riskCode")
             @JSONField(name = "riskCode")
             private Object riskCode;
+            @JsonProperty(value = "serialNo")
             @JSONField(name = "serialNo")
             private Integer serialNo;
+            @JsonProperty(value = "lineNo")
             @JSONField(name = "lineNo")
             private Object lineNo;
+            @JsonProperty(value = "clauseCode")
             @JSONField(name = "clauseCode")
             private String clauseCode;
+            @JsonProperty(value = "clauses")
             @JSONField(name = "clauses")
             private String clauses;
+            @JsonProperty(value = "titleFlag")
             @JSONField(name = "titleFlag")
             private Object titleFlag;
+            @JsonProperty(value = "clauseName")
             @JSONField(name = "clauseName")
             private Object clauseName;
+            @JsonProperty(value = "clausesContext")
             @JSONField(name = "clausesContext")
             private String clausesContext;
+            @JsonProperty(value = "flag")
             @JSONField(name = "flag")
             private String flag;
         }

src/main/java/com/ydtech/modules/ins/model/guoRen/RequestDto.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.ins.model.guoRen;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,16 +11,48 @@ import java.util.Date;
 public class RequestDto {
 
     //    @JsonProperty("PACKAGE")
+    @JsonProperty(value = "PACKAGE")
     @JSONField(name = "PACKAGE")
     private RequestPackage rPackage;
 
+    public static RequestDto builRequestDto(Object body, String apiCode) {
+        RequestDto dto = new RequestDto();
+        RequestDto.RequestHead rHead = new RequestDto.RequestHead();
+        //=========
+        //===生产
+        //==========
+        rHead.setServeCode("GR0002");
+        rHead.setChannelCode("TQDL");
+        rHead.setInterfaceCode(apiCode);
+        rHead.setInterfaceUserCode("TQDL");
+        rHead.setInterfacePwd("$2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te");
+        rHead.setBusinessUuid("");
+        rHead.setRequestTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss:ssss"));
+//        rHead.setRequestTime("2018-08-17 12:12:12:0005");
+        rHead.setXmlListSuffix("");
+        //测试环境填”Y”;生产环境填”N”
+        rHead.setIftest("N");
+
+        RequestDto.RequestPackage rpackage = new RequestDto.RequestPackage();
+        rpackage.setRHead(rHead);
+
+        //请求参数
+        rpackage.setRBody(body);
+        dto.setRPackage(rpackage);
+
+        return dto;
+
+    }
+
     @Data
     public static class RequestPackage {
         //        @JsonProperty("HEAD")
+        @JsonProperty(value = "HEAD")
         @JSONField(name = "HEAD")
         private RequestHead rHead;
 
         //        @JsonProperty("BODY")
+        @JsonProperty(value = "BODY")
         @JSONField(name = "BODY")
         private Object rBody;
 
@@ -32,6 +65,7 @@ public class RequestDto {
          * 客户端编码
          * GBK,UTF-8等
          */
+        @JsonProperty(value = "CLIENT_ENCODE")
         @JSONField(name = "CLIENT_ENCODE")
         private String clientEncode = "UTF-8";
 
@@ -39,6 +73,7 @@ public class RequestDto {
          * 渠道编码
          * 测试环境：jindouyun
          */
+        @JsonProperty(value = "CHANNEL_CODE")
         @JSONField(name = "CHANNEL_CODE")
         private String channelCode;
 
@@ -46,6 +81,7 @@ public class RequestDto {
          * 接口代码
          * 见具体接口说明
          */
+        @JsonProperty(value = "INTERFACE_CODE")
         @JSONField(name = "INTERFACE_CODE")
         private String interfaceCode;
 
@@ -53,6 +89,7 @@ public class RequestDto {
          * 服务代码
          * httpJson方式填“GR0002”
          */
+        @JsonProperty(value = "SERVE_CODE")
         @JSONField(name = "SERVE_CODE")
         private String serveCode;
 
@@ -60,6 +97,7 @@ public class RequestDto {
          * 业务流水号
          * 唯一标识；此流水号在客户方必须唯一性
          */
+        @JsonProperty(value = "BUSINESS_UUID")
         @JSONField(name = "BUSINESS_UUID")
         private String businessUuid;
 
@@ -67,6 +105,7 @@ public class RequestDto {
          * 访问账号
          * 测试环境：guoren_tp_jdy
          */
+        @JsonProperty(value = "INTERFACE_USER_CODE")
         @JSONField(name = "INTERFACE_USER_CODE")
         private String interfaceUserCode;
 
@@ -74,6 +113,7 @@ public class RequestDto {
          * 访问口令
          * 测试环境：Q31gIrhZgQc=
          */
+        @JsonProperty(value = "INTERFACE_PWD")
         @JSONField(name = "INTERFACE_PWD")
         private String interfacePwd;
 
@@ -81,6 +121,7 @@ public class RequestDto {
          * 请求时间
          * 格式：yyyy-MM-dd HH:mm:ss:ssss，要求：精确至毫秒
          */
+        @JsonProperty(value = "REQUEST_TIME")
         @JSONField(name = "REQUEST_TIME")
         private String requestTime;
 
@@ -88,6 +129,7 @@ public class RequestDto {
          * 报文集合元素标志
          * 报文集合元素名称或名称后缀标识
          */
+        @JsonProperty(value = "XML_LIST_SUFFIX")
         @JSONField(name = "XML_LIST_SUFFIX")
         private String xmlListSuffix;
 
@@ -95,36 +137,8 @@ public class RequestDto {
          * 环境类型
          * 测试环境填”Y”;生产环境填”N”
          */
+        @JsonProperty(value = "IFTEST")
         @JSONField(name = "IFTEST")
         private String iftest;
     }
-
-    public static RequestDto builRequestDto(Object body, String apiCode) {
-        RequestDto dto = new RequestDto();
-        RequestDto.RequestHead rHead = new RequestDto.RequestHead();
-        //=========
-        //===生产
-        //==========
-        rHead.setServeCode("GR0002");
-        rHead.setChannelCode("TQDL");
-        rHead.setInterfaceCode(apiCode);
-        rHead.setInterfaceUserCode("TQDL");
-        rHead.setInterfacePwd("$2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te");
-        rHead.setBusinessUuid("");
-        rHead.setRequestTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss:ssss"));
-//        rHead.setRequestTime("2018-08-17 12:12:12:0005");
-        rHead.setXmlListSuffix("");
-        //测试环境填”Y”;生产环境填”N”
-        rHead.setIftest("N");
-
-        RequestDto.RequestPackage rpackage = new RequestDto.RequestPackage();
-        rpackage.setRHead(rHead);
-
-        //请求参数
-        rpackage.setRBody(body);
-        dto.setRPackage(rpackage);
-
-        return dto;
-
-    }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/ResponseDto.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.ins.model.guoRen;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,27 +10,25 @@ import lombok.NoArgsConstructor;
 public class ResponseDto<T> {
 
 
+    @JsonProperty(value = "PLATFORM_STS")
     @JSONField(name = "PLATFORM_STS")
     private String platformSts;
 
+    @JsonProperty(value = "PLATFORM_TYPE")
     @JSONField(name = "PLATFORM_TYPE")
     private String platformType;
 
+    @JsonProperty(value = "PLATFORM_CODE")
     @JSONField(name = "PLATFORM_CODE")
     private String platformCode;
 
+    @JsonProperty(value = "PLATFORM_MSG")
     @JSONField(name = "PLATFORM_MSG")
     private String platformMsg;
 
+    @JsonProperty(value = "RESPONSE_BODY")
     @JSONField(name = "RESPONSE_BODY")
     private T responseBody;
 
 
-    public static <T> T buildBody(ResponseDto dto, Class<T> classObj) {
-        if (null != dto.getResponseBody()) {
-            return JSON.parseObject(dto.getResponseBody().toString(), classObj);
-        }
-        return null;
-    }
-
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/SignatureResp.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 
 /**
- *  签名  出参
+ * 签名  出参
  *
  * @author: lig
  * @date: 2023-10-20
@@ -17,31 +17,38 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class SignatureResp {
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private DataDTO data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="proposalNo")
+        @JsonProperty(value = "proposalNo")
+        @JSONField(name = "proposalNo")
         private List<String> proposalNo;
-        @JSONField(name="downloadUrl")
+        @JsonProperty(value = "downloadUrl")
+        @JSONField(name = "downloadUrl")
         private String downloadUrl;
-        @JSONField(name="elecapplyurl")
+        @JsonProperty(value = "elecapplyurl")
+        @JSONField(name = "elecapplyurl")
         private String elecapplyurl;
-        @JSONField(name="createtime")
+        @JsonProperty(value = "createtime")
+        @JSONField(name = "createtime")
         private String createtime;
-        @JSONField(name="confirmflag")
+        @JsonProperty(value = "confirmflag")
+        @JSONField(name = "confirmflag")
         private String confirmflag;
-        @JSONField(name="updatetime")
+        @JsonProperty(value = "updatetime")
+        @JSONField(name = "updatetime")
         private String updatetime;
     }
 
 
-
-
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/SubmitAuditReq.java

@@ -3,11 +3,7 @@ package com.ydtech.modules.ins.model.guoRen;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,21 +17,13 @@ import java.util.List;
 @Data
 public class SubmitAuditReq {
 
-    @JSONField(name="proposalNoSubList")
+    @JsonProperty(value = "proposalNoSubList")
+    @JSONField(name = "proposalNoSubList")
     private List<ProposalNoSubListDTO> proposalNoSubList;
-    @JSONField(name="userCode")
+    @JsonProperty(value = "userCode")
+    @JSONField(name = "userCode")
     private String userCode;
 
-    @NoArgsConstructor
-    @Data
-    public static class ProposalNoSubListDTO {
-        @JSONField(name="proposalNoBI")
-        private String proposalNoBI;
-        @JSONField(name="proposalNoCI")
-        private String proposalNoCI;
-    }
-
-
     /**
      * 构造报价请求参数
      *
@@ -60,6 +48,16 @@ public class SubmitAuditReq {
         return req;
 
 
+    }
 
+    @NoArgsConstructor
+    @Data
+    public static class ProposalNoSubListDTO {
+        @JsonProperty(value = "proposalNoBI")
+        @JSONField(name = "proposalNoBI")
+        private String proposalNoBI;
+        @JsonProperty(value = "proposalNoCI")
+        @JSONField(name = "proposalNoCI")
+        private String proposalNoCI;
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/SubmitAuditResp.java

@@ -14,21 +14,27 @@ import java.util.List;
 @Data
 public class SubmitAuditResp {
 
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private List<DataDTO> data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="message")
+        @JsonProperty(value = "message")
+        @JSONField(name = "message")
         private String message;
-        @JSONField(name="underWriteFlagCI")
+        @JsonProperty(value = "underWriteFlagCI")
+        @JSONField(name = "underWriteFlagCI")
         private String underWriteFlagCI;
-        @JSONField(name="underWriteFlagBI")
+        @JsonProperty(value = "underWriteFlagBI")
+        @JSONField(name = "underWriteFlagBI")
         private String underWriteFlagBI;
     }
 }

src/main/java/com/ydtech/modules/ins/model/guoRen/VinQueryReq.java

@@ -3,8 +3,6 @@ package com.ydtech.modules.ins.model.guoRen;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeId;
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,39 +15,42 @@ import lombok.NoArgsConstructor;
 public class VinQueryReq {
 
 
-
     /**
      * 车架号
      */
-    @JSONField(name="frameNo")
+    @JsonProperty(value = "frameNo")
+    @JSONField(name = "frameNo")
     private String frameNo;
 
     /**
      * 发动机号
      */
-    @JSONField(name="engineNo")
+    @JsonProperty(value = "engineNo")
+    @JSONField(name = "engineNo")
     private String engineNo;
 
     /**
      * 车牌
      */
-    @JSONField(name="licenseNo")
+    @JsonProperty(value = "licenseNo")
+    @JSONField(name = "licenseNo")
     private String licenseNo;
 
     /**
      * 机构代码
      */
-    @JSONField(name="comCode")
+    @JsonProperty(value = "comCode")
+    @JSONField(name = "comCode")
     private String comCode;
 
     /**
      * 操作人员
      */
-    @JSONField(name="userCode")
+    @JsonProperty(value = "userCode")
+    @JSONField(name = "userCode")
     private String userCode;
 
 
-
     /**
      * 构造VIN请求参数
      *
@@ -57,7 +58,7 @@ public class VinQueryReq {
      * @date: 2023年08月14日 0014
      */
     @JsonIgnore
-    public static VinQueryReq buildParam(CarModel_Req carModelReq,ChannelInfoResp channelInfo) {
+    public static VinQueryReq buildParam(CarModel_Req carModelReq, ChannelInfoResp channelInfo) {
 
         VinQueryReq vinReq = new VinQueryReq();
         vinReq.setFrameNo(carModelReq.getFrameNo());
@@ -74,6 +75,7 @@ public class VinQueryReq {
         return vinReq;
 
     }
+
     /**
      * 构造VIN请求参数
      *
@@ -81,7 +83,7 @@ public class VinQueryReq {
      * @date: 2023年08月14日 0014
      */
     @JsonIgnore
-    public static VinQueryReq buildParam2(VinQueryReq vinQueryReq,ChannelInfoDto channelInfo) {
+    public static VinQueryReq buildParam2(VinQueryReq vinQueryReq, ChannelInfoDto channelInfo) {
 
         VinQueryReq vinReq = new VinQueryReq();
         vinReq.setFrameNo(vinQueryReq.getFrameNo());
@@ -89,7 +91,6 @@ public class VinQueryReq {
         vinReq.setLicenseNo(vinQueryReq.getLicenseNo());
 
 
-
         vinReq.setComCode(channelInfo.getComCode());
         vinReq.setUserCode(channelInfo.getHandlerCode());
 

src/main/java/com/ydtech/modules/ins/model/guoRen/VinQueryResp.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.guoRen;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -13,89 +14,135 @@ import java.util.List;
 @Data
 public class VinQueryResp {
 
-
-    @JSONField(name="resultCode")
+    @JsonProperty(value = "resultCode")
+    @JSONField(name = "resultCode")
     private Integer resultCode;
-    @JSONField(name="resultMsg")
+
+    @JsonProperty(value = "resultMsg")
+    @JSONField(name = "resultMsg")
     private String resultMsg;
-    @JSONField(name="data")
+
+    @JsonProperty(value = "data")
+    @JSONField(name = "data")
     private List<DataDTO> data;
 
     @NoArgsConstructor
     @Data
     public static class DataDTO {
-        @JSONField(name="brandNameBC")
+        @JsonProperty(value = "brandNameBC")
+        @JSONField(name = "brandNameBC")
         private String brandNameBC;
-        @JSONField(name="vehicleAlias")
+        @JsonProperty(value = "vehicleAlias")
+        @JSONField(name = "vehicleAlias")
         private String vehicleAlias;
-        @JSONField(name="importFlag")
+        @JsonProperty(value = "importFlag")
+        @JSONField(name = "importFlag")
         private String importFlag;
-        @JSONField(name="factory")
+        @JsonProperty(value = "factory")
+        @JSONField(name = "factory")
         private String factory;
-        @JSONField(name="jqxClassname")
+        @JsonProperty(value = "jqxClassname")
+        @JSONField(name = "jqxClassname")
         private String jqxClassname;
-        @JSONField(name="syxClassname")
+        @JsonProperty(value = "syxClassname")
+        @JSONField(name = "syxClassname")
         private String syxClassname;
-        @JSONField(name="seatCountBC")
+        @JsonProperty(value = "seatCountBC")
+        @JSONField(name = "seatCountBC")
         private String seatCountBC;
-        @JSONField(name="seatMax")
+        @JsonProperty(value = "seatMax")
+        @JSONField(name = "seatMax")
         private String seatMax;
-        @JSONField(name="seatMin")
+        @JsonProperty(value = "seatMin")
+        @JSONField(name = "seatMin")
         private String seatMin;
-        @JSONField(name="tonCount")
+        @JsonProperty(value = "tonCount")
+        @JSONField(name = "tonCount")
         private String tonCount;
-        @JSONField(name="purchasePriceSZ")
+        @JsonProperty(value = "purchasePriceSZ")
+        @JSONField(name = "purchasePriceSZ")
         private String purchasePriceSZ;
-        @JSONField(name="priceShow")
+        @JsonProperty(value = "priceShow")
+        @JSONField(name = "priceShow")
         private String priceShow;
-        @JSONField(name="carYear")
+        @JsonProperty(value = "carYear")
+        @JSONField(name = "carYear")
         private String carYear;
-        @JSONField(name="exHaustScale")
+        @JsonProperty(value = "exHaustScale")
+        @JSONField(name = "exHaustScale")
         private String exHaustScale;
-        @JSONField(name="newFuelModel")
+        @JsonProperty(value = "newFuelModel")
+        @JSONField(name = "newFuelModel")
         private String newFuelModel;
-        @JSONField(name="completeKerbMass")
+        @JsonProperty(value = "completeKerbMass")
+        @JSONField(name = "completeKerbMass")
         private String completeKerbMass;
-        @JSONField(name="completeKerbMassMin")
+        @JsonProperty(value = "completeKerbMassMin")
+        @JSONField(name = "completeKerbMassMin")
         private String completeKerbMassMin;
-        @JSONField(name="content")
+        @JsonProperty(value = "content")
+        @JSONField(name = "content")
         private ContentDTO content;
-        @JSONField(name="brandCode")
+        @JsonProperty(value = "brandCode")
+        @JSONField(name = "brandCode")
         private String brandCode;
-        @JSONField(name="power")
+        @JsonProperty(value = "power")
+        @JSONField(name = "power")
         private String power;
-        @JSONField(name="powerLB")
+        @JsonProperty(value = "powerLB")
+        @JSONField(name = "powerLB")
         private String powerLB;
-        @JSONField(name="fuelType")
+        @JsonProperty(value = "fuelType")
+        @JSONField(name = "fuelType")
         private String fuelType;
-        @JSONField(name="gearBoxtyPecode")
+        @JsonProperty(value = "gearBoxtyPecode")
+        @JSONField(name = "gearBoxtyPecode")
         private String gearBoxtyPecode;
-        @JSONField(name="stopFlagCode")
+        @JsonProperty(value = "stopFlagCode")
+        @JSONField(name = "stopFlagCode")
         private String stopFlagCode;
-        @JSONField(name="riskTypeCode")
+        @JsonProperty(value = "riskTypeCode")
+        @JSONField(name = "riskTypeCode")
         private String riskTypeCode;
-        @JSONField(name="riskTypeName")
+        @JsonProperty(value = "riskTypeName")
+        @JSONField(name = "riskTypeName")
         private String riskTypeName;
-        @JSONField(name="vehicleClassNewCode")
+        @JsonProperty(value = "vehicleClassNewCode")
+        @JSONField(name = "vehicleClassNewCode")
         private String vehicleClassNewCode;
-        @JSONField(name="vehicleClassNewName")
+        @JsonProperty(value = "vehicleClassNewName")
+        @JSONField(name = "vehicleClassNewName")
         private String vehicleClassNewName;
-        @JSONField(name="fullweight")
+        @JsonProperty(value = "fullweight")
+        @JSONField(name = "fullweight")
         private String fullweight;
-        @JSONField(name="absFlag")
+        @JsonProperty(value = "absFlag")
+        @JSONField(name = "absFlag")
         private String absFlag;
-        @JSONField(name="vehicleSize")
+        @JsonProperty(value = "vehicleSize")
+        @JSONField(name = "vehicleSize")
         private String vehicleSize;
-        @JSONField(name="transmissionttype")
+        @JsonProperty(value = "transmissionttype")
+        @JSONField(name = "transmissionttype")
         private String transmissionttype;
-        @JSONField(name="modelCodeBC")
+        @JsonProperty(value = "modelCodeBC")
+        @JSONField(name = "modelCodeBC")
         private String modelCodeBC;
-        @JSONField(name="kindred_PRICE_TAX")
+        @JsonProperty(value = "kindred_PRICE_TAX")
+        @JSONField(name = "kindred_PRICE_TAX")
         private String kindredPriceTax;
 
         @NoArgsConstructor
         @Data
         public static class ContentDTO {
+
+            @JsonProperty(value = "code")
+            @JSONField(name = "code")
+            private String code;
+
+            @JsonProperty(value = "message")
+            @JSONField(name = "message")
+            private String message;
         }
     }
 }

src/main/java/com/ydtech/modules/order/components/gouren/GuorenRequestApiComponent.java

@@ -2,6 +2,8 @@ package com.ydtech.modules.order.components.gouren;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
 import com.ydtech.exception.SystemException;
@@ -11,8 +13,10 @@ import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
 import com.ydtech.modules.order.entity.api.guoren.constants.PlatformInterfaceCode;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -29,47 +33,47 @@ public class GuorenRequestApiComponent {
 
     private final RestTemplate restTemplate;
 
-    private final InsCrawlerOrderComponents insCrawlerOrderComponents;
-
     private final GuorenApiConfigurationProperties guorenApiConfigurationProperties;
 
-    public GuorenRequestApiComponent(InsCrawlerOrderComponents insCrawlerOrderComponents, GuorenApiConfigurationProperties guorenApiConfigurationProperties, RestTemplate restTemplate) {
-        this.insCrawlerOrderComponents = insCrawlerOrderComponents;
+    public GuorenRequestApiComponent(GuorenApiConfigurationProperties guorenApiConfigurationProperties, RestTemplate restTemplate) {
         this.guorenApiConfigurationProperties = guorenApiConfigurationProperties;
         this.restTemplate = restTemplate;
     }
 
 
-    public <T, B> B post(String logId, String message, @Nullable T requestBody) {
+    public JSONObject post(String logId, String message, @Nullable RequestDto requestBody) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 
-        HttpEntity<T> httpEntity = new HttpEntity<>(requestBody, httpHeaders);
-
         String request = JSON.toJSONString(requestBody);
         String baseUrl = guorenApiConfigurationProperties.getBaseUrl();
+        HttpEntity<String> httpEntity = new HttpEntity<>(request, httpHeaders);
 
         InsuranceLog.infoLog(logId, "\n\t---------> {} \n\t---------> URL: {} \n\t---------> 请求参数: {}", message, baseUrl, request);
-        ParameterizedTypeReference<ResponseDto<B>> typeRef = new ParameterizedTypeReference<ResponseDto<B>>() {
 
-        };
-        ResponseEntity<ResponseDto<B>> exchange = restTemplate.exchange(baseUrl, HttpMethod.POST, httpEntity, typeRef);
-        ResponseDto<B> body1 = exchange.getBody();
+        ResponseEntity<String> exchange = restTemplate.postForEntity(baseUrl, httpEntity, String.class);
+        String body1 = exchange.getBody();
+        InsuranceLog.infoLog(logId, "\n\t---------> {} \n\t---------> 响应参数:{}", message, body1);
 
         if (body1 == null) {
             throw new SystemException(message + "接口请求失败");
         }
+        ResponseDto<JSONObject> bResponseDto = JSON.parseObject(body1, new TypeReference<ResponseDto<JSONObject>>() {
+        });
+        if (!bResponseDto.getPlatformCode().equals("T0000000")) {
+            throw new SystemException(bResponseDto.getPlatformMsg());
+        }
+        return bResponseDto.getResponseBody();
+    }
 
-        B body = body1.getResponseBody();
-        String response = JSON.toJSONString(body);
-        InsuranceLog.infoLog(logId, "\n\t---------> {} \n\t---------> 响应参数:{}", message, response);
-        return body;
+    public <B> B request(Object o, PlatformInterfaceCode platformInterfaceCode, Class<B> bClass) {
+        JSONObject request = request(o, platformInterfaceCode);
+        return request.toJavaObject(bClass);
     }
 
-    public <B> B request(Object o, PlatformInterfaceCode platformInterfaceCode) {
+    public JSONObject request(Object o, PlatformInterfaceCode platformInterfaceCode) {
         RequestDto requestBody = RequestDto.builRequestDto(o, platformInterfaceCode.getCode());
-        ResponseDto<B> request = post(InsuranceEnum.XDCX.getPinyin(), platformInterfaceCode.getDesc(), requestBody);
-        return request.getResponseBody();
+        return post(InsuranceEnum.XDCX.getPinyin(), platformInterfaceCode.getDesc(), requestBody);
     }
 
 

src/main/java/com/ydtech/modules/order/service/impl/GuorenOrderApiServiceImpl.java

@@ -150,7 +150,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         Map m = new HashMap();
         m.put("thirdCode", thirdCode);
 //        String bodyStr = RequestDto.builRequestDto(m, "IIRBT00018");
-        ChannelInfoResp request = guorenRequestApiComponent.request(m, PlatformInterfaceCode.API_IIRBT00018);
+        ChannelInfoResp request = guorenRequestApiComponent.request(m, PlatformInterfaceCode.API_IIRBT00018, ChannelInfoResp.class);
 
         return HttpResult.ok(request);
     }
@@ -162,7 +162,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     @Override
     public HttpResult modelsQueryApi(CarInfoVo carInfo) {
         CarModelReq carModelReq = CarModelReq.buildCarModelParam(carInfo);
-        CarModelResp request = guorenRequestApiComponent.request(carModelReq, PlatformInterfaceCode.API_IIRBT00002);
+        CarModelResp request = guorenRequestApiComponent.request(carModelReq, PlatformInterfaceCode.API_IIRBT00002, CarModelResp.class);
         return HttpResult.ok(request);
     }
 
@@ -506,17 +506,16 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 //                FilePart file1 = new FilePart(fileName, new File("https://img0.baidu.com/it/u=3021883569,1259262591&fm=253&fmt=auto&app=120&f=JPEG?w=1140&h=641"));
                 FilePart file1 = new FilePart("file", new File(a.getFilePath()));
 
-
                 Part[] parts = {file1, new StringPart("businessNo", formMap.get("businessNo").toString()), new StringPart("operatorCode", formMap.get("operatorCode").toString()), new StringPart("comCode", formMap.get("comCode").toString()), new StringPart("fileGroup", formMap.get("fileGroup").toString())};
 
                 String result = HttpUtil.sendPostFromFile(parts, properties.getUploadUrl());
-                if (StringUtils.isEmpty(result)) throw new SystemException("国任，影像上传失败");
-
+                if (StringUtils.isEmpty(result)) {
+                    throw new SystemException("国任，影像上传失败");
+                }
                 JSONObject jsonObject = JSON.parseObject(result);
                 if (StringUtils.toInt(jsonObject.get("resultCode")) == 0) return;
                 throw new SystemException("国任，影像上传失败，类型：" + a.getImageType());
 
-
             } catch (FileNotFoundException e) {
                 throw new RuntimeException(e);
             }
@@ -532,7 +531,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     public PayResp.DataDTO pay(InsAreaCompany iac) {
         //构造请求参数
         PayReq req = PayReq.buildParam(iac, properties.getRedirectUrl(), channelInfo);
-        PayResp payResp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00008);
+        PayResp payResp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00008, PayResp.class);
         if (null != payResp) {
             return payResp.getData();
         }
@@ -546,7 +545,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         //构造请求参数
         Map<String, String> req = new HashMap<>();
         req.put("proposalNo", StringUtils.isEmpty(iac.getJqapplyno()) ? iac.getSyapplyno() : iac.getJqapplyno());
-        SignatureResp resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00046);
+        SignatureResp resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00046, SignatureResp.class);
         return resp.getData();
 
     }
@@ -557,7 +556,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     public PolicyResp policyPrint(String policyNo) {
         Map<String, String> m = new HashMap<>();
         m.put("policyNo", policyNo);
-        PolicyResp resp = guorenRequestApiComponent.request(m, PlatformInterfaceCode.API_IIRBT00027);
+        PolicyResp resp = guorenRequestApiComponent.request(m, PlatformInterfaceCode.API_IIRBT00027, PolicyResp.class);
         if (null != resp && resp.getResultCode() == 0) {
             return resp;
         }
@@ -812,8 +811,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         insAreaCompany.setOrderno(insOrder.getOrderno());
         insAreaCompany.setSumpremium(BigDecimal.valueOf(quoteRespVo.getSumPermium()));
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
-        insAreaCompany.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-        insAreaCompany.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
+        insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
+        insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
         insAreaCompany.setCreatetime(LocalDateTime.now());
         insAreaCompany.setInsOrderNo(StringUtils.EMPTY);
         insAreaCompany.setCompanyId(eic.getId());
@@ -1202,7 +1201,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
      */
     public VinQueryResp.DataDTO vinQuery(VinQueryReq vinQueryReq) {
         VinQueryReq req = VinQueryReq.buildParam2(vinQueryReq, channelInfo);
-        VinQueryResp resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00009);
+        VinQueryResp resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00009, VinQueryResp.class);
         if (resp.getResultCode() == 1) {
             throw new SystemException(resp.getResultMsg() == null ? "未找到车辆信息" : resp.getResultMsg());
         }
@@ -1277,19 +1276,12 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         CarPriceMuchReq req = new CarPriceMuchReq();
         req.setUuid(uuid);
         req.setCarPriceMuchResp(carsDTO);
-        ResponseDto rest = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00017);
-
-        if (rest.getPlatformCode().equals("T0000000")) {
-            CarPriceResp resp = ResponseDto.buildBody(rest, CarPriceResp.class);
-            if (resp.getResultCode() == 1) {
-                throw new SystemException(resp.getResultMsg() == null ? "未获取到车价信息，请联系管理员" : resp.getResultMsg());
-            }
-            return resp.getData();
-
+        JSONObject request = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00017);
+        CarPriceResp resp = request.toJavaObject(CarPriceResp.class);
+        if (resp.getResultCode() == 1) {
+            throw new SystemException(resp.getResultMsg() == null ? "未获取到车价信息，请联系管理员" : resp.getResultMsg());
         }
-
-        return null;
-
+        return resp.getData();
 
     }
 
@@ -1300,7 +1292,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
         //请求信息列表
         List<String> requestInfoList = new ArrayList<>();
-
         boolean boo = true;
         //构造请求参数
         PremiumReq req = PremiumReq.buildQuoteParam(yaQuoteInfoVo, carPriceResult, vinQ);
@@ -1308,8 +1299,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         StringBuffer flag = new StringBuffer();
 
         while (boo) {
-
-            resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00004);
+            resp = guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00004, PremiumResp.class);
 //                //警告
 //                if (resp.getResultCode() == 0) throw new SystemException(resp.getResultMsg());
 
@@ -1356,7 +1346,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     public InsuranceSlipResp insuranceSlip(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum) {
         //构造请求参数
         InsuranceSlipReq req = InsuranceSlipReq.buildParam(yaQuoteInfoVo, carPriceNum);
-        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00006);
+        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00006, InsuranceSlipResp.class);
     }
 
 
@@ -1370,7 +1360,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         //构造请求参数
         SubmitAuditReq req = SubmitAuditReq.buildParam(iac, channelInfo);
 
-        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00007);
+        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIRBT00007, SubmitAuditResp.class);
     }
 
     /**
@@ -1394,7 +1384,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         paramMap.put("proposalNos", proposalNos);
 
         //投保单状态查询
-        return guorenRequestApiComponent.request(paramMap, PlatformInterfaceCode.API_IIRBT00010);
+        return guorenRequestApiComponent.request(paramMap, PlatformInterfaceCode.API_IIRBT00010, InsOrderStatusResp.class);
     }
 
 
@@ -1415,7 +1405,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         bodyMap.put("systemCode", "TQDL");
         bodyMap.put("requestTime", Instant.now().getEpochSecond() * 1000);
 
-        NonAutoInsResp resp = guorenRequestApiComponent.request(bodyMap, PlatformInterfaceCode.API_IIIRBT00053);
+        NonAutoInsResp resp = guorenRequestApiComponent.request(bodyMap, PlatformInterfaceCode.API_IIIRBT00053, NonAutoInsResp.class);
         if (null != resp.getData()) {
             return resp.getData();
         }
@@ -1437,7 +1427,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         //构造请求参数
         NonAutoInsOrderReq req = NonAutoInsOrderReq.buildParam(yaQuoteInfoVo, vinQ, accidentalDrivingVo, channelInfo, carPriceUuid);
 
-        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIIRBT00054);
+        return guorenRequestApiComponent.request(req, PlatformInterfaceCode.API_IIIRBT00054, SubmitAuditResp.class);
     }
 
 

src/main/java/com/ydtech/modules/order/service/impl/InsUploadFilesServiceImpl.java

@@ -81,10 +81,11 @@ public class InsUploadFilesServiceImpl extends ServiceImpl<InsUploadFilesMapper,
         insUploadFiles.setFilePath(storagePath);
         try (FileOutputStream fileOutputStream = new FileOutputStream(file)) {
             if (FileType.IMAGE.getType().equals(type)) {
-                // 图片格式需要压缩
-                byte[] compressPicByte = ImageCompressionUtils.compressPic(multipartFile.getInputStream(), suffix, uploadFilePath);
+                // 图片格式需要压缩.
+//                multipartFile.transferTo(new File(uploadPath));
+//                byte[] compressPicByte = ImageCompressionUtils.compressPic(multipartFile.getInputStream(), suffix, uploadFilePath);
 //                byte[] bytes = ImageCompressionUtils.compressPicForScale(compressPicByte, 100);
-                fileOutputStream.write(compressPicByte);
+                fileOutputStream.write(multipartFile.getBytes());
             } else {
                 fileOutputStream.write(multipartFile.getBytes());
             }

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -453,7 +453,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         InsOrders order = insOrdersService.getById(iac.getOrderno());
         // 获取协议配置信息
         YcConfigureParameters ycConfigureParameters = gainYcConfigParams(iac.getAgreementId());
-
         //车主
         CustomerInfoVo ownerInfo = order.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
         //被保人
@@ -525,8 +524,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
      */
     @Override
     public HttpResult uploadImageApi(String quoteOrderNo) {
-
-        String logNo = String.format("（日志号：%s)", IPUtil.gainServerNo());
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(quoteOrderNo);
         if (!iac.getOrderstatus().equals(InsOrderStatusEnum.QUOTE_ING.getCode())) {
             throw new SystemException("报价中的订单才允许核保");
@@ -635,7 +632,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 buildOrderStatus(order, iac);
 
                 sss.append("变更后订单状态：" + order.getOrderstatus());
-                log.info("-----------订单状态变动----------：" + sss.toString());
+                log.info("-----------订单状态变动----------：" + sss);
 
                 insAreaCompanyService.updateById(iac);
                 insOrdersService.updateById(order);