诚泰报价的修改

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarInfo.java

@@ -80,7 +80,7 @@ public class InsOrdersCarInfo extends BaseModel {
     private String licenseKindCode;
 
     @Schema(description = "注册日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime registerDate;
 
     @Schema(description = "发证日期")
@@ -95,4 +95,4 @@ public class InsOrdersCarInfo extends BaseModel {
     @Schema(description = "是否商业过户")
     private int transferBi;
 
-}
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarUserInfo.java

@@ -75,12 +75,12 @@ public class InsOrdersCarUserInfo extends BaseModel {
     private String contactIdentifyNumber;
 
     @Schema(description = "联系人证件有效开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate contactIdentifyValidDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime contactIdentifyValidDate;
 
     @Schema(description = "联系人证件有效结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate contactIdentifyValidEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime contactIdentifyValidEndDate;
 
     @Schema(description = "电子邮箱")
     private String email;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersPolicy.java

@@ -30,4 +30,4 @@ public class InsOrdersPolicy {
 
     @Schema(description = "驾意险保单号")
     private String jyPolicyNo;
-}
+}

gateway/src/main/resources/application-dev.yml

@@ -33,4 +33,4 @@ spring:
         - id: summary_route
           uri: http://localhost:9898/
           predicates:
-            - Path= /order/identify/** ,/supplementOrder/**,/order/carModel/**
+            - Path= /order/identify/** ,/supplementOrder/** ,/unify/order/** ,/order/carModel/**

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/component/ChengTaiRequestApiComponent.java

@@ -6,6 +6,7 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import com.jzg.quotation.chengtai.api.entity.ChengTaiEncrypted;
+import com.jzg.quotation.chengtai.api.entity.constants.ResponseCode;
 import com.jzg.quotation.chengtai.api.entity.constants.enums.RequestUrl;
 import com.jzg.quotation.chengtai.api.entity.request.*;
 import com.jzg.quotation.chengtai.api.entity.response.*;
@@ -18,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -56,16 +58,19 @@ public class ChengTaiRequestApiComponent {
             String encryptStr = RSAUtil.encryptString(ctPublicKey, baseStr); //加密
             String signatureStr = RSAUtil.signature(baseStr, privateKey);  //加签
             ChengTaiEncrypted chengTaiEncrypted = new ChengTaiEncrypted(encryptStr,chengTaiApiProperties,signatureStr);
-
+            System.out.println(JSON.toJSON(chengTaiEncrypted));
             ResponseEntity<B> bResponseEntity = requestComponent.objectPost(url, chengTaiEncrypted, responseType, httpHeaders);
 
             String body = JSON.toJSONString(bResponseEntity.getBody());//需要联调观察数据格式
-
+            B res = JSON.parseObject(body).toJavaObject(responseType);
+            if (!ResponseCode.R_000.getCode().equals(res.getCode())){throw new SystemException(res.message);}
             // 解密响应
-            String newSource = RSAUtil.decryptString(privateKey, body);
-//            info = new String(Base64.getDecoder().decode(newSource), Charset.forName("UTF-8"));
-//            flag = RSAUtil.signatureVerfiy(newSource, body, ctPublicKey);
-            return JSON.parseObject(body).toJavaObject(responseType);
+            String newSource = RSAUtil.decryptString(privateKey, res.encryptionMessage);
+            String info = new String(Base64.getDecoder().decode(newSource), Charset.forName("UTF-8"));
+            boolean flag = RSAUtil.signatureVerfiy(newSource, res.signature, ctPublicKey);
+            if(!flag){throw new SystemException(res.message);}
+            res.setDecodeData(info);
+            return res;
         }catch (Exception e){
             throw new SystemException(e.toString());
         }
@@ -76,17 +81,20 @@ public class ChengTaiRequestApiComponent {
     }
 
     public <T extends BaseRequest, B extends BaseResponse> B requestUrlToken(String url, T requestBody, Class<B> responseType, HttpHeaders httpHeaders) {
-        String busReqString = JSON.toJSONString(requestBody, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty);
         try{
-
             ResponseEntity<B> bResponseEntity = requestComponent.objectPost(url, requestBody, responseType, httpHeaders);
             String body = JSON.toJSONString(bResponseEntity.getBody());//需要联调观察数据格式
+            B res = JSON.parseObject(body).toJavaObject(responseType);
+            if (!ResponseCode.R_000.getCode().equals(res.getCode())){throw new SystemException(res.message);}
             PrivateKey privateKey = RSAUtil.getPrivateKeyFromPKCS8("RSA", chengTaiApiProperties.getPrivateKey());
+            PublicKey ctPublicKey = RSAUtil.getPublicKeyFromX509("RSA", chengTaiApiProperties.getCtPublicKey());
             // 解密响应
-            String newSource = RSAUtil.decryptString(privateKey, body);
-//            info = new String(Base64.getDecoder().decode(newSource), Charset.forName("UTF-8"));
-//            flag = RSAUtil.signatureVerfiy(newSource, body, ctPublicKey);
-            return JSON.parseObject(body).toJavaObject(responseType);
+            String newSource = RSAUtil.decryptString(privateKey, res.encryptionMessage);
+            String info = new String(Base64.getDecoder().decode(newSource), Charset.forName("UTF-8"));
+            boolean flag = RSAUtil.signatureVerfiy(newSource, res.signature, ctPublicKey);
+            if(!flag){throw new SystemException(res.message);}
+            res.setDecodeData(info);
+            return res;
         }catch (Exception e){
             throw new SystemException(e.toString());
         }
@@ -121,20 +129,20 @@ public class ChengTaiRequestApiComponent {
 
         HttpHeaders httpHeaders = new HttpHeaders();
         String authorization = (String) redissonClient
-                .getMap(CacheConstant.CHENGTAI_AUTHORIZATION + chengTaiApiConfigureParameters.getPartnerCode())
+                .getMap(CacheConstant.CHENGTAI_AUTHORIZATION + chengTaiApiConfigureParameters.getUserId())
                 .get(AUTHORIZATION);
 
         if (StringUtils.isNotBlank(authorization)) {
             System.out.print("---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n");
             System.out.printf("authorization:" + authorization);
             System.out.print("---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n---------------\n--------------\n");
-            httpHeaders.set(AUTHORIZATION, authorization);
+            httpHeaders.set(AUTHTOKEN, authorization);
             httpHeaders.setContentType(MediaType.APPLICATION_JSON);
             return httpHeaders;
         }
 
         // 使用分布式锁 只有一个人可以访问登录
-        RLock lock = redissonClient.getLock(CacheConstant.CT_ACCESS_LOCK + chengTaiApiConfigureParameters.getPartnerCode());
+        RLock lock = redissonClient.getLock(CacheConstant.CT_ACCESS_LOCK + chengTaiApiConfigureParameters.getUserId());
         try {
             boolean isLock = lock.tryLock(1, 10000, TimeUnit.MILLISECONDS);
             if (isLock) {
@@ -174,12 +182,12 @@ public class ChengTaiRequestApiComponent {
      */
     private HttpHeaders getToken(ChengTaiApiConfigureParameters chengTaiApiConfigureParameters, HttpHeaders httpHeaders) {
 
-        ChengTaiTokenRequest request = new ChengTaiTokenRequest(chengTaiApiConfigureParameters.getPartnerCode());
+        ChengTaiTokenRequest request = new ChengTaiTokenRequest(chengTaiApiProperties.getPartnerCode());
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         ChengTaiTokenResponse accessToken = getAccessToken(request,httpHeaders);
         httpHeaders.set(AUTHTOKEN, accessToken.getAccessToken());
         // 3.1 存入redis中
-        RMap<Object, Object> rMap = redissonClient.getMap(CacheConstant.CHENGTAI_AUTHORIZATION + chengTaiApiConfigureParameters.getPartnerCode());
+        RMap<Object, Object> rMap = redissonClient.getMap(CacheConstant.CHENGTAI_AUTHORIZATION + chengTaiApiConfigureParameters.getUserId());
         rMap.put(AUTHORIZATION, accessToken.getAccessToken());
         rMap.expire(Duration.ofHours(CacheConstant.CHENGTAI_AUTHORIZATION_TIME));
         return httpHeaders;
@@ -193,10 +201,14 @@ public class ChengTaiRequestApiComponent {
      * @return 出参实体
      */
     private ChengTaiTokenResponse getAccessToken(ChengTaiTokenRequest chengTaiTokenRequest, HttpHeaders httpHeaders) {
-        return requestRequestUrlToken(RequestUrl.Z00001,
+        ChengTaiTokenResponse response = requestRequestUrlToken(RequestUrl.Z00001,
                 chengTaiTokenRequest,
                 ChengTaiTokenResponse.class,
                 httpHeaders);
+        ChengTaiTokenResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(ChengTaiTokenResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 
 
@@ -208,7 +220,15 @@ public class ChengTaiRequestApiComponent {
      * @return 出参实体
      */
     public CarInfoResponse carinfoQuery(CarInfoRequest carInfoRequest, HttpHeaders httpHeaders, String partnerCode) {
-        return requestRequestUrl(RequestUrl.Z00002, carInfoRequest, CarInfoResponse.class, httpHeaders, partnerCode);
+        CarInfoResponse response = requestRequestUrl(RequestUrl.Z00002,
+                carInfoRequest,
+                CarInfoResponse.class,
+                httpHeaders,
+                partnerCode);
+        CarInfoResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(CarInfoResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 
     /**
@@ -220,7 +240,16 @@ public class ChengTaiRequestApiComponent {
      * @return 出参实体
      */
     public QueryCarActualValueResponse queryActualValue(QueryCarActualValueRequest carActualValueRequest, HttpHeaders httpHeaders, String partnerCode) {
-        return requestRequestUrl(RequestUrl.Z00003, carActualValueRequest, QueryCarActualValueResponse.class, httpHeaders, partnerCode);
+        QueryCarActualValueResponse response = requestRequestUrl(RequestUrl.Z00003,
+                carActualValueRequest,
+                QueryCarActualValueResponse.class,
+                httpHeaders,
+                partnerCode);
+
+        QueryCarActualValueResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(QueryCarActualValueResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 
 
@@ -232,7 +261,15 @@ public class ChengTaiRequestApiComponent {
      * @return 出参实体
      */
     public InsurePremiumResponse calculatePremium(InsurePremiumRequest insurePremiumRequest, HttpHeaders httpHeaders, String partnerCode) {
-        return requestRequestUrl(RequestUrl.Z00004, insurePremiumRequest, InsurePremiumResponse.class, httpHeaders, partnerCode);
+        InsurePremiumResponse response = requestRequestUrl(RequestUrl.Z00004,
+                insurePremiumRequest,
+                InsurePremiumResponse.class,
+                httpHeaders,
+                partnerCode);
+        InsurePremiumResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(InsurePremiumResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 
     /**
@@ -243,7 +280,15 @@ public class ChengTaiRequestApiComponent {
      * @return 出参实体
      */
     public PayUrlResponse getPayUrl(PayUrlRequest payUrlRequest, HttpHeaders httpHeaders, String partnerCode) {
-        return requestRequestUrl(RequestUrl.Z00010, payUrlRequest, PayUrlResponse.class, httpHeaders, partnerCode);
+        PayUrlResponse response = requestRequestUrl(RequestUrl.Z00010,
+                payUrlRequest,
+                PayUrlResponse.class,
+                httpHeaders,
+                partnerCode);
+        PayUrlResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(PayUrlResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 
     /**
@@ -255,6 +300,14 @@ public class ChengTaiRequestApiComponent {
      * @return
      */
     public UploadFileResponse submitImage(UploadFileRequest uploadFileRequest, HttpHeaders httpHeaders, String partnerCode) {
-        return requestRequestUrl(RequestUrl.Z00005, uploadFileRequest, UploadFileResponse.class, httpHeaders, partnerCode);
+        UploadFileResponse response = requestRequestUrl(RequestUrl.Z00005,
+                uploadFileRequest,
+                UploadFileResponse.class,
+                httpHeaders,
+                partnerCode);
+        UploadFileResponse res = JSON.parseObject(response.getDecodeData()).toJavaObject(UploadFileResponse.class);
+        res.setCode(response.getCode());
+        res.setMessage(response.getMessage());
+        return res;
     }
 }

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/ChengTaiApiConfigureParameters.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.chengtai.api.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.commons.standard.ConfigureParameters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -12,17 +13,10 @@ import java.io.Serial;
 @Data
 public class ChengTaiApiConfigureParameters implements ConfigureParameters {
 
-    @Serial
-    private static final long serialVersionUID = 0xa297c16d38ff40b1L;
-
-    /**
-     * 诚泰接入方code
-     */
-    private String partnerCode;
-
     /**
-     * 诚泰接入方code
+     * 诚泰业务员
      */
-    private String userId;
+    @JsonProperty("UserId")
+    private String UserId;
 
 }

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/CarInfoRequest.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.chengtai.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -30,8 +29,8 @@ public class CarInfoRequest extends BaseRequest {
     @JsonProperty("count")
     private Integer count;
 
-    public CarInfoRequest(ChengTaiApiConfigureParameters parameters, String brandName) {
-        super(parameters.getPartnerCode());
+    public CarInfoRequest(String partnerCode, String brandName) {
+        super(partnerCode);
         this.modelCName = brandName;
         this.begin = 0;
         this.count = 50;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/InsurePremiumRequest.java

@@ -73,8 +73,8 @@ public class InsurePremiumRequest extends BaseRequest {
     public InsurePremiumRequest(CarInfoResponse.CarModelListDTO carModelListDTO,
                                 QueryCarActualValueResponse carActualValueResponse,
                                 ChengTaiApiConfigureParameters parameters,
-                                QuoteVo quoteVo){
-        super(parameters.getPartnerCode());
+                                QuoteVo quoteVo, String partnerCode){
+        super(partnerCode);
         // 标的信息
         InsuredObjectDTO insuredObject = new InsuredObjectDTO(quoteVo, carModelListDTO,carActualValueResponse);
         this.insuredObject = insuredObject;
@@ -1150,6 +1150,7 @@ public class InsurePremiumRequest extends BaseRequest {
 
             public ContractMainDTO(RiskInfoVo quoteInfoVo){
                 this.riskCode = RiskCodeEnum.R1002.getCode();
+                this.riskName = RiskCodeEnum.R1002.getDesc();
                 this.validAtOnce = !quoteInfoVo.isInstantFlag()?"0" : "1"; // 及时起保
                 this.validDate =quoteInfoVo.getStartDate();
                 this.expiryDate =quoteInfoVo.getEndDate();

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/PayUrlRequest.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.chengtai.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -30,8 +29,8 @@ public class PayUrlRequest extends BaseRequest{
     @JsonProperty("isSendMsg")
     private boolean isSendMsg;
 
-    public PayUrlRequest(ChengTaiApiConfigureParameters parameters, String orderId) {
-        super(parameters.getPartnerCode());
+    public PayUrlRequest(String partnerCode, String orderId) {
+        super(partnerCode);
         this.orderId = orderId;
         this.type = "1";
         this.isSendMsg = false;

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/QueryCarActualValueRequest.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.chengtai.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import com.jzg.quotation.chengtai.api.entity.constants.PlateType;
 import com.jzg.quotation.chengtai.api.entity.response.CarInfoResponse;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
@@ -12,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * 【车辆价值计算】请求实体
@@ -81,8 +81,8 @@ public class QueryCarActualValueRequest extends BaseRequest{
     @JsonProperty("energyTypes")
     private String energyTypes;
 
-    public QueryCarActualValueRequest(QuoteVo quoteVo, CarInfoResponse.CarModelListDTO carModelListDTO, ChengTaiApiConfigureParameters parameters){
-        super(parameters.getPartnerCode());
+    public QueryCarActualValueRequest(QuoteVo quoteVo, CarInfoResponse.CarModelListDTO carModelListDTO, String partnerCode){
+        super(partnerCode);
         String purchasePrice = carModelListDTO.getPurchasePrice(); // 新车购置价格
         BigDecimal seatCount = carModelListDTO.getApprovedPassengersCapacity(); // 核定载客人数
 
@@ -90,9 +90,13 @@ public class QueryCarActualValueRequest extends BaseRequest{
         CarInfoVo carInfo = quoteVo.getCarInfoVo();
         RiskInfoVo ciRiskInfoVo = quoteVo.getCiRiskInfoVo(); // 交强险
         RiskInfoVo biRiskInfoVo = quoteVo.getBiRiskInfoVo(); // 商业险
-
-        String jqStartDate = ciRiskInfoVo.getStartDate(); // 交强起保日期
-        String syStartDate = biRiskInfoVo.getStartDate(); // 商业起保日期
+        String jqStartDate = ""; // 交强起保日期
+        String syStartDate = ""; // 商业起保日期
+        if(Objects.nonNull(ciRiskInfoVo)){
+            jqStartDate = ciRiskInfoVo.getStartDate(); // 交强起保日期
+        } else if(Objects.nonNull(biRiskInfoVo)){
+            syStartDate = biRiskInfoVo.getStartDate(); // 商业起保日期
+        }
         this.ciValidDate = jqStartDate;
         this.biValidDate = syStartDate;
         this.purchasePrice = new BigDecimal(purchasePrice);

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/UnderwritingRequest.java

@@ -15,8 +15,8 @@ public class UnderwritingRequest extends BaseRequest{
     @JsonProperty("orderId")
     private String orderId;
 
-    public UnderwritingRequest(ChengTaiApiConfigureParameters parameters, String orderId) {
-        super(parameters.getPartnerCode());
+    public UnderwritingRequest(String partnerCode, String orderId) {
+        super(partnerCode);
         this.orderId = orderId;
     }
 }

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/request/UploadFileRequest.java

@@ -1,13 +1,11 @@
 package com.jzg.quotation.chengtai.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -46,8 +44,8 @@ public class UploadFileRequest extends BaseRequest{
     @JsonProperty("fileList")
     private List<FileListDTO> fileList;
 
-    public UploadFileRequest(InsuranceImageVo insuranceImageVo, String orderNo, ChengTaiApiConfigureParameters parameters){
-        super(parameters.getPartnerCode());
+    public UploadFileRequest(InsuranceImageVo insuranceImageVo, String orderNo, String ppartnerCode){
+        super(ppartnerCode);
         this.orderId = orderNo;
         String imageType = insuranceImageVo.getImageType();
 

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/entity/response/BaseResponse.java

@@ -29,18 +29,14 @@ public class BaseResponse implements Serializable {
     @JsonProperty("code")
     public String code;
 
-    @JsonProperty("responseCode")
-    public String responseCode;
-
-    @JsonProperty("errorMessage")
-    public String errorMessage;
+    @JsonProperty("decodeData")
+    public String decodeData;
 
     @JsonProperty("message")
     public String message;
 
-    @JsonProperty("systemCode")
-    public String systemCode;
-
     @JsonProperty("flag")
     public Boolean flag;
+
+
 }

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/api/service/impl/ChengTaiApiRequestImpl.java

@@ -1,11 +1,13 @@
 package com.jzg.quotation.chengtai.api.service.impl;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.quotation.chengtai.api.build.ChengTaiAPIQuoteResultsVoBuild;
 import com.jzg.quotation.chengtai.api.component.ChengTaiRequestApiComponent;
 import com.jzg.quotation.chengtai.api.entity.ChengTaiApiConfigureParameters;
 import com.jzg.quotation.chengtai.api.entity.po.ChengTaiApiOrder;
 import com.jzg.quotation.chengtai.api.entity.request.*;
 import com.jzg.quotation.chengtai.api.entity.response.*;
+import com.jzg.quotation.chengtai.api.properties.ChengTaiApiProperties;
 import com.jzg.quotation.chengtai.api.service.ChengTaiApiRequest;
 import com.jzg.quotation.chengtai.api.service.ChengTaiCrawlerOrderService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
@@ -35,6 +37,8 @@ public class ChengTaiApiRequestImpl implements ChengTaiApiRequest {
 
     private final ChengTaiCrawlerOrderService chengTaiCrawlerOrderService;
 
+    private final ChengTaiApiProperties chengTaiApiProperties;
+
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) {
         OrderBase order = quoteVo.getOrder();
@@ -45,16 +49,16 @@ public class ChengTaiApiRequestImpl implements ChengTaiApiRequest {
         HttpHeaders httpHeaders = chengTaiRequestApiComponent.getHttpHeaders(parameters);
         // 车型查询
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
-        CarInfoRequest carInfoRequest = new CarInfoRequest(parameters, carInfoVo.getBrandName());
-        CarInfoResponse carInfoResponse = chengTaiRequestApiComponent.carinfoQuery(carInfoRequest, httpHeaders,parameters.getPartnerCode());
+        CarInfoRequest carInfoRequest = new CarInfoRequest(chengTaiApiProperties.getPartnerCode(), carInfoVo.getBrandName());
+        CarInfoResponse carInfoResponse = chengTaiRequestApiComponent.carinfoQuery(carInfoRequest, httpHeaders,chengTaiApiProperties.getPartnerCode());
         // 过滤车型
         CarInfoResponse.CarModelListDTO carModelListDTO = CarModelsFilterUtils.to(carInfoResponse.getCarModelList(), carInfoVo);
         // 计算车辆价格
-        QueryCarActualValueRequest carActualValueRequest = new QueryCarActualValueRequest(quoteVo,carModelListDTO, parameters);
-        QueryCarActualValueResponse carActualValueResponse = chengTaiRequestApiComponent.queryActualValue(carActualValueRequest,httpHeaders,parameters.getPartnerCode());
+        QueryCarActualValueRequest carActualValueRequest = new QueryCarActualValueRequest(quoteVo,carModelListDTO, chengTaiApiProperties.getPartnerCode());
+        QueryCarActualValueResponse carActualValueResponse = chengTaiRequestApiComponent.queryActualValue(carActualValueRequest,httpHeaders,chengTaiApiProperties.getPartnerCode());
         // 报价
-        InsurePremiumRequest insurePremiumRequest = new InsurePremiumRequest(carModelListDTO, carActualValueResponse,parameters,quoteVo);
-        InsurePremiumResponse insurePremiumResponse = chengTaiRequestApiComponent.calculatePremium(insurePremiumRequest,httpHeaders,parameters.getPartnerCode());
+        InsurePremiumRequest insurePremiumRequest = new InsurePremiumRequest(carModelListDTO, carActualValueResponse,parameters,quoteVo,chengTaiApiProperties.getPartnerCode());
+        InsurePremiumResponse insurePremiumResponse = chengTaiRequestApiComponent.calculatePremium(insurePremiumRequest,httpHeaders,chengTaiApiProperties.getPartnerCode());
 
         // 处理重复投保
 
@@ -89,8 +93,8 @@ public class ChengTaiApiRequestImpl implements ChengTaiApiRequest {
         HttpHeaders httpHeaders = chengTaiRequestApiComponent.getHttpHeaders(parameters);
 
         // 获取支付链接
-        PayUrlRequest payUrlRequest = new PayUrlRequest(parameters,chengTaiApiOrder.getOrderNo());
-        PayUrlResponse payUrlResponse = chengTaiRequestApiComponent.getPayUrl(payUrlRequest, httpHeaders,parameters.getPartnerCode());
+        PayUrlRequest payUrlRequest = new PayUrlRequest(chengTaiApiProperties.getPartnerCode(),chengTaiApiOrder.getOrderNo());
+        PayUrlResponse payUrlResponse = chengTaiRequestApiComponent.getPayUrl(payUrlRequest, httpHeaders,chengTaiApiProperties.getPartnerCode());
         PaymentLinkResultsVo paymentLinkResultsVo = new PaymentLinkResultsVo();
         paymentLinkResultsVo.setPaymentLink(payUrlResponse.getSmsUrl());
         return paymentLinkResultsVo;
@@ -109,8 +113,8 @@ public class ChengTaiApiRequestImpl implements ChengTaiApiRequest {
         // 上传影像信息
         List<InsuranceImageVo> imageVoList = insuranceUploadImageVo.getImageVoList();
         imageVoList.forEach(imageVo -> {
-            UploadFileRequest uploadFileRequest = new UploadFileRequest(imageVo, chengTaiApiOrder.getOrderNo(), parameters);
-            UploadFileResponse uploadFileResponse = chengTaiRequestApiComponent.submitImage(uploadFileRequest,httpHeaders,parameters.getPartnerCode());
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(imageVo, chengTaiApiOrder.getOrderNo(), chengTaiApiProperties.getPartnerCode());
+            UploadFileResponse uploadFileResponse = chengTaiRequestApiComponent.submitImage(uploadFileRequest,httpHeaders,chengTaiApiProperties.getPartnerCode());
         });
     }
 

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

@@ -1,5 +1,6 @@
 package com.jzg.quotation.summary.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -109,9 +110,10 @@ public class UnifyOrderManager {
                 platformClient,
                 baseController);
 
-        Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCode());
-        QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()));
-
+        if(CollUtil.isNotEmpty(quoteVo.getKindInfoVo())){
+            Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCode());
+            QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()));
+        }
         // 生成订单
         String ordersNo = insOrdersService.generateOrders(quoteVo);
 

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

@@ -1,5 +1,6 @@
 package com.jzg.quotation.summary.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersKind;
@@ -17,7 +18,7 @@ public class InsOrdersKindServiceImpl extends ServiceImpl<InsOrdersKindMapper, I
     @Override
     public void createKind(InsOrders insOrders, List<KindInfoVo> kindInfoVo, String companyCode) {
         List<InsOrdersKind> insOrdersKinds = new ArrayList<>();
-        if (kindInfoVo != null) {
+        if (CollUtil.isNotEmpty(kindInfoVo)) {
             for (KindInfoVo kindInfoVo1 : kindInfoVo) {
                 InsOrdersKind insOrdersKind = new InsOrdersKind();
                 insOrdersKind.setOrderNo(insOrders.getId());

tenant/insurance/quotation-summary/src/main/resources/application.yaml

@@ -97,4 +97,12 @@ yangguang:
     secret: 6CPxxlHwLLphTR7gVg3hJLsH
     referer: SXJZG
 
+chengtai:
+  api:
+    baseUrl: http://39.98.238.167/chengtai/app/SERVER_V2/4001/
+    ctPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvuUnoPTFin84nDdpNZFDiGZgUKn6d9fbp6F4/fqrb6pFoJX/wLMr0IsheP0ZnVCPpLGKLjflPNHJo/P9WRRTSM67D8fRD8GKoq+7CtSJkdIticASpN/U8AgJiNV6xdReJcMkaAWJ1ZbOQ+nYLg9OE0qQ6cuXqhy/wVrqx72CrvwIDAQAB
+    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyVlpqmibguria884GdAYEuqCV4aQRl2N21+7l8Vxocoyz+M8KYyXqmlLKqApNL/U5pUVTjS6vpC6ojS+wvNbawijeMsm8r2NOlTHBnQ5vN0azjjPPtSrxgHL8/EYBa4lmBcexdmcUrUyWjAIYqfO8dlY+RuXvbiw7fBHZ7xpAvQIDAQAB
+    privateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALJWWmqaJuC6uJrzzgZ0BgS6oJXhpBGXY3bX7uXxXGhyjLP4zwpjJeqaUsqoCk0v9TmlRVONLq+kLqiNL7C81trCKN4yybyvY06VMcGdDm83RrOOM8+1KvGAcvz8RgFriWYFx7F2ZxStTJaMAhip87x2Vj5G5e9uLDt8EdnvGkC9AgMBAAECgYEAsEOHdEvOV1pWMdj9bgVpGW14YQu3RSfTSFheqGkpg5aMmSk3QbYDeOB1KhZysB3Ri9tdLRqi5TkqYK/DTjUnSUMs0iMhx0XaY2z3w16AMpvuJ0FZ4S2h8oAFfOWe4F6bpUYU8qmXANAaXcMm6HjU8k1QuTbjlSOeLujl8W7zk8ECQQDlHbUQ911kWmsSo8NE4S1+dq/6T+yIGCJlXzlNh/z6giMpjp8Dzm3fxDHLeZa+DCrhpT1qe6O3oGwx3HeR/85NAkEAx0NUy6pX5WolV+YAoLNHAmcCP26wQTB7LZ7mXbxww4yNNH9CWHE9PaBuV4Ws4NxSAnRDxrgArkz5+wgqnXzUMQJAHr16orkdra43+XtBYsd3jCUufT4l9SiPzNwW2yEovw+g2h2JlkAnG8O+DpfUstD9G+NItzW5hJSgj5wN6ufQbQJACEtdND0a+4m3lDkWvZm40vjGty08WPpTpkp+/FfjucAYAJ9re5L7IZ2T+kCuOY3yO/fq+lKedKLvpOtqGrQfgQJBAJ1wMccz+1ez8qpyTWbzj2h0O+GV+YDHqJ9SwRWcSacZOeAyO7UMgIZEwoYfs4nhye7DZH9e4BfkwBmFHJKwJNs=
+    partnerCode: JZG_TYTQ_SX
+
 

tenant/organization/src/main/resources/application.yml

@@ -49,7 +49,6 @@ tenant:
     - ins_business_insurance_option
     - ins_business_insurance
     - ptl_agreement_attribution
-    - sys_dept
     - ptl_agreement_dept
     - ptl_agreement_undwrt_rules_attr
     - ptl_agreement_undwrt_rules_dict_labal