新增加远程接口

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

@@ -30,6 +30,7 @@ import org.dromara.server.domain.bo.OrderAirportBo;
 import org.dromara.server.domain.bo.OrderAirportRefundBo;
 import org.dromara.server.domain.vo.OrderAirportRefundVo;
 import org.dromara.server.domain.vo.OrderAirportVo;
+import org.dromara.server.dubbo.RemoteOrderServiceImpl;
 import org.dromara.server.service.IOrderAirportRefundService;
 import org.dromara.server.service.IOrderAirportService;
 import org.springframework.validation.annotation.Validated;
@@ -267,4 +268,19 @@ public class AirportController extends BaseController {
         return R.ok(orderAirportRefundService.queryPageList(bo, pageQuery));
     }
 
+    /**
+     * 手动刷新订单状态
+     *
+     * @return 是否成功
+     */
+    @PostMapping("/local/refresh")
+    public R<Boolean> refresh() throws InterruptedException {
+        List<OrderAirportVo> orderList = orderAirportService.queryList(new OrderAirportBo().setPersonCode(getUserId()));
+        List<String> orderStatusList = RemoteOrderServiceImpl.AIRPORT_ORDER_STATUS_LIST;
+        List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderAirportVo::getOrderNo).collect(Collectors.toList());
+        orderAirportRefundService.updateOrderInfo(orderNoList);
+        Thread.sleep(3000);
+        return R.ok(true);
+    }
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java

@@ -4,6 +4,7 @@ package org.dromara.server.controller.hotel;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.ys.common.PageInfo;
@@ -12,11 +13,13 @@ import org.dromara.common.ys.service.IHotelService;
 import org.dromara.server.base.BaseController;
 import org.dromara.server.domain.bo.OrderHotelBo;
 import org.dromara.server.domain.vo.OrderHotelVo;
+import org.dromara.server.dubbo.RemoteOrderServiceImpl;
 import org.dromara.server.service.IOrderHotelService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -111,6 +114,21 @@ public class HotelController extends BaseController {
         return R.ok(hotelService.orderList(getUserId(), model));
     }
 
+    /**
+     * 手动刷新订单状态
+     *
+     * @return 是否成功
+     */
+    @PostMapping("/local/refresh")
+    public R<Boolean> refresh() throws InterruptedException {
+        List<OrderHotelVo> orderList = orderHotelService.queryList(new OrderHotelBo().setPersonCode(getUserId()));
+        List<String> orderStatusList = RemoteOrderServiceImpl.HOTEL_ORDER_STATUS_LIST;
+        List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderHotelVo::getOrderNo).collect(Collectors.toList());
+        orderHotelService.updateOrderInfo(orderNoList);
+        Thread.sleep(3000);
+        return R.ok(true);
+    }
+
     /**
      * 订单列表
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java

@@ -4,6 +4,7 @@ package org.dromara.server.controller.vehicle;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.ys.common.PageInfo;
@@ -16,10 +17,12 @@ import org.dromara.common.ys.service.IVehiclesService;
 import org.dromara.server.base.BaseController;
 import org.dromara.server.domain.bo.OrderVehiclesBo;
 import org.dromara.server.domain.vo.OrderVehiclesVo;
+import org.dromara.server.dubbo.RemoteOrderServiceImpl;
 import org.dromara.server.service.IOrderVehiclesService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用车相关
@@ -144,4 +147,19 @@ public class VehiclesController extends BaseController {
         return R.ok(orderVehiclesService.queryPageList(bo, pageQuery));
     }
 
+    /**
+     * 手动刷新订单状态
+     *
+     * @return 是否成功
+     */
+    @PostMapping("/local/refresh")
+    public R<Boolean> refresh() throws InterruptedException {
+        List<OrderVehiclesVo> orderList = orderVehiclesService.queryList(new OrderVehiclesBo().setPersonCode(getUserId()));
+        List<String> orderStatusList = RemoteOrderServiceImpl.VEHICLES_ORDER_STATUS_LIST;
+        List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderVehiclesVo::getOrderNo).collect(Collectors.toList());
+        orderVehiclesService.updateOrderInfo(orderNoList);
+        Thread.sleep(3000);
+        return R.ok(true);
+    }
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderAirportBo.java

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -18,6 +19,7 @@ import org.dromara.server.domain.OrderAirport;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @AutoMapper(target = OrderAirport.class, reverseConvertGenerate = false)
 public class OrderAirportBo extends BaseEntity {
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderAirportRefundBo.java

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -20,6 +21,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @AutoMapper(target = OrderAirportRefund.class, reverseConvertGenerate = false)
 public class OrderAirportRefundBo extends BaseEntity {
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderHotelBo.java

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -20,6 +21,7 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @AutoMapper(target = OrderHotel.class, reverseConvertGenerate = false)
 public class OrderHotelBo extends BaseEntity {
 

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

@@ -36,7 +36,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     /**
      * 不需要更新的订单状态
      */
-    private static final List<String> AIRPORT_ORDER_STATUS_LIST = Arrays.asList(OrderStatus.OUT_TICKET.getCode(), OrderStatus.CANCEL.getCode(), OrderStatus.REFUSE_AUDIT.getCode());
+    public static final List<String> AIRPORT_ORDER_STATUS_LIST = Arrays.asList(OrderStatus.OUT_TICKET.getCode(), OrderStatus.CANCEL.getCode(), OrderStatus.REFUSE_AUDIT.getCode());
 
     /**
      * 跟新机场订单信息
@@ -89,7 +89,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     /**
      * 不需要更新的用车订单状态
      */
-    private static final List<String> VEHICLES_ORDER_STATUS_LIST = Arrays.asList(
+    public static final List<String> VEHICLES_ORDER_STATUS_LIST = Arrays.asList(
         org.dromara.common.ys.constant.vehicles.OrderStatus.SERVICE_END.getCode(),
         org.dromara.common.ys.constant.vehicles.OrderStatus.DRIVER_CANCEL.getCode(),
         org.dromara.common.ys.constant.vehicles.OrderStatus.PASSENGER_CANCEL.getCode(),
@@ -107,7 +107,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     /**
      * 不需要更新的酒店订单状态
      */
-    private static final List<String> HOTEL_ORDER_STATUS_LIST = Arrays.asList(
+    public static final List<String> HOTEL_ORDER_STATUS_LIST = Arrays.asList(
         org.dromara.common.ys.constant.hotel.OrderStatus.CANCELED.getCode(),
         org.dromara.common.ys.constant.hotel.OrderStatus.ALL_REFUND.getCode()
     );