Browse Source

解决紫金保险公司不能报价,不能核保的问题

jiakai 4 tháng trước cách đây
mục cha
commit
2f1fbcda61

+ 3 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/build/ZiJinAPIQuoteResultsVoBuild.java

@@ -30,9 +30,11 @@ public final class ZiJinAPIQuoteResultsVoBuild {
         throw new IllegalStateException("Utility class");
         throw new IllegalStateException("Utility class");
     }
     }
 
 
-    public static QuoteResultsVo buildQuoteResultsVo(String orderNo, QuoteVo quoteVo, CalculatePremiumResponse calculatePremiumResponse) {
+    public static QuoteResultsVo buildQuoteResultsVo(String orderNo, QuoteVo quoteVo, CalculatePremiumResponse calculatePremiumResponse, String companyOrderNo) {
         QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
         QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
         quoteResultsVo.setOrdersNo(orderNo);
         quoteResultsVo.setOrdersNo(orderNo);
+        // 赋值从保险公司获取的订单号
+        quoteResultsVo.setCompanyOrderNo(companyOrderNo);
 
 
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         quoteResultsVo.setQuoteStatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
         quoteResultsVo.setQuoteStatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());

+ 2 - 2
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/entity/request/SubmitVerifyRequest.java

@@ -28,7 +28,7 @@ public class SubmitVerifyRequest implements Serializable {
     @JsonProperty("engageList")
     @JsonProperty("engageList")
     private List<EngageListDTO> engageList;
     private List<EngageListDTO> engageList;
 
 
-    @JsonProperty("underWritingRequestVehicleDTO")
+    @JsonProperty("underWritingRequestVehicleDto")
     private UnderWritingRequestVehicleDTO underWritingRequestVehicleDto;
     private UnderWritingRequestVehicleDTO underWritingRequestVehicleDto;
 
 
     @JsonProperty("orderId")
     @JsonProperty("orderId")
@@ -45,7 +45,7 @@ public class SubmitVerifyRequest implements Serializable {
                 .map(EngageListDTO::new)
                 .map(EngageListDTO::new)
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
         String code;
         String code;
-        if (ziJinApiOrder.getProductsCode().equals(ProductsType.PT_034002.getCode())) {
+        if (ProductsType.PT_034002.getCode().equals(ziJinApiOrder.getProductsCode())) {
             code = CarCheckReasonEnum.CCR_3.getCode();
             code = CarCheckReasonEnum.CCR_3.getCode();
         } else {
         } else {
             code = CarCheckReasonEnum.CCR_2.getCode();
             code = CarCheckReasonEnum.CCR_2.getCode();

+ 2 - 2
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

@@ -79,7 +79,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
         CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest(quoteVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), parameters, modelQueryResponse);
         CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest(quoteVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), parameters, modelQueryResponse);
         CalculatePremiumResponse calculatePremiumResponse = ziJinApiRequestComponent.calculatePremium(calculatePremiumRequest, httpHeaders,modelQueryRequest,queryActualValueRequest,REPEAT_NUMBER,RETRY_NUMBER);
         CalculatePremiumResponse calculatePremiumResponse = ziJinApiRequestComponent.calculatePremium(calculatePremiumRequest, httpHeaders,modelQueryRequest,queryActualValueRequest,REPEAT_NUMBER,RETRY_NUMBER);
         ziJinOrderService.saveOrderInfo(quoteVo, modelQueryResponse);
         ziJinOrderService.saveOrderInfo(quoteVo, modelQueryResponse);
-        return ZiJinAPIQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, calculatePremiumResponse);
+        return ZiJinAPIQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, calculatePremiumResponse, modelQueryResponse.getOrderNo());
     }
     }
 
 
     @Override
     @Override
@@ -106,7 +106,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
 
 
             String multiply = insOrdersCosts.getSumPremium().toPlainString();
             String multiply = insOrdersCosts.getSumPremium().toPlainString();
-            NewPayRequest newPayRequest = new NewPayRequest(multiply, orderBase.getOrdersNo(), parameters);
+            NewPayRequest newPayRequest = new NewPayRequest(multiply, ziJinApiOrder.getOrderNo(), parameters);
             NewPayRequestResponse newPayRequestResponse = ziJinApiRequestComponent.newPay(newPayRequest, httpHeaders);
             NewPayRequestResponse newPayRequestResponse = ziJinApiRequestComponent.newPay(newPayRequest, httpHeaders);
             underwritingResultsVo.setPaymentLink(newPayRequestResponse.getTwoDimentionImageUrl());
             underwritingResultsVo.setPaymentLink(newPayRequestResponse.getTwoDimentionImageUrl());
         } catch (SystemException systemException) {
         } catch (SystemException systemException) {

+ 1 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinOrderServiceImpl.java

@@ -21,7 +21,7 @@ public class ZiJinOrderServiceImpl implements ZiJinOrderService {
         ziJinApiOrder.setId(quoteVo.getOrder().getOrdersNo());
         ziJinApiOrder.setId(quoteVo.getOrder().getOrdersNo());
         ziJinApiOrder.setOrderNo(modelQueryResponse.getOrderNo());
         ziJinApiOrder.setOrderNo(modelQueryResponse.getOrderNo());
         ziJinApiOrder.setOrderId(modelQueryResponse.getOrderId());
         ziJinApiOrder.setOrderId(modelQueryResponse.getOrderId());
-        ziJinApiOrder.setProductsCode(quoteVo.getProductId());
+        ziJinApiOrder.setProductsCode(quoteVo.getOrder().getProductId());
         ziJinApiOrder.setInsuredIdentify(quoteVo
         ziJinApiOrder.setInsuredIdentify(quoteVo
                 .getInsuredPersonInfo()
                 .getInsuredPersonInfo()
                 .getIdentifyNumber());
                 .getIdentifyNumber());