代码优化

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/constant/train/OrderStatus.java

+package org.dromara.common.ys.constant.train;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum OrderStatus {
+
+    //00,等待订座;10,已订座;19,已调度;11,出票中;13,取消中;21,已出票;30,客户消;31,系统消;40,已完成;41,反冲待完成;50,已申请;51,抢票中;52,抢票取消;
+    WAIT_ORDER("00", "等待订座"),
+    ORDERED("10", "已订座"),
+    DISPATCHED("19", "已调度"),
+    TICKETING("11", "出票中"),
+    CANCEL("13", "取消中"),
+    OUT_TICKET("21", "已出票"),
+    CANCEL_ORDER("30", "客户消"),
+    CANCEL_SYSTEM("31", "系统消"),
+    FINISHED("40", "已完成"),
+    REVERSE_FINISHED("41", "反冲待完成"),
+    APPLY("50", "已申请"),
+    GRAB_TICKET("51", "抢票中"),
+    CANCEL_GRAB("52", "抢票取消");
+
+    private final String code;
+    private final String desc;
+}

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/constant/train/PurchaseStatus.java

+package org.dromara.common.ys.constant.train;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author wenhe
+ */
+@Getter
+@AllArgsConstructor
+public enum PurchaseStatus {
+
+    // 平台状态:00,等待订座;10,已订座;11,出票中;12,出票失败;13,取消中;14,取消失败;20,已出票;30,已取消;31,拒单;32,过期取消; ,
+    WAIT_ORDER("00", "等待订座"),
+    ORDERED("10", "已订座"),
+    OUT_TICKET("11", "出票中"),
+    OUT_FAIL("12", "出票失败"),
+    CANCELING("13", "取消中"),
+    CANCEL_FAIL("14", "取消失败"),
+    OUT_SUCCESS("20", "已出票"),
+    CANCEL_SUCCESS("30", "已取消");
+
+    private final String code;
+    private final String desc;
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteOrderServiceImpl.java

@@ -34,7 +34,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     /**
      * 不需要更新的订单状态
      */
-    private final List<String> orderStatusList = Arrays.asList(OrderStatus.OUT_TICKET.getCode(), OrderStatus.CANCEL.getCode(), OrderStatus.REFUSE_AUDIT.getCode());
+    private static final List<String> AIRPORT_ORDER_STATUS_LIST = Arrays.asList(OrderStatus.OUT_TICKET.getCode(), OrderStatus.CANCEL.getCode(), OrderStatus.REFUSE_AUDIT.getCode());
 
     /**
      * 跟新机场订单信息
@@ -43,10 +43,20 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     public void updateAirportOrder() {
         List<OrderAirportVo> orderList = orderAirportService.queryList(new OrderAirportBo());
         orderAirportService.updateOrderInfo(
-            orderList.stream().filter(item -> !orderStatusList.contains(item.getOrderStatus())).map(OrderAirportVo::getOrderNo).collect(Collectors.toList())
+            orderList.stream().filter(item -> !AIRPORT_ORDER_STATUS_LIST.contains(item.getOrderStatus())).map(OrderAirportVo::getOrderNo).collect(Collectors.toList())
         );
     }
 
+
+    /**
+     * 不需要更新的火车订单状态
+     */
+    private static final List<String> TRAIN_ORDER_STATUS_LIST = Arrays.asList(
+        org.dromara.common.ys.constant.train.OrderStatus.CANCEL_ORDER.getCode(),
+        org.dromara.common.ys.constant.train.OrderStatus.CANCEL_SYSTEM.getCode(),
+        org.dromara.common.ys.constant.train.OrderStatus.FINISHED.getCode(),
+        org.dromara.common.ys.constant.train.OrderStatus.CANCEL_GRAB.getCode());
+
     /**
      * 跟新火车订单信息
      */
@@ -54,7 +64,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     public void updateTrainOrder() {
         List<OrderTrainVo> orderList = orderTrainService.queryList(new OrderTrainBo());
         orderTrainService.updateOrderInfo(
-            orderList.stream().map(OrderTrainVo::getOrderNo).collect(Collectors.toList())
+            orderList.stream().filter(item -> !TRAIN_ORDER_STATUS_LIST.contains(item.getOrderStatus())).map(OrderTrainVo::getOrderNo).collect(Collectors.toList())
         );
     }
 }