国任财险代码修改

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -16,70 +16,92 @@ 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 → src/main/java/com/ydtech/modules/ins/model/guoren/ChannelInfoResp.java

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.ins.model.guoRen;
+package com.ydtech.modules.ins.model.guoren;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -7,10 +7,10 @@ import com.alibaba.fastjson.TypeReference;
 import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.ins.model.guoRen.RequestDto;
-import com.ydtech.modules.ins.model.guoRen.ResponseDto;
-import com.ydtech.modules.order.components.InsCrawlerOrderComponents;
+import com.ydtech.modules.ins.model.guoren.RequestDto;
+import com.ydtech.modules.ins.model.guoren.ResponseDto;
 import com.ydtech.modules.order.entity.api.guoren.constants.PlatformInterfaceCode;
+import com.ydtech.modules.order.entity.api.guoren.constants.Response;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
@@ -41,7 +41,7 @@ public class GuorenRequestApiComponent {
     }
 
 
-    public JSONObject post(String logId, String message, @Nullable RequestDto requestBody) {
+    private ResponseDto<JSONObject> post(String logId, String message, @Nullable RequestDto requestBody) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 
@@ -58,23 +58,29 @@ public class GuorenRequestApiComponent {
         if (body1 == null) {
             throw new SystemException(message + "接口请求失败");
         }
-        ResponseDto<JSONObject> bResponseDto = JSON.parseObject(body1, new TypeReference<ResponseDto<JSONObject>>() {
+
+        return JSON.parseObject(body1, new TypeReference<ResponseDto<JSONObject>>() {
         });
-        if (!bResponseDto.getPlatformCode().equals("T0000000")) {
-            throw new SystemException(bResponseDto.getPlatformMsg());
-        }
-        return bResponseDto.getResponseBody();
+    }
+
+    private ResponseDto<JSONObject> post(Object o, PlatformInterfaceCode platformInterfaceCode) {
+        RequestDto requestBody = RequestDto.builRequestDto(o, platformInterfaceCode.getCode());
+        ResponseDto<JSONObject> post = post(InsuranceEnum.XDCX.getPinyin(), platformInterfaceCode.getDesc(), requestBody);
+        Response.verification(Response.API_T0000000, post);
+        return post;
     }
 
     public <B> B request(Object o, PlatformInterfaceCode platformInterfaceCode, Class<B> bClass) {
-        JSONObject request = request(o, platformInterfaceCode);
-        return request.toJavaObject(bClass);
+        ResponseDto<JSONObject> request = post(o, platformInterfaceCode);
+        return request.getResponseBody().toJavaObject(bClass);
     }
 
     public JSONObject request(Object o, PlatformInterfaceCode platformInterfaceCode) {
-        RequestDto requestBody = RequestDto.builRequestDto(o, platformInterfaceCode.getCode());
-        return post(InsuranceEnum.XDCX.getPinyin(), platformInterfaceCode.getDesc(), requestBody);
+        ResponseDto<JSONObject> post = post(o, platformInterfaceCode);
+        return post.getResponseBody();
     }
 
 
+
+
 }

src/main/java/com/ydtech/modules/order/entity/api/guoren/constants/Response.java

@@ -0,0 +1,26 @@
+package com.ydtech.modules.order.entity.api.guoren.constants;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.ins.model.guoren.ResponseDto;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum Response {
+
+    API_T0000000("T0000000", "请求成功");
+
+    private final String code;
+
+    private final String desc;
+
+    public static void verification(Response response, ResponseDto<JSONObject> bResponseDto) {
+        if (!response.code.equals(bResponseDto.getPlatformCode())) {
+            throw new SystemException(bResponseDto.getPlatformMsg());
+        }
+
+    }
+
+}

src/main/java/com/ydtech/modules/order/service/GuorenOrderApiService.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.order.service;
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ins.model.guoRen.NonAutoInsResp;
+import com.ydtech.modules.ins.model.guoren.NonAutoInsResp;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;

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

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
 import com.ydtech.constants.enums.InsQuoteFlow;
@@ -26,7 +25,7 @@ import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.InsApiLog;
-import com.ydtech.modules.ins.model.guoRen.*;
+import com.ydtech.modules.ins.model.guoren.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
@@ -58,7 +57,6 @@ import lombok.Data;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.Part;
 import org.apache.commons.httpclient.methods.multipart.StringPart;
-import org.apache.poi.hssf.record.SSTRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,19 +80,19 @@ import java.util.stream.Collectors;
 @Service
 public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
-
     private static final Logger log = LoggerFactory.getLogger("guoRen");
 
-    @Autowired
-    private GuorenApiConfigurationProperties properties;
-
     @Value("${upload.file.path}")
     private String uploadFilePath;
     @Value("${upload.file.url}")
+
     private String showFileUrl;
+
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private GuorenApiConfigurationProperties properties;
 
     @Autowired
     private InsAlltrustRegionMapper insAlltrustRegionMapper;
@@ -102,8 +100,6 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     @Autowired
     private InsOrdersComponents insOrdersComponents;
 
-    private ObjectMapper xmlMapper = null;
-
     @Autowired
     private InsAreaCompanyService insAreaCompanyService;
 
@@ -120,21 +116,19 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     private EsmInsCompanyService esmInsCompanyService;
 
     @Autowired
-    InsApiLogService insApiLogService;
+    private InsApiLogService insApiLogService;
 
     @Autowired
-    ConfigureParametersComponents configureParametersComponents;
+    private ConfigureParametersComponents configureParametersComponents;
 
     @Autowired
-    InsTaskImagesMapper insTaskImagesMapper;
+    private InsTaskImagesMapper insTaskImagesMapper;
 
     @Autowired
     private GuorenRequestApiComponent guorenRequestApiComponent;
 
-
     private static ChannelInfoDto channelInfo = null;
 
-
     //
     //==============================API 方式
     //
@@ -149,9 +143,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     public HttpResult gainChannelInfo(String thirdCode) {
         Map m = new HashMap();
         m.put("thirdCode", thirdCode);
-//        String bodyStr = RequestDto.builRequestDto(m, "IIRBT00018");
         ChannelInfoResp request = guorenRequestApiComponent.request(m, PlatformInterfaceCode.API_IIRBT00018, ChannelInfoResp.class);
-
         return HttpResult.ok(request);
     }
 
@@ -177,13 +169,12 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
         // 获取协议配置信息
         ChannelInfoDto channelInfo = gainChannelConfigInfo(quoteVo.getAgreementId());
-        if (null == channelInfo) return HttpResult.error("请先配置保险公司渠道信息");
+
         this.channelInfo = channelInfo;
 
         BaseQuoteInfoVo yaQuoteInfoVo = insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo());
         InsOrders order = insOrdersService.getById(yaQuoteInfoVo.getOrderNo());
         CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
-
         /**
          *  1、vin码查询
          */
@@ -196,27 +187,20 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         VinQueryResp.DataDTO vinQ = vinQuery(vinQueryReq);
         if (null == vinQ) return HttpResult.error("未找到匹配的车辆信息");
         log.debug("vin码查询通过---");
-
         /**
          *  2、车价查询
          */
         CarPriceResp.DataDTO carPriceResult = carPriceQuery(yaQuoteInfoVo, vinQ);
         if (null == carPriceResult) return HttpResult.error("车价获取失败");
 //        String redisNum = buildCarPriceQueryUidNum(order.getOrderno());
-
         log.debug("车价查询通过");
-
         /**
          *  3、保费计算
          */
         PremiumResp.DataDTO premiumResult = premiumQuery(yaQuoteInfoVo, carPriceResult, vinQ);
-
         if (null == premiumResult) return HttpResult.error("保费计算失败");
         log.debug("保费计算通过");
-
         //转保
-
-//
 //        /**
 //         * 创建非车订单
 //         */
@@ -259,14 +243,11 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         }
         InsOrders order = insOrdersService.getById(iac.getOrderno());
 
-
         //核保基本赋值
         iac.setAudittime(LocalDateTime.now());
         iac.setAuditid(order.getUserid());
         iac.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
 
-        BaseQuoteInfoVo yaQuoteInfoVo = insOrdersComponents.getQuoteInfo(order.getOrderno());
-
         //2、核保
         SubmitAuditResp auditResp = submitAudit(iac);
 
@@ -435,21 +416,15 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     @Override
     @Transactional
     public HttpResult pay(String companyId) {
-
         // 获取协议配置信息
         ChannelInfoDto channelInfo = gainChannelConfigInfo("115");
         if (null == channelInfo) return HttpResult.error("请先配置保险公司渠道信息");
         this.channelInfo = channelInfo;
-
         //子订单
         InsAreaCompany iac = insAreaCompanyService.getById(companyId);
         if (iac == null) {
             return HttpResult.error("订单不存在");
         }
-        InsOrders order = insOrdersService.getById(iac.getOrderno());
-
-        BaseQuoteInfoVo yaQuoteInfoVo = insOrdersComponents.getQuoteInfo(order.getOrderno());
-
         //获取缴费地址
         PayResp.DataDTO payResp = pay(iac);
         iac.setPaymentLink(payResp.getPayUrl());

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

@@ -52,9 +52,12 @@ import com.ydtech.modules.ins.model.yc.ruote.response.TfiWarnListResponse;
 import com.ydtech.modules.ins.service.InsApiLogService;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.InsOrdersComponents;
+import com.ydtech.modules.order.components.VerificationCodeIdentification;
 import com.ydtech.modules.order.components.yongcheng.YongchengRequestApiComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.crawler.request.RecognitionRequest;
+import com.ydtech.modules.order.entity.crawler.response.RecognitionResponse;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
@@ -63,7 +66,10 @@ import com.ydtech.modules.order.service.InsTaskImagesService;
 import com.ydtech.modules.order.service.YongchengOrderApiService;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
-import com.ydtech.utils.*;
+import com.ydtech.utils.DateTimeUtil;
+import com.ydtech.utils.IDCardUtils;
+import com.ydtech.utils.IPUtil;
+import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -399,6 +405,10 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     }
 
+    @Autowired
+    private VerificationCodeIdentification verificationCodeIdentification;
+
+
     /**
      * 报价  转保业务处理
      */
@@ -414,22 +424,31 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
                 requestInfoList.add(rr.getHead().getErrorMessage());
                 //调用python ocr
-                String sendBody = "";
-                Map bodyMap = new HashMap();
-                bodyMap.put("jqImage", StringUtils.isNotEmpty(cCheckCodeJQ) ? cCheckCodeJQ : "");
-                bodyMap.put("syImage", StringUtils.isNotEmpty(cCheckCodeSY) ? cCheckCodeSY : "");
-                sendBody = JsonUtils.toJson(bodyMap);
-                String ocrStr = HttpUtil.sendPost("http://47.92.254.66:8088/getres", sendBody);
-                Map ocrMap = JsonUtils.toObject(ocrStr, Map.class);
+                RecognitionRequest recognitionRequest = new RecognitionRequest();
+
+                if (!StringUtils.isNotEmpty(cCheckCodeJQ)) {
+                    recognitionRequest.setJgImage(cCheckCodeJQ);
+                }
+
+                if (!StringUtils.isNotEmpty(cCheckCodeSY)) {
+                    recognitionRequest.setSyImage(cCheckCodeSY);
+                }
+
+                RecognitionResponse recognition = verificationCodeIdentification.recognition(recognitionRequest);
 
                 m.getRequestLabel().getCondition().getVhl().setCBusType("2");
+                RecognitionResponse.Code data = recognition.getData();
                 //交强
-                m.getRequestLabel().getCondition().getVhl().setCCheckCodeJQ(ocrMap.get("jqImageCode").toString());
-                m.getRequestLabel().getCondition().getVhl().setCQryCdeJQ(StringUtils.isEmpty(ocrMap.get("jqImageCode").toString()) ? "" : rr.getVhl().getCQryCdeJQ());
+                if (!StringUtils.isNotEmpty(cCheckCodeJQ)) {
+                    m.getRequestLabel().getCondition().getVhl().setCCheckCodeJQ(data.getJqImageCode());
+                    m.getRequestLabel().getCondition().getVhl().setCQryCdeJQ(rr.getVhl().getCQryCdeJQ());
+                }
 
                 //商业
-                m.getRequestLabel().getCondition().getVhl().setCCheckCodeSY(ocrMap.get("syImageCode").toString());
-                m.getRequestLabel().getCondition().getVhl().setCQryCdeSY(rr.getVhl().getCQryCdeSY());
+                if (!StringUtils.isNotEmpty(cCheckCodeSY)) {
+                    m.getRequestLabel().getCondition().getVhl().setCCheckCodeSY(data.getSyImageCode());
+                    m.getRequestLabel().getCondition().getVhl().setCQryCdeSY(rr.getVhl().getCQryCdeSY());
+                }
 
                 return false;