诚泰车型查询修改

src/main/java/com/ydtech/modules/order/entity/api/chengtai/request/CarModelQueryRequest.java

@@ -2,6 +2,8 @@ package com.ydtech.modules.order.entity.api.chengtai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
+import com.ydtech.modules.order.entity.config.ChengTaiConfigureParameters;
+import com.ydtech.utils.SnowFlakeUtil;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,33 +16,83 @@ import lombok.NoArgsConstructor;
 @Data
 public class CarModelQueryRequest {
     /**
-     * 品牌型号
+     * 报文头信息（Head）
      */
-    @JsonProperty("brandName")
-    private String brandName;
+    @JsonProperty("head")
+    private head head;
 
     /**
-     * 当前页
+     * 基础信息（BasePart）
      */
-    @JsonProperty("nowPage")
-    private String nowPage;
+    @JsonProperty("body")
+    private body body;
+    @NoArgsConstructor
+    @Data
+    public static class head {
 
-    /**
-     * 每页条数
-     */
-    @JsonProperty("pageSize")
-    private String pageSize;
+        /**
+         * 用户名
+         */
+        @JsonProperty("userName")
+        private String userName;
 
-    /**
-     * 是否需要编码 前台页面直接请求，该字段不填；通过后台代码请求接口时该字段填：‘00000’
-     */
-    @JsonProperty("encode")
-    private String encode;
-
-    public CarModelQueryRequest(CarInfoVo carInfo) {
-        this.brandName = carInfo.getModelcname();
-        this.nowPage = "1";
-        this.pageSize = "20";
-        this.encode = "00000";
+        /**
+         * 密码
+         */
+        @JsonProperty("passWord")
+        private String passWord;
+
+        /**
+         * 外网提供的唯一标志
+         */
+        @JsonProperty("queryId")
+        private String queryId;
+
+        /**
+         * 合作伙伴代码
+         */
+        @JsonProperty("partnerCode")
+        private String partnerCode;
+
+        public head(ChengTaiConfigureParameters parameters) {
+            this.userName = parameters.getUserName();
+            this.passWord = parameters.getPassWord();
+            this.queryId = String.valueOf(new SnowFlakeUtil().nextId());
+            this.partnerCode = parameters.getPartnerCode();
+        }
+
+
+    }
+    @NoArgsConstructor
+    @Data
+    public static class body {
+        /**
+         * 品牌型号
+         */
+        @JsonProperty("brandName")
+        private String brandName;
+
+        /**
+         * 当前页
+         */
+        @JsonProperty("nowPage")
+        private String nowPage;
+
+        /**
+         * 每页条数
+         */
+        @JsonProperty("pageSize")
+        private String pageSize;
+        public body(CarInfoVo carInfo) {
+            this.brandName = carInfo.getModelcname();
+            this.nowPage = "1";
+            this.pageSize = "20";
+        }
+    }
+
+
+    public CarModelQueryRequest(ChengTaiConfigureParameters parameters,CarInfoVo carInfo) {
+        this.head = new head(parameters);
+        this.body = new body(carInfo);
     }
 }

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

@@ -144,7 +144,8 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
                 ptlAgreementAttribution);
 
         /** 2. 查询并过滤车辆车型 */
-        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(quoteInfoVo.getCarInfo());
+//        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(quoteInfoVo.getCarInfo());
+        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(parameters,quoteInfoVo.getCarInfo());
         CarModelQueryResponse carModelQueryResponse = chengTaiRequestApiComponent.carModelQuery(carModelQueryRequest);
         CarModelQueryResponse.vehicle vehicle =
                 new CarModelsFilterUtils<CarModelQueryResponse.vehicle>().to(
@@ -901,7 +902,8 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
          * 诚泰车型查询
          */
         CarInfoVo carInfo = JSON.toJavaObject(JSONObject.parseObject(insAreaCompanyInfo.getCarInfo()), CarInfoVo.class);
-        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(carInfo);
+//        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(carInfo);
+        CarModelQueryRequest carModelQueryRequest = new CarModelQueryRequest(parameters,carInfo);
         CarModelQueryResponse carModelQueryResponse = chengTaiRequestApiComponent.carModelQuery(carModelQueryRequest);
         CarModelQueryResponse.vehicle vehicle =
                 new CarModelsFilterUtils<CarModelQueryResponse.vehicle>().to(carModelQueryResponse.getVehicleList(),