From 9af8c942ba5083b6953e7c51f20a1b820a71746f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 21:12:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 488e3a9..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;
/**
@@ -258,4 +273,19 @@
List<OrderCrossCity> queryListOrder(Integer driverId, Integer lineShiftId, List<Integer> state, String day) throws Exception;
+
+ /**
+ * 自动取消订单
+ */
+ void autoCancelOrder();
+
+
+// /**
+// * 继续推送操作
+// * @param id
+// * @throws Exception
+// */
+// ResultUtil pushOrderCrossCity(Integer id) throws Exception;
+
+
}
--
Gitblit v1.7.1