From 0045a8fdf5525a385c233c3b82e42f6120021cac Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 06 五月 2024 17:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 488e3a9..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;
@@ -61,7 +61,7 @@
* @return
* @throws Exception
*/
- ResultUtil payCrossCityOrder(Integer payType, Integer orderId, Integer couponId, Integer type)throws Exception;
+ ResultUtil payCrossCityOrder(Integer payType, Integer orderId, Integer couponId, Integer type, Integer language)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;
@@ -123,7 +123,7 @@
* @return
* @throws Exception
*/
- ResultUtil cancleOrderCrossCity(Integer id, Integer payType, Integer cancleId, Integer type) throws Exception;
+ ResultUtil cancleOrderCrossCity(Integer id, Integer payType, Integer cancleId, Integer type, Integer language) 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