1.紫金财险订单状态修改

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

@@ -21,6 +21,9 @@ public class ZjApiConfigurationProperties {
     // 订单详情查询服务
     private String orderUrl;
 
+    // 订单状态查询
+    private String orderDetailUrl;
+
     // 下载保单地址
     private String downLoadDocument;
 

src/main/java/com/ydtech/modules/order/components/ZijinRequestApiComponents.java

@@ -286,6 +286,17 @@ public class ZijinRequestApiComponents {
         return request(zjApiConfigurationProperties.getOrderUrl(), RequestUrl.GET_ORDER_DETAIL.getDesc(), orderNoRequest, QueryOrderDetailResponse.class, httpHeaders);
     }
 
+    /**
+     * 订单详情查询服务
+     *
+     * @param queryOrderDetailRequest 紫金财险 订单状态查询 入参实体
+     * @return 出参实体
+     */
+    public QueryOrderStateResponse queryOrderDetail(QueryOrderDetailRequest queryOrderDetailRequest, HttpHeaders httpHeaders) {
+        return request(zjApiConfigurationProperties.getOrderDetailUrl(), RequestUrl.QUERY_ORDER_DETAIL.getDesc(), queryOrderDetailRequest, QueryOrderStateResponse.class, httpHeaders);
+    }
+
+
     /**
      * 未缴费保单撤单
      *

src/main/java/com/ydtech/modules/order/entity/api/zj/constants/enums/RequestUrl.java

@@ -18,6 +18,7 @@ public enum RequestUrl {
     CALCULATE_PREMIUM("calculatePremium", "保费计算"),
     QUERY_CLAUSE_DATA("queryClauseData", "特约查询"),
     SUBMIT_VERIFY("submitVerify", "提交核保"),
+    QUERY_ORDER_DETAIL("queryOrderDetail", "订单状态查询"),
     UPLOAD_FILE("uploadFile", "文件上传"),
     UPLOAD_IMAGE_INFO_LIST("uploadImageInfoList", "文件信息与订单关联"),
     ZBF_AGGREGATE_PAY("zbfAggregatePay", "聚合支付服务"),

src/main/java/com/ydtech/modules/order/entity/api/zj/request/QueryOrderDetailRequest.java

@@ -0,0 +1,19 @@
+package com.ydtech.modules.order.entity.api.zj.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class QueryOrderDetailRequest implements Serializable {
+
+    private static final long serialVersionUID = 1612352036593179999L;
+
+    @JsonProperty("orderId")
+    private String orderId;
+}

src/main/java/com/ydtech/modules/order/entity/api/zj/response/QueryOrderStateResponse.java

@@ -0,0 +1,77 @@
+package com.ydtech.modules.order.entity.api.zj.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@Data
+public class QueryOrderStateResponse extends BaseResponse implements Serializable {
+
+
+    private static final long serialVersionUID = -8559085906831615330L;
+
+
+    @JsonProperty("orderId")
+    private String orderId;
+
+    @JsonProperty("orderNo")
+    private String orderNo;
+
+    @JsonProperty("orderAmount")
+    private Double orderAmount;
+
+    @JsonProperty("uwFlag")
+    private String uwFlag;
+
+    @JsonProperty("vciProposalNo")
+    private String vciProposalNo;
+
+    @JsonProperty("tciProposalNo")
+    private String tciProposalNo;
+
+    @JsonProperty("vciPolicyNo")
+    private String vciPolicyNo;
+
+    @JsonProperty("tciPolicyNo")
+    private String tciPolicyNo;
+
+    @JsonProperty("vciEffectiveDate")
+    private String vciEffectiveDate;
+
+    @JsonProperty("vciExpiryDate")
+    private String vciExpiryDate;
+
+    @JsonProperty("tciEffectiveDate")
+    private String tciEffectiveDate;
+
+    @JsonProperty("tciExpiryDate")
+    private String tciExpiryDate;
+
+    @JsonProperty("uwMsg")
+    private String uwMsg;
+    @JsonProperty("vciPolicyIssueDate")
+    private String vciPolicyIssueDate;
+
+    @JsonProperty("tciPolicyIssueDate")
+    private String tciPolicyIssueDate;
+
+    @JsonProperty("nonVehicleProposalNo")
+    private String nonVehicleProposalNo;
+
+    @JsonProperty("nonVehiclePolicyNo")
+    private String nonVehiclePolicyNo;
+
+    @JsonProperty("nonVehicleEffectiveDate")
+    private String nonVehicleEffectiveDate;
+
+    @JsonProperty("nonVehicleExpiryDate")
+    private String nonVehicleExpiryDate;
+
+    @JsonProperty("nonVehiclePolicyIssueDate")
+    private String nonVehiclePolicyIssueDate;
+}

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

@@ -242,10 +242,10 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(insAreaCompany.getAgreementId());
 
         // 2 请求查看订单状态
-        OrderNoRequest orderNoRequest = new OrderNoRequest(insAreaCompany.getId());
-        QueryOrderDetailResponse queryOrderDetailResponse = zijinRequestApiComponents.getOrderDetail(orderNoRequest, httpHeaders);
+        QueryOrderDetailRequest queryOrderDetailRequest = new QueryOrderDetailRequest(insAreaCompany.getInsOrderNo());
+        QueryOrderStateResponse queryOrderStateResponse = zijinRequestApiComponents.queryOrderDetail(queryOrderDetailRequest, httpHeaders);
 
-        String orderStatus = queryOrderDetailResponse.getResultObj().getOrderStatus();
+        String orderStatus = queryOrderStateResponse.getUwFlag();
         if (OrderStatusEnum.O_4.getCode().equals(orderStatus)) {
             insAreaCompany.setOrderstatus(InsOrderStatus.S_3.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);

src/main/resources/application-prod.yml

@@ -236,6 +236,8 @@ zj:
     payUrl: http://open.zking.com/api/v1/public/payment/cashier/zbfAggregatePay
     # 订单详情查询服务
     orderUrl: http://open.zking.com/api/v1/insurance/public/getOrderDetail
+    # 订单状态查询
+    orderDetailUrl: http://open.zking.com/api/v1/insurance/autoMobile/geelyCarInsurance/queryOrderDetail
     # 下载保单地址
     downLoadDocument: http://open.zking.com/temp/api/v1/insurance/nonAutoMobile/queryPolicy/downLoadDocument
 

src/main/resources/application-test.yml

@@ -348,6 +348,8 @@ zj:
     payUrl: http://test-open.zking.com/api/v1/public/payment/cashier/zbfAggregatePay
     # 订单详情查询服务
     orderUrl: http://test-open.zking.com/api/v1/insurance/public/getOrderDetail
+    # 订单状态查询
+    orderDetailUrl: http://test-open.zking.com/api/v1/insurance/autoMobile/geelyCarInsurance/queryOrderDetail
     # 下载保单地址
     downLoadDocument: http://test-open.zking.com/temp/api/v1/insurance/nonAutoMobile/queryPolicy/downLoadDocument