云上订单功能实现

ruoyi-api/ruoyi-api-server/src/main/java/org/dromara/server/api/RemoteYsOrderService.java

@@ -15,6 +15,11 @@ public interface RemoteYsOrderService {
      */
     void updateAirportRefundOrder();
 
+    /**
+     * 更新机票改签订单
+     */
+    void updateAirportChangeOrder();
+
     /**
      * 跟新火车票订单
      */
@@ -25,6 +30,11 @@ public interface RemoteYsOrderService {
      */
     void updateTrainRefundOrder();
 
+    /**
+     * 跟新火车票改签订单
+     */
+    void updateTrainChangeOrder();
+
     /**
      * 更新用车订单
      */

ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderAirportChangeJobExecutor.java

+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.server.api.RemoteYsOrderService;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hzh
+ * @date 2024-11-18
+ */
+@AllArgsConstructor
+@Component
+@JobExecutor(name = "orderAirportChangeJobExecutor")
+public class OrderAirportChangeJobExecutor {
+
+    @DubboReference
+    private RemoteYsOrderService remoteYsOrderService;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        remoteYsOrderService.updateAirportChangeOrder();
+        return ExecuteResult.success("更新成功");
+    }
+}

ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderTrainChangeJobExecutor.java

+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.server.api.RemoteYsOrderService;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hzh
+ * @date 2024-11-18
+ */
+@AllArgsConstructor
+@Component
+@JobExecutor(name = "orderTrainChangeJobExecutor")
+public class OrderTrainChangeJobExecutor {
+
+    @DubboReference
+    private RemoteYsOrderService remoteYsOrderService;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        remoteYsOrderService.updateAirportChangeOrder();
+        return ExecuteResult.success("更新成功");
+    }
+}

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

@@ -55,6 +55,7 @@ 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.RemoteYsOrderServiceImpl;
+import org.dromara.server.service.IOrderAirportChangeService;
 import org.dromara.server.service.IOrderAirportRefundService;
 import org.dromara.server.service.IOrderAirportService;
 import org.springframework.validation.annotation.Validated;
@@ -83,6 +84,7 @@ public class AirportController extends BaseController {
     private final IInsuranceService insuranceService;
     private final IOrderAirportService orderAirportService;
     private final IOrderAirportRefundService orderAirportRefundService;
+    private final IOrderAirportChangeService orderAirportChangeService;
 
     /**
      * 查询航班信息
@@ -453,7 +455,10 @@ public class AirportController extends BaseController {
     @PostMapping("/addChangeOrderModel")
     public R<AddChangeOrderModel> addChangeOrderModel(@RequestBody org.dromara.common.ys.model.req.airport.AddChangeOrderModel model) {
         String userId = getUserId();
-        return R.ok(airportService.addChangeOrderModel(userId, model));
+        AddChangeOrderModel acom = airportService.addChangeOrderModel(userId, model);
+        //添加订单
+        orderAirportRefundService.batchSaveOrder(userId,model.getOrderNo(),acom.getChangeNoList());
+        return R.ok(acom);
     }
 
     /**
@@ -472,6 +477,8 @@ public class AirportController extends BaseController {
     public R<Boolean> cancelChangeOrder(@RequestBody CancelChangeOrderModel model) {
         String userId = getUserId();
         airportService.cancelChangeOrder(userId, model);
+        //跟新订单
+        orderAirportChangeService.updateOrderInfo(List.of(model.getChangeNo()));
         return R.ok(true);
     }
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -23,6 +23,7 @@ import org.dromara.common.ys.model.res.train.OrderRefundApplyModel;
 import org.dromara.common.ys.model.res.train.OrderRefundDetailModel;
 import org.dromara.common.ys.model.res.train.OrderRefundListModel;
 import org.dromara.common.ys.model.res.train.TrChangeInfoBeanModel;
+import org.dromara.common.ys.model.res.train.TrainChangeApplyApiModel;
 import org.dromara.common.ys.model.res.train.TrainSetRegisterModel;
 import org.dromara.common.ys.model.res.train.TrainStopModel;
 import org.dromara.common.ys.model.res.train.*;
@@ -34,6 +35,7 @@ import org.dromara.server.domain.bo.OrderTrainRefundBo;
 import org.dromara.server.domain.vo.OrderTrainRefundVo;
 import org.dromara.server.domain.vo.OrderTrainVo;
 import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
+import org.dromara.server.service.IOrderTrainChangeService;
 import org.dromara.server.service.IOrderTrainRefundService;
 import org.dromara.server.service.IOrderTrainService;
 import org.springframework.validation.annotation.Validated;
@@ -62,6 +64,7 @@ public class TrainController extends BaseController {
     private final ITrainService trainService;
     private final IOrderTrainService orderTrainService;
     private final IOrderTrainRefundService orderTrainRefundService;
+    private final IOrderTrainChangeService orderTrainChangeService;
     private final ICommonResourceService commonResourceService;
 
     /**
@@ -402,12 +405,28 @@ public class TrainController extends BaseController {
         return R.ok(trainService.register(getQueryUserId(), model));
     }
 
+    /**
+     * 噶签单申请
+     *
+     * @param model
+     * @return
+     */
+    @PostMapping("/changeOrder/apply")
+    public R<TrainChangeApplyApiModel> changeApply(@RequestBody org.dromara.common.ys.model.req.train.TrainChangeApplyApiModel model) {
+        TrainChangeApplyApiModel apply = trainService.apply(getUserId(), model);
+        //新增订单
+        orderTrainChangeService.batchSaveOrder(getUserId(), apply.getChangeNoList());
+        return R.ok(apply);
+    }
+
     /**
      * 取消改签单
      */
     @PostMapping("/changeOrder/cancel")
     public R<Boolean> changeCancel(@RequestBody TrainChangeCancelApiModel model) {
         trainService.changeCancel(getUserId(), model);
+        //跟新改签单
+        orderTrainChangeService.updateOrderInfo(List.of(model.getChangeNo()));
         return R.ok(true);
     }
 
@@ -417,6 +436,8 @@ public class TrainController extends BaseController {
     @PostMapping("/changeOrder/confirm")
     public R<Boolean> changeConfirm(@RequestBody TrainChangeConfirmApiModel model) {
         trainService.changeConfirm(getUserId(), model);
+        //跟新改签单
+        orderTrainChangeService.updateOrderInfo(List.of(model.getChangeNo()));
         return R.ok(true);
     }
 
@@ -426,6 +447,8 @@ public class TrainController extends BaseController {
     @PostMapping("/changeOrder/pay")
     public R<Boolean> changeConfirmPay(@RequestBody org.dromara.common.ys.model.req.hotel.PayOrderModel model) {
         trainService.changeConfirm(getUserId(), model);
+        //跟新改签单
+        orderTrainChangeService.updateOrderInfo(List.of(model.getOrderNo()));
         return R.ok(true);
     }
 

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

@@ -39,11 +39,13 @@ import java.util.stream.Collectors;
 public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
 
     private final IOrderAirportService orderAirportService;
+    private final IOrderAirportRefundService orderAirportRefundService;
+    private final IOrderAirportChangeService orderAirportChangeService;
     private final IOrderTrainService orderTrainService;
     private final IOrderTrainRefundService orderTrainRefundService;
+    private final IOrderTrainChangeService orderTrainChangeService;
     private final IOrderVehiclesService orderVehiclesService;
     private final IOrderHotelService orderHotelService;
-    private final IOrderAirportRefundService orderAirportRefundService;
     private final IAirportService airportService;
     private final ITrainService trainService;
     private final IVehiclesService vehiclesService;
@@ -103,6 +105,14 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
         );
     }
 
+    @Override
+    public void updateTrainChangeOrder() {
+        List<OrderTrainChangeVo> orderList = orderTrainChangeService.queryList(new OrderTrainChangeBo());
+        orderTrainChangeService.updateOrderInfo(
+            orderList.stream().map(OrderTrainChangeVo::getChangeNo).collect(Collectors.toList())
+        );
+    }
+
     /**
      * 不需要更新的用车订单状态
      */
@@ -142,12 +152,28 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
      */
     private static final List<String> AIRPORT_REFUND_ORDER_STATUS_LIST = List.of(org.dromara.common.ys.constant.airport.RefundOrderStatus.REFUNDING.getCode());
 
+    /**
+     * 更新机票退票订单
+     */
     @Override
     public void updateAirportRefundOrder() {
         List<OrderAirportRefundVo> orderList = orderAirportRefundService.queryList(new OrderAirportRefundBo());
         orderAirportRefundService.updateOrderInfo(orderList.stream().filter(item -> !AIRPORT_REFUND_ORDER_STATUS_LIST.contains(item.getRefundOrderStatus())).map(OrderAirportRefundVo::getRefundNo).collect(Collectors.toList()));
     }
 
+
+    /**
+     * 更新机票改签订单
+     */
+    @Override
+    public void updateAirportChangeOrder() {
+        List<OrderAirportChangeVo> orderList = orderAirportChangeService.queryList(new OrderAirportChangeBo());
+        orderAirportRefundService.updateOrderInfo(orderList
+            .stream()
+            .map(OrderAirportChangeVo::getChangeOrderNo)
+            .collect(Collectors.toList()));
+    }
+
     /**
      * 支付成功后确认出票
      *