From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index 3bf8798..361a82a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -20,7 +20,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception;
@@ -32,7 +32,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception;
@@ -43,7 +43,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+ Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception;
@@ -63,7 +63,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
@@ -86,7 +86,7 @@
* @return
* @throws Exception
*/
- ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception;
+ ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception;
/**
@@ -124,4 +124,21 @@
List<OrderPrivateCar> taskMidAxbUnBindSend();
List<OrderPrivateCar> getSmsOrderList();
+
+
+
+ /**
+ * 支付完成后的订单处理
+ * @param id 订单=id
+ * @param order_id 工行支付单号
+ * @throws Exception
+ */
+ void payOrderPrivateCarCallback(Integer id, String order_id, Integer language) throws Exception;
+
+ /**
+ * 处理乘客修改终点
+ * @param orderId
+ * @param status
+ */
+ void updateEndAddress(Integer orderId, Integer status);
}
--
Gitblit v1.7.1