From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index 18ace06..615446c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -17,7 +17,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+ Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception;
@@ -38,7 +38,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
@@ -79,7 +79,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception;
@@ -90,7 +90,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;
/**
@@ -120,4 +120,13 @@
* @throws Exception
*/
void sendVerificationCode(Integer orderId, Integer language) throws Exception;
+
+
+ /**
+ * 支付完成后的订单处理
+ * @param id 订单=id
+ * @param order_id 工行支付单号
+ * @throws Exception
+ */
+ void payOrderLogisticsCallback(Integer id, String order_id, Integer language) throws Exception;
}
--
Gitblit v1.7.1