Merge branch 'master' into test

src/main/java/com/ydtech/config/properties/HuaTaiApiConfigurationProperties.java

@@ -23,8 +23,6 @@ public class HuaTaiApiConfigurationProperties {
     private String selfPrivateKey;
     // 华泰RSA公钥
     private String huaTaiPublicKey;
-    //合作方代码，由华泰分配
-    private String insuredCode;
     //系统来源代码，由华泰分配
     private String sourceCode;
 

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiQuotationProcessorComponent.java

@@ -25,10 +25,10 @@ public class HuaTaiQuotationProcessorComponent {
 
     private final HuaTaiRepeatInsuranceComponents huaTaiRepeatInsuranceComponents;
 
-    public HuaTaiQuotedPriceResponse handler(HuaTaiQuotedPriceRequest quotedPriceRequest, List<String> warnMessageList) {
+    public HuaTaiQuotedPriceResponse handler(HuaTaiQuotedPriceRequest quotedPriceRequest, List<String> warnMessageList, String insuredCode) {
         boolean b;
         HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiRequestApiComponents.quotedPrice(quotedPriceRequest,
-                HuaTaiQuotedPriceResponse.class);
+                HuaTaiQuotedPriceResponse.class,  insuredCode);
 
         // 将报价号和校验码置空
         List<HuaTaiQuotedPriceRequest.ContractDto> contract1 = quotedPriceRequest.getBusinessData().getContract();
@@ -40,25 +40,25 @@ public class HuaTaiQuotationProcessorComponent {
         // 交强险重复投保
         b = huaTaiRepeatInsuranceComponents.compulsoryInsurance(quotedPriceRequest, quotedPriceResponse, warnMessageList);
         if (b) {
-            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList);
+            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList, insuredCode);
         }
 
         // 商业险重复投保
         b = huaTaiRepeatInsuranceComponents.commercialInsurance(quotedPriceRequest, quotedPriceResponse, warnMessageList);
         if (b) {
-            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList);
+            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList, insuredCode);
         }
 
         // 校验码
         b = huaTaiReinsuranceComponents.processor(quotedPriceResponse, quotedPriceRequest);
         if (b) {
-            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList);
+            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList, insuredCode);
         }
 
         // 校验码有误
         b = huaTaiReinsuranceComponents.processor(quotedPriceResponse);
         if (b) {
-            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList);
+            quotedPriceResponse = handler(quotedPriceRequest, warnMessageList, insuredCode);
         }
 
 

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiRequestApiComponents.java

@@ -61,7 +61,7 @@ public class HuaTaiRequestApiComponents {
      * @param <S>    Response 响应体
      * @return <S>
      */
-    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S post(Q q, String url, Class<S> tClass) {
+    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S post(Q q, String url, Class<S> tClass, String insuredCode) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 
@@ -82,7 +82,7 @@ public class HuaTaiRequestApiComponents {
             throw new SystemException("RSA加密获取accessToken失败！");
         }
         HuaTaiEncryptReq encryptReq = new HuaTaiEncryptReq();
-        encryptReq.setInsuredCode(properties.getInsuredCode());
+        encryptReq.setInsuredCode(insuredCode);
         encryptReq.setSourceCode(properties.getSourceCode());
         encryptReq.setBusiContent(busiContent);
         encryptReq.setAccessToken(accessToken);
@@ -149,9 +149,9 @@ public class HuaTaiRequestApiComponents {
      * @return 响应内容
      */
     private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S request(Q request, Class<S> tClass, boolean verify,
-                                                                                  String domain, String urlInterface) {
+                                                                                  String domain, String insuredCode) {
         String url = domain;
-        S response = post(request, url, tClass);
+        S response = post(request, url, tClass, insuredCode);
         if (verify) {
             validationResults(response);
         }
@@ -164,8 +164,8 @@ public class HuaTaiRequestApiComponents {
      *            常规
      */
     private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S routineRequest(Q request, Class<S> tClass, boolean verify,
-                                                                                         String urlInterface) {
-        return request(request, tClass, verify, properties.getBaseUrl(), urlInterface);
+                                                                                         String insuredCode) {
+        return request(request, tClass, verify, properties.getBaseUrl(), insuredCode);
     }
 
     /**
@@ -173,8 +173,8 @@ public class HuaTaiRequestApiComponents {
      * @param <S> Response 响应体
      *            影像
      */
-    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> void imageRequest(Q request, Class<S> tClass, boolean verify) {
-        request(request, tClass, verify, properties.getBaseUrl(), "");
+    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> void imageRequest(Q request, Class<S> tClass, boolean verify, String insuredCode) {
+        request(request, tClass, verify, properties.getBaseUrl(), insuredCode);
     }
 
     /**
@@ -182,8 +182,8 @@ public class HuaTaiRequestApiComponents {
      * @param <S> Response 响应体
      *            短信
      */
-    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S smsRequest(Q request, Class<S> tClass, boolean verify) {
-        return request(request, tClass, verify, properties.getBaseUrl(), "");
+    private <Q extends HuaTaiBaseRequest, S extends HuaTaiBaseResponse> S smsRequest(Q request, Class<S> tClass, boolean verify, String insuredCode) {
+        return request(request, tClass, verify, properties.getBaseUrl(), insuredCode);
     }
 
 
@@ -191,56 +191,57 @@ public class HuaTaiRequestApiComponents {
      * 车型查询 传入必要车辆信息，返回车型列表给用户选择
      */
     public List<HuaTaiModelsQueryResponse.CarModelDto> modelQuery(HuaTaiModelsQueryRequest request,
-                                                                  Class<HuaTaiModelsQueryResponse> tClass) {
-        return routineRequest(request, tClass, true, "").getCarModel();
+                                                                  Class<HuaTaiModelsQueryResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode).getCarModel();
     }
 
-    public HuaTaiActualValueResponse actualValue(HuaTaiActualValueRequest request, Class<HuaTaiActualValueResponse> tClass) {
-        return routineRequest(request, tClass, true, "");
+    public HuaTaiActualValueResponse actualValue(HuaTaiActualValueRequest request, Class<HuaTaiActualValueResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
     /**
      * 报价 传入必要投保方案信息，返回投保单保费及车船税
      */
-    public HuaTaiQuotedPriceResponse quotedPrice(HuaTaiQuotedPriceRequest request, Class<HuaTaiQuotedPriceResponse> tClass) {
-        return routineRequest(request, tClass, false, "");
+    public HuaTaiQuotedPriceResponse quotedPrice(HuaTaiQuotedPriceRequest request, Class<HuaTaiQuotedPriceResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, false, insuredCode);
     }
 
     /**
      * 提交核保 传入投保单必要信息，对投保单进行审核
      */
-    public HuaTaiSubmitResponse submit(HuaTaiSubmitRequest request, Class<HuaTaiSubmitResponse> tClass) {
-        return routineRequest(request, tClass, false, "");
+    public HuaTaiSubmitResponse submit(HuaTaiSubmitRequest request, Class<HuaTaiSubmitResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, false, insuredCode);
     }
 
     /**
      * 上传影像 传入订单信息，查询是否生成保单成功
      */
-    public HuaTaiUploadImageResponse uploadImage(HuaTaiUploadImageRequest request, Class<HuaTaiUploadImageResponse> tClass) {
-        return routineRequest(request, tClass, true, "");
+    public HuaTaiUploadImageResponse uploadImage(HuaTaiUploadImageRequest request, Class<HuaTaiUploadImageResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
     /**
      * 缴费查询
      */
-    public HuaTaiOrderStatusResponse orderStatus(HuaTaiOrderStatusRequest request, Class<HuaTaiOrderStatusResponse> tClass) {
-        return routineRequest(request, tClass, true, "");
+    public HuaTaiOrderStatusResponse orderStatus(HuaTaiOrderStatusRequest request, Class<HuaTaiOrderStatusResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
 
     /**
      * 获取缴费链接
      */
-    public HuaTaiPaymentUrlResponse getPaymentUrl(HuaTaiPaymentUrlRequest request, Class<HuaTaiPaymentUrlResponse> tClass) {
-        return routineRequest(request, tClass, true, "");
+    public HuaTaiPaymentUrlResponse getPaymentUrl(HuaTaiPaymentUrlRequest request, Class<HuaTaiPaymentUrlResponse> tClass, String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
     /**
      * 核保状态查询 传入单号查询该单核保状态
      */
     public HuaTaiSubmitStatusQueryResponse submitStatus(HuaTaiSubmitStatusQueryRequest request,
-                                                        Class<HuaTaiSubmitStatusQueryResponse> tClass) {
-        return routineRequest(request, tClass, true, HuaTaiTransCode.SUBMIT);
+                                                        Class<HuaTaiSubmitStatusQueryResponse> tClass,
+                                                        String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
 
@@ -248,8 +249,9 @@ public class HuaTaiRequestApiComponents {
      * 电子保单下载 传入单号相关信息下载电子保单
      */
     public HuaTaiInsurancePolicyPrintResponse insurancePolicyPrint(HuaTaiInsurancePolicyPrintRequest request,
-                                                                   Class<HuaTaiInsurancePolicyPrintResponse> tClass) {
-        return routineRequest(request, tClass, true, "");
+                                                                   Class<HuaTaiInsurancePolicyPrintResponse> tClass,
+                                                                   String insuredCode) {
+        return routineRequest(request, tClass, true, insuredCode);
     }
 
 

src/main/java/com/ydtech/modules/order/entity/config/HuaTaiConfigureParameters.java

@@ -11,6 +11,11 @@ import lombok.Data;
 @Data
 public class HuaTaiConfigureParameters implements ConfigureParameters {
 
+
+    /**
+     * 合作方代码，由华泰分配
+     */
+    private String insuredCode;
     /**
      * 出单机构
      */

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

@@ -104,7 +104,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         huaTaiModelsQueryRequest.setLoginCom(huaTaiConfigureParameters.getComCode());
         huaTaiModelsQueryRequest.setAgentCode(huaTaiConfigureParameters.getAgentCode());
         List<HuaTaiModelsQueryResponse.CarModelDto> carModelDtos = huaTaiRequestApiComponents.modelQuery(huaTaiModelsQueryRequest,
-                HuaTaiModelsQueryResponse.class);
+                HuaTaiModelsQueryResponse.class , huaTaiConfigureParameters.getInsuredCode());
 
         List<HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto> fullCarDataDtos = new ArrayList<>();
         for (HuaTaiModelsQueryResponse.CarModelDto carModelDto : carModelDtos) {
@@ -122,7 +122,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 HuaTaiActualValueRequest huaTaiActualValueRequest = new HuaTaiActualValueRequest(carInfo, fullCarDataDto, startDate,
                         huaTaiConfigureParameters.getComCode());
                 huaTaiActualValueRequest.setHead(baseRequestHead);
-                actualValueResponse = huaTaiRequestApiComponents.actualValue(huaTaiActualValueRequest, HuaTaiActualValueResponse.class);
+                actualValueResponse = huaTaiRequestApiComponents.actualValue(huaTaiActualValueRequest, HuaTaiActualValueResponse.class, huaTaiConfigureParameters.getInsuredCode());
             }
         }
 
@@ -133,7 +133,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
         // 3.1 处理报价请求
         List<String> warnMessageList = new ArrayList<>();
-        HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest, warnMessageList);
+        HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest, warnMessageList, huaTaiConfigureParameters.getInsuredCode());
 
         if (!"0".equals(quotedPriceResponse.getHead().getReturnCode())) {
             throw new SystemException(quotedPriceResponse.getHead().getReturnMessage());
@@ -322,7 +322,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         HuaTaiUploadImageRequest request = new HuaTaiUploadImageRequest(insAreaCompany, huaTaiConfigureParameters);
         request.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         //调用华泰影像接口获取上传链接地址
-        HuaTaiUploadImageResponse response = huaTaiRequestApiComponents.uploadImage(request, HuaTaiUploadImageResponse.class);
+        HuaTaiUploadImageResponse response = huaTaiRequestApiComponents.uploadImage(request, HuaTaiUploadImageResponse.class, huaTaiConfigureParameters.getInsuredCode());
 
         //爬虫方式进行图片上传
         huiTaiUploadImageComponents.uploadImage(companyId, response.getUrl(), insUploadImagesDtoList);
@@ -351,7 +351,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         HuaTaiOrderStatusRequest orderStatusRequest = new HuaTaiOrderStatusRequest(insAreaCompany, huaTaiConfigureParameters);
         orderStatusRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiOrderStatusResponse orderStatusResponse = huaTaiRequestApiComponents.orderStatus(orderStatusRequest,
-                HuaTaiOrderStatusResponse.class);
+                HuaTaiOrderStatusResponse.class, huaTaiConfigureParameters.getInsuredCode());
 
         boolean jqExistFlag = false;
         boolean syExistFlag = false;
@@ -398,7 +398,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         HuaTaiPaymentUrlRequest huaTaiPaymentUrlRequest = new HuaTaiPaymentUrlRequest(insAreaCompany, huaTaiConfigureParameters);
         huaTaiPaymentUrlRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiPaymentUrlResponse paymentUrlResponse = huaTaiRequestApiComponents.getPaymentUrl(huaTaiPaymentUrlRequest,
-                HuaTaiPaymentUrlResponse.class);
+                HuaTaiPaymentUrlResponse.class, huaTaiConfigureParameters.getInsuredCode());
         if (StringUtils.isNotEmpty(paymentUrlResponse.getPayUrl())) {
             payUrl = paymentUrlResponse.getPayUrl();
         }
@@ -433,7 +433,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         }
         request.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiInsurancePolicyPrintResponse response = huaTaiRequestApiComponents.insurancePolicyPrint(request,
-                HuaTaiInsurancePolicyPrintResponse.class);
+                HuaTaiInsurancePolicyPrintResponse.class, huaTaiConfigureParameters.getInsuredCode());
         CrawlerPolicyPrintVo crawlerPolicyPrintVo = new CrawlerPolicyPrintVo();
         if ("0".equals(response.getHead().getReturnCode())) {
             List<HuaTaiInsurancePolicyPrintResponse.ElecDownLoadResultDto> urlList = response.getElecDownLoadResultList();
@@ -477,7 +477,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                                                        List<InsHuataiContributingVo> engageList) {
         HuaTaiSubmitRequest submitRequest = new HuaTaiSubmitRequest(yaQuoteInfoVo, insAreaCompany, huaTaiConfigureParameters, engageList);
         submitRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
-        return huaTaiRequestApiComponents.submit(submitRequest, HuaTaiSubmitResponse.class);
+        return huaTaiRequestApiComponents.submit(submitRequest, HuaTaiSubmitResponse.class, huaTaiConfigureParameters.getInsuredCode());
     }
 
     private QuoteRespVo getQuoteRespVo(HuaTaiQuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo,
@@ -720,7 +720,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 huaTaiConfigureParameters, operateType);
         huaTaiSubmitStatusQueryRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse =
-                huaTaiRequestApiComponents.submitStatus(huaTaiSubmitStatusQueryRequest, HuaTaiSubmitStatusQueryResponse.class);
+                huaTaiRequestApiComponents.submitStatus(huaTaiSubmitStatusQueryRequest, HuaTaiSubmitStatusQueryResponse.class, huaTaiConfigureParameters.getInsuredCode());
         return submitStatusQueryResponse;
     }
 }

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

@@ -327,7 +327,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         quoteRespVo.setJqAdjustRate(other.getJqDiscount());
         quoteRespVo.setSyAdjustRate(other.getSyDiscount());
         quoteRespVo.setOrderno(orderNo); //订单号
-        quoteRespVo.setPredictInfo(other.getPredictInfo().stream().map(QuoteRespVo.PreUnderwritingInfoDTO::new).collect(Collectors.toList()));
+//        quoteRespVo.setPredictInfo(other.getPredictInfo().stream().map(QuoteRespVo.PreUnderwritingInfoDTO::new).collect(Collectors.toList()));
         // 起保日期和终保日期
         quoteRespVo.setStartDateJq(response.getJqStartDate());
         quoteRespVo.setEndDateJq(response.getJqEndDate());

src/main/java/com/ydtech/modules/xxl/service/impl/HuaTaiQueryStatusService.java

@@ -50,7 +50,7 @@ public class HuaTaiQueryStatusService implements BaseQueryStatusService {
         huaTaiSubmitStatusQueryRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse =
                 huaTaiRequestApiComponents.submitStatus(huaTaiSubmitStatusQueryRequest,
-                        HuaTaiSubmitStatusQueryResponse.class);
+                        HuaTaiSubmitStatusQueryResponse.class, huaTaiConfigureParameters.getInsuredCode());
         return submitStatusQueryResponse;
     }
 

src/main/resources/application-pre.yml

@@ -235,7 +235,6 @@ agreement:
 # 华泰
 huatai:
   api:
-    insuredCode: HTf02fb8988203427491
     sourceCode: '016'
     baseUrl: https://gears.pc.ehuatai.com:9003/interFaces/common/AutoInsuranceQuotation.do
     selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYUuKVmeF5N66v6MQmOR8pt4o33yrio/ZrDf2ehk/kHJ2BYdI+xE9dLrZW5dm0y8yPpIHN39JaLuYOlWz5DVsWJTSPj9eaq0hOiY9BGAHJ3yMHdX3wygpcD11BVc5v4wbX/kyAhmatK69sb4zzAtEve1NS/YwZVuGch0CrkGw3YQIDAQAB

src/main/resources/application-prod.yml

@@ -234,7 +234,6 @@ agreement:
 # 华泰
 huatai:
   api:
-    insuredCode: HTf02fb8988203427491
     sourceCode: '016'
     baseUrl: https://gears.pc.ehuatai.com:9003/interFaces/common/AutoInsuranceQuotation.do
     selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYUuKVmeF5N66v6MQmOR8pt4o33yrio/ZrDf2ehk/kHJ2BYdI+xE9dLrZW5dm0y8yPpIHN39JaLuYOlWz5DVsWJTSPj9eaq0hOiY9BGAHJ3yMHdX3wygpcD11BVc5v4wbX/kyAhmatK69sb4zzAtEve1NS/YwZVuGch0CrkGw3YQIDAQAB

src/main/resources/application-test.yml

@@ -319,7 +319,6 @@ knife4j:
 # 华泰 测试配置
 huatai:
   api:
-    insuredCode: HT27f3c417f1e241ca01
     sourceCode: '016'
     baseUrl: https://gears.pc.ehuatai.com:9040/interFaces/common/AutoInsuranceQuotation.do
     selfPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBOtXf1T/no13LOuy5ti+/d+SADHns8hAv3+LjhDFsQRbHk3tHhnUNX7I8b25576AVmgraefS7jnpyB299f58PK8WkWZN+UB6pcyEpktrtqOnKcaQSTbkQzaseCW4sCRdoea0alzSXUuXC2FN0pHAE3JkT07e5doX3IHas2GJAkwIDAQAB