From c2fdeb19b52f58a8ae8f7efdc26f16dff86569ef Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期六, 16 八月 2025 00:59:44 +0800
Subject: [PATCH] 抢单和改派

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
index 991d2ea..542a4d6 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.service.IService;
 import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
 import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
+import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpperPushOrder;
 import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
 import com.stylefeng.guns.modular.system.util.ResultUtil;
 import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
@@ -63,7 +64,14 @@
      */
     ResultUtil payCrossCityOrder(Integer payType, Integer orderId, Integer couponId, Integer type)throws Exception;
 
-
+//    /**
+//     * 订单完成支付订单操作(推单场景)(在controller层同一调用,新增一个支付方法要加一个orderType)
+//     * @param payType
+//     * @param orderId
+//     * @return
+//     * @throws Exception
+//     */
+//    ResultUtil payCrossCityOrder2(Integer payType, Integer orderId, Integer couponId, Integer type)throws Exception;
 
     /**
      * 支付完成后的订单处理
@@ -84,7 +92,14 @@
      */
     ResultUtil<BaseWarpper> orderCrossCity(OrderCrossCityWarpper orderCrossCityWarpper, Integer uid) throws Exception;
 
-
+    /**
+     * 用户跨城下单操作(推单场景)
+     * @param orderCrossCityWarpperPushOrder
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    ResultUtil<BaseWarpper> orderCrossCityPushOrder(OrderCrossCityWarpperPushOrder orderCrossCityWarpperPushOrder, Integer uid) throws Exception;
 
 
     /**
@@ -264,4 +279,13 @@
      */
     void autoCancelOrder();
 
+
+//    /**
+//     * 继续推送操作
+//     * @param id
+//     * @throws Exception
+//     */
+//    ResultUtil pushOrderCrossCity(Integer id) throws Exception;
+
+
 }

--
Gitblit v1.7.1