Parcourir la source

渤海财险代码修改

wks il y a 2 ans
Parent
commit
e04571b219

+ 1 - 2
src/main/java/com/ydtech/config/properties/BohaiApiConfigurationProperties.java

@@ -25,7 +25,6 @@ public class BohaiApiConfigurationProperties {
     // 合作方代码,由渤海分配
     private String insurerCode;
 
-    // 配置code
-    private String sysSourceCode;
+
 
 }

+ 2 - 4
src/main/java/com/ydtech/modules/order/components/FileComponents.java

@@ -4,9 +4,8 @@ import com.ydtech.utils.baidu.FileUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -29,5 +28,4 @@ public class FileComponents {
         return FileUtil.netUrlToFile(url, dir, fileName, uploadFilePath, apiUrl + showFileUrl);
     }
 
-
 }

+ 25 - 25
src/main/java/com/ydtech/modules/order/components/bohai/BoHaiRequestApiComponent.java

@@ -47,13 +47,13 @@ public class BoHaiRequestApiComponent {
      * @param <S>    Response 响应体
      * @return <S>
      */
-    private <Q extends BoHaiBaseRequest, S extends BoHaiBaseResponse> S post(Q q, String url, Class<S> tClass) throws Exception {
+    private <Q extends BoHaiBaseRequest, S extends BoHaiBaseResponse> S post(Q q, String url, Class<S> tClass, String sysSourceCode) throws Exception {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 
         String busReqString = JSON.toJSONString(q, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty);
         InsuranceLog.infoLog(InsuranceEnum.BPIC.getPinyin(), "\n\t---------> URl: {} \n---------> 请求参数:{}", url, busReqString);
-        BoHaiEncrypted boHaiEncrypted = new BoHaiEncrypted(busReqString, properties);
+        BoHaiEncrypted boHaiEncrypted = new BoHaiEncrypted(busReqString, properties, sysSourceCode);
         String json = JSON.toJSONString(boHaiEncrypted, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty);
         // 获取请求头signature 和加密后的内容
         Map<String, String> stringStringMap = SignatureUtils.encryptAndSign(properties.getSelfPrivateKey(),
@@ -83,8 +83,8 @@ public class BoHaiRequestApiComponent {
      * @param request 生成订单号请求实体
      * @return 返回订单号响应
      */
-    public GenerateOrderNoResponse generateOrderNo(GenerateOrderNoRequest request) throws Exception {
-        return post(request, properties.getUrl(), GenerateOrderNoResponse.class);
+    public GenerateOrderNoResponse generateOrderNo(GenerateOrderNoRequest request, String sysSourceCode) throws Exception {
+        return post(request, properties.getUrl(), GenerateOrderNoResponse.class,  sysSourceCode);
     }
 
     /**
@@ -93,8 +93,8 @@ public class BoHaiRequestApiComponent {
      * @param request 车辆查询请求实体
      * @return 响应
      */
-    public VehicleTypeQueryResponse vehicleTypeQuery(VehicleTypeQueryRequest request) throws Exception {
-        return post(request, properties.getUrl(), VehicleTypeQueryResponse.class);
+    public VehicleTypeQueryResponse vehicleTypeQuery(VehicleTypeQueryRequest request, String sysSourceCode) throws Exception {
+        return post(request, properties.getUrl(), VehicleTypeQueryResponse.class,  sysSourceCode);
     }
 
     /**
@@ -103,10 +103,10 @@ public class BoHaiRequestApiComponent {
      * @param request 车辆确认 请求实体
      * @return 响应
      */
-    public VehicleConfirmationResponse vehicleConfirmation(VehicleConfirmationReqeust request) throws Exception {
-        VehicleConfirmationResponse response = post(request, properties.getUrl(), VehicleConfirmationResponse.class);
+    public VehicleConfirmationResponse vehicleConfirmation(VehicleConfirmationReqeust request, String sysSourceCode) throws Exception {
+        VehicleConfirmationResponse response = post(request, properties.getUrl(), VehicleConfirmationResponse.class, sysSourceCode);
         if (ResponseCode.R_Z00002.getCode().equals(response.getResponseCode())) {
-            response = post(request, properties.getUrl(), VehicleConfirmationResponse.class);
+            response = post(request, properties.getUrl(), VehicleConfirmationResponse.class, sysSourceCode);
         }
         if (ResponseCode.R_Z00001.getCode().equals(response.getResponseCode())) {
             return response;
@@ -120,8 +120,8 @@ public class BoHaiRequestApiComponent {
      * @param imageUploadRequest 影像请求
      * @return 响应
      */
-    public ImageUploadResponse imageUpload(ImageUploadRequest imageUploadRequest) throws Exception {
-        return post(imageUploadRequest, properties.getUrl(), ImageUploadResponse.class);
+    public ImageUploadResponse imageUpload(ImageUploadRequest imageUploadRequest, String sysSourceCode) throws Exception {
+        return post(imageUploadRequest, properties.getUrl(), ImageUploadResponse.class, sysSourceCode);
     }
 
 
@@ -131,8 +131,8 @@ public class BoHaiRequestApiComponent {
      * @param request 车辆确认 请求实体
      * @return 响应
      */
-    public NonAutomotiveProductsResponse products(NonAutomotiveProductsRequest request) throws Exception {
-        return post(request, properties.getUrl(), NonAutomotiveProductsResponse.class);
+    public NonAutomotiveProductsResponse products(NonAutomotiveProductsRequest request, String sysSourceCode) throws Exception {
+        return post(request, properties.getUrl(), NonAutomotiveProductsResponse.class, sysSourceCode);
     }
 
     /**
@@ -141,8 +141,8 @@ public class BoHaiRequestApiComponent {
      * @param request 车辆确认 请求实体
      * @return 响应
      */
-    public NonAutomotiveProductsDetailsResponse productsDetails(NonAutomotiveProductsDetailsRequest request) throws Exception {
-        return post(request, properties.getUrl(), NonAutomotiveProductsDetailsResponse.class);
+    public NonAutomotiveProductsDetailsResponse productsDetails(NonAutomotiveProductsDetailsRequest request, String sysSourceCode) throws Exception {
+        return post(request, properties.getUrl(), NonAutomotiveProductsDetailsResponse.class, sysSourceCode);
     }
 
 
@@ -152,8 +152,8 @@ public class BoHaiRequestApiComponent {
      * @param request 车辆确认 请求实体
      * @return 响应
      */
-    public QuotationResponse quotation(QuotationRequest request) throws Exception {
-        return post(request, properties.getUrl(), QuotationResponse.class);
+    public QuotationResponse quotation(QuotationRequest request, String sysSourceCode) throws Exception {
+        return post(request, properties.getUrl(), QuotationResponse.class, sysSourceCode);
     }
 
     /**
@@ -162,8 +162,8 @@ public class BoHaiRequestApiComponent {
      * @param underwritingRequest 核保 请求实体
      * @return 响应
      */
-    public UnderwritingResponse underwriting(UnderwritingRequest underwritingRequest) throws Exception {
-        return post(underwritingRequest, properties.getUrl(), UnderwritingResponse.class);
+    public UnderwritingResponse underwriting(UnderwritingRequest underwritingRequest, String sysSourceCode) throws Exception {
+        return post(underwritingRequest, properties.getUrl(), UnderwritingResponse.class, sysSourceCode);
     }
 
     /**
@@ -172,8 +172,8 @@ public class BoHaiRequestApiComponent {
      * @param paymentRequest 车辆确认 请求实体
      * @return 响应
      */
-    public PaymentResponse payment(PaymentRequest paymentRequest) throws Exception {
-        return post(paymentRequest, properties.getUrl(), PaymentResponse.class);
+    public PaymentResponse payment(PaymentRequest paymentRequest, String sysSourceCode) throws Exception {
+        return post(paymentRequest, properties.getUrl(), PaymentResponse.class, sysSourceCode);
     }
 
     /**
@@ -182,8 +182,8 @@ public class BoHaiRequestApiComponent {
      * @param electronicPolicyRequest 保单请求
      * @return 响应
      */
-    public ElectronicPolicyResponse electronicPolicy(ElectronicPolicyRequest electronicPolicyRequest) throws Exception {
-        return post(electronicPolicyRequest, properties.getUrl(), ElectronicPolicyResponse.class);
+    public ElectronicPolicyResponse electronicPolicy(ElectronicPolicyRequest electronicPolicyRequest, String sysSourceCode) throws Exception {
+        return post(electronicPolicyRequest, properties.getUrl(), ElectronicPolicyResponse.class, sysSourceCode);
     }
 
     /**
@@ -192,8 +192,8 @@ public class BoHaiRequestApiComponent {
      * @param statusDocumentsRequest 单证查询
      * @return 响应
      */
-    public StatusDocumentsResponse statusDocuments(StatusDocumentsRequest statusDocumentsRequest) throws Exception {
-        StatusDocumentsResponse response = post(statusDocumentsRequest, properties.getUrl(), StatusDocumentsResponse.class);
+    public StatusDocumentsResponse statusDocuments(StatusDocumentsRequest statusDocumentsRequest, String sysSourceCode) throws Exception {
+        StatusDocumentsResponse response = post(statusDocumentsRequest, properties.getUrl(), StatusDocumentsResponse.class, sysSourceCode);
         verificationResponseCode(response.getResponseCode(), response.getResponseMsg());
         return response;
     }

+ 0 - 2
src/main/java/com/ydtech/modules/order/controller/BoHaiOrderApiController.java

@@ -112,7 +112,6 @@ public class BoHaiOrderApiController {
         return this.boHaiOrderApiService.auditCallback(approvedRequest);
     }
 
-
     @PostMapping("/policyResultCallback")
     @ApiOperation(value = "保单回调")
     public String policyResultCallback(@RequestBody BoHaiEncrypted s) throws Exception {
@@ -121,5 +120,4 @@ public class BoHaiOrderApiController {
         return this.boHaiOrderApiService.policyResultCallback(policyResultCallbackRequest);
     }
 
-
 }

+ 2 - 2
src/main/java/com/ydtech/modules/order/entity/api/bohai/BoHaiEncrypted.java

@@ -38,10 +38,10 @@ public class BoHaiEncrypted implements Serializable {
     private String sysSourceCode;
 
 
-    public BoHaiEncrypted(String bizContent, BohaiApiConfigurationProperties properties) {
+    public BoHaiEncrypted(String bizContent, BohaiApiConfigurationProperties properties, String sysSourceCode) {
         this.bizContent = bizContent;
         this.insurerCode = properties.getInsurerCode();
-        this.sysSourceCode = properties.getSysSourceCode();
+        this.sysSourceCode = sysSourceCode;
     }
 
 

+ 12 - 12
src/main/java/com/ydtech/modules/order/service/impl/BoHaiOrderApiServiceImpl.java

@@ -71,7 +71,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         BoHaiConfigureParameters parameters = configureParametersComponents.toEntity(BoHaiConfigureParameters.class,
                 ptlAgreementAttribution);
         NonAutomotiveProductsRequest nonAutomotiveProductsRequest = new NonAutomotiveProductsRequest(parameters, productQueryVo);
-        NonAutomotiveProductsResponse response = boHaiRequestApiComponent.products(nonAutomotiveProductsRequest);
+        NonAutomotiveProductsResponse response = boHaiRequestApiComponent.products(nonAutomotiveProductsRequest, parameters.getSysSourceCode());
         List<NonAutomotiveProductsResponse.DataDTO.ProductsDTO> products = response.getData().getProducts();
         return HttpResult.ok(products);
     }
@@ -85,7 +85,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                 ptlAgreementAttribution);
         NonAutomotiveProductsDetailsRequest nonAutomotiveProductsDetailsRequest = new NonAutomotiveProductsDetailsRequest(parameters,
                 productDetailsQueryVo);
-        NonAutomotiveProductsDetailsResponse response = boHaiRequestApiComponent.productsDetails(nonAutomotiveProductsDetailsRequest);
+        NonAutomotiveProductsDetailsResponse response = boHaiRequestApiComponent.productsDetails(nonAutomotiveProductsDetailsRequest, parameters.getSysSourceCode());
         List<NonAutomotiveProductsDetailsResponse.DataDTO.CoveragesDTO> coverages = response.getData().getCoverages();
         return HttpResult.ok(coverages);
     }
@@ -102,13 +102,13 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         GenerateOrderNoRequest generateOrderNoRequest = new GenerateOrderNoRequest(parameters);
 
         // 1 生成生成订单
-        GenerateOrderNoResponse generateOrderNoResponse = boHaiRequestApiComponent.generateOrderNo(generateOrderNoRequest);
+        GenerateOrderNoResponse generateOrderNoResponse = boHaiRequestApiComponent.generateOrderNo(generateOrderNoRequest, parameters.getSysSourceCode());
         String orderNo = generateOrderNoResponse.getData().getOrderNo();
 
         // 2 车型查询接口
         CarInfoVo carInfo = quoteInfoVo.getCarInfo();
         VehicleTypeQueryRequest vehicleTypeQueryRequest = new VehicleTypeQueryRequest(parameters, carInfo.getModelcname(), orderNo);
-        VehicleTypeQueryResponse vehicleTypeQueryResponse = boHaiRequestApiComponent.vehicleTypeQuery(vehicleTypeQueryRequest);
+        VehicleTypeQueryResponse vehicleTypeQueryResponse = boHaiRequestApiComponent.vehicleTypeQuery(vehicleTypeQueryRequest, parameters.getSysSourceCode());
         List<VehicleTypeQueryResponse.DataDTO.VehicleModelsDTO> vehicleModels = vehicleTypeQueryResponse.getData().getVehicleModels();
         VehicleTypeQueryResponse.DataDTO.VehicleModelsDTO vehicleModelsDTO =
                 new CarModelsFilterUtils<VehicleTypeQueryResponse.DataDTO.VehicleModelsDTO>().to(vehicleModels, quoteInfoVo.getCarInfo());
@@ -126,14 +126,14 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                 policyHolderInfo.getIdentifyNumber());
         VehicleConfirmationReqeust vehicleConfirmationReqeust = new VehicleConfirmationReqeust(parameters, quoteInfoVo, vehicleModelsDTO,
                 orderNo, ownerInfoArea, insuredPersonArea, policyHolderArea);
-        VehicleConfirmationResponse vehicleConfirmationResponse = boHaiRequestApiComponent.vehicleConfirmation(vehicleConfirmationReqeust);
+        VehicleConfirmationResponse vehicleConfirmationResponse = boHaiRequestApiComponent.vehicleConfirmation(vehicleConfirmationReqeust, parameters.getSysSourceCode());
         // 车辆实际价值
         String currentValue = vehicleConfirmationResponse.getData().getVehicleModels().get(0).getCurrentValue();
 
         // 4. 报价接口
         QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKindList(),
                 currentValue, orderNo, carInfo, quoteVo.getAccidentalDrivingVo());
-        QuotationResponse response = boHaiRequestApiComponent.quotation(quotationRequest);
+        QuotationResponse response = boHaiRequestApiComponent.quotation(quotationRequest, parameters.getSysSourceCode());
         return getQuoteRespVo(response, quoteInfoVo, vehicleModelsDTO, ptlAgreementAttribution, orderNo);
     }
 
@@ -154,7 +154,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
 
         ImageUploadRequest imageUploadRequest = new ImageUploadRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo()
                 , insTaskImagesBase64s);
-        ImageUploadResponse response = boHaiRequestApiComponent.imageUpload(imageUploadRequest);
+        ImageUploadResponse response = boHaiRequestApiComponent.imageUpload(imageUploadRequest, parameters.getSysSourceCode());
         if (ResponseCode.R_Z00001.getCode().equals(response.getResponseCode())) {
             return HttpResult.ok("上传成功");
         }
@@ -173,7 +173,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
 
         // 核保请求
         UnderwritingRequest underwritingRequest = new UnderwritingRequest(parameters, insAreaCompany.getId());
-        UnderwritingResponse underwritingResponse = boHaiRequestApiComponent.underwriting(underwritingRequest);
+        UnderwritingResponse underwritingResponse = boHaiRequestApiComponent.underwriting(underwritingRequest, parameters.getSysSourceCode());
         int i = underwritingResponse.getData().verificationUnderwriting();
         // 交强
         UnderwritingResponse.DataDTO.TrafficPolicyDTO trafficPolicy = underwritingResponse.getData().getTrafficPolicy();
@@ -190,7 +190,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 支付请求
             PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
-            PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest);
+            PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
             String payUrl = paymentResponse.getData().getQrCodeUrl();
             insAreaCompany.setPaymentLink(payUrl);
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
@@ -221,7 +221,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
 
         ElectronicPolicyRequest electronicPolicyRequest = new ElectronicPolicyRequest(parameters, insAreaCompany.getId(),
                 insAreaCompany.getJqpolicyno(), insAreaCompany.getSypolicyno());
-        ElectronicPolicyResponse response = boHaiRequestApiComponent.electronicPolicy(electronicPolicyRequest);
+        ElectronicPolicyResponse response = boHaiRequestApiComponent.electronicPolicy(electronicPolicyRequest, parameters.getSysSourceCode());
 
         ElectronicPolicyResponse.DataDTO data = response.getData();
         CrawlerPolicyPrintVo crawlerPolicyPrintVo = new CrawlerPolicyPrintVo();
@@ -351,7 +351,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         BoHaiConfigureParameters parameters = configureParametersComponents.toEntity(BoHaiConfigureParameters.class,
                 ptlAgreementAttribution);
         PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
-        PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest);
+        PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
         return paymentResponse.getData().getQrCodeUrl();
     }
 
@@ -366,7 +366,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         String applyno = !StringUtils.isEmpty(insAreaCompany.getJqapplyno()) ? insAreaCompany.getJqapplyno() :
                 insAreaCompany.getSyapplyno();
         StatusDocumentsRequest statusDocumentsRequest = new StatusDocumentsRequest(parameters, insAreaCompany.getId(), applyno);
-        StatusDocumentsResponse response = boHaiRequestApiComponent.statusDocuments(statusDocumentsRequest);
+        StatusDocumentsResponse response = boHaiRequestApiComponent.statusDocuments(statusDocumentsRequest, parameters.getSysSourceCode());
         return response.getData().getDocumentList();
     }