订单调整

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/OrderDetailResponse.java

@@ -20,6 +20,19 @@ public class OrderDetailResponse extends DfyResponseBase {
     @AllArgsConstructor
     public class Datas {
 
+        // 订单状态
+        private String orderStatus;
+
+        private OrderInfo orderInfo;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class OrderInfo {
+
         // 订单id
         private int orderId;
 
@@ -35,8 +48,6 @@ public class OrderDetailResponse extends DfyResponseBase {
         // 景点名称
         private String scenicName;
 
-        // 订单状态
-        private String orderStatus;
 
         // 下单时间
         private String orderTime;
@@ -68,10 +79,9 @@ public class OrderDetailResponse extends DfyResponseBase {
 
         // 门票配送信息
         private Delivery delivery;
-
-
     }
 
+
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
@@ -187,5 +197,4 @@ public class OrderDetailResponse extends DfyResponseBase {
     }
 
 
-
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/dfy/TicetPayJob.java

@@ -63,7 +63,7 @@ public class TicetPayJob {
                     OrderDetailRequest orderDetailRequest = new OrderDetailRequest();
                     orderDetailRequest.setOrderId(bean.getOrderId());
                     OrderDetailResponse orderDetailResponse = ticketApi.orderDetail(orderDetailRequest);
-                    if (!orderDetailResponse.getData().getCanPay().equals(1)) {
+                    if (!orderDetailResponse.getData().getOrderInfo().getCanPay().equals(1)) {
                         standarPayJob.getResultContent().set(ResultContent.build(ResultState.Fail, "三方渠道订单不可用"));
                         return RepeatStatus.FINISHED;
                     }