Merge remote-tracking branch 'origin/test' into test

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

@@ -183,7 +183,9 @@ public class BoHaiRequestApiComponent {
      * @return 响应
      */
     public ElectronicPolicyResponse electronicPolicy(ElectronicPolicyRequest electronicPolicyRequest, String sysSourceCode) throws Exception {
-        return post(electronicPolicyRequest, properties.getUrl(), ElectronicPolicyResponse.class, sysSourceCode);
+        ElectronicPolicyResponse response =  post(electronicPolicyRequest, properties.getUrl(), ElectronicPolicyResponse.class, sysSourceCode);
+        verificationResponseCode(response.getResponseCode(), response.getResponseMsg());
+        return response;
     }
 
     /**

src/main/java/com/ydtech/modules/order/entity/api/bohai/response/PaymentResponse.java

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 /**
  * @description: 支付响应
  * @author: wenks
@@ -26,17 +24,21 @@ public class PaymentResponse extends BoHaiBaseResponse {
 
     @NoArgsConstructor
     @Data
-    public static class DataDTO implements Serializable {
+    public static class DataDTO {
+
+        @JsonProperty("payNo")
+        private String payNo;
 
-        private static final long serialVersionUID = 3700311849033773101L;
+        @JsonProperty("checkCode")
+        private String checkCode;
 
-        @JsonProperty("proposalNo")
-        private String proposalNo;
+        @JsonProperty("amount")
+        private String amount;
 
-        @JsonProperty("qrCodeUrl")
-        private String qrCodeUrl;
+        @JsonProperty("payUrl")
+        private String payUrl;
 
-        @JsonProperty("signQRCodeDateValid")
-        private String signQRCodeDateValid;
+        @JsonProperty("paymentEndDate")
+        private String paymentEndDate;
     }
 }

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

@@ -197,12 +197,11 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             // 支付请求
             PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
             PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
-            String payUrl = paymentResponse.getData().getQrCodeUrl();
+            String payUrl = paymentResponse.getData().getPayUrl();
             insAreaCompany.setPaymentLink(payUrl);
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保通过");
         } else if (i == 2) {
-
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
         } else {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
@@ -358,7 +357,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                 ptlAgreementAttribution);
         PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
         PaymentResponse paymentResponse = boHaiRequestApiComponent.payment(paymentRequest, parameters.getSysSourceCode());
-        return paymentResponse.getData().getQrCodeUrl();
+        return paymentResponse.getData().getPayUrl();
     }