From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
index 1c5d9a9..6d9e27f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
@@ -50,7 +50,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception;
@@ -103,7 +103,7 @@
* @param orderId
* @return
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
@@ -173,7 +173,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
@@ -182,7 +182,7 @@
* @param uid
* @return
*/
- List<Map<String, Object>> queryMyTravelRecord(@Param("uid") Integer uid);
+ List<Map<String, Object>> queryMyTravelRecord(Integer language, @Param("uid") Integer uid);
@@ -197,7 +197,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryInvoiceOrder(Integer type, Date startTime, Date endTime, Double startMoney,
+ List<Map<String, Object>> queryInvoiceOrder(Integer language, Integer type, Date startTime, Date endTime, Double startMoney,
Double endMoney, Integer uid) throws Exception;
@@ -220,7 +220,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryRedEnvelope(Integer uid) throws Exception;
+ List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception;
--
Gitblit v1.7.1