From cd16d710415a86e2012bdac8badafeda0bec0b61 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 五月 2024 16:57:09 +0800
Subject: [PATCH] 合并代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
index f56425b..48ee7ff 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java
@@ -31,7 +31,7 @@
* @return
*/
List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum,
- @Param("size") Integer size);
+ @Param("size") Integer size, @Param("language") Integer language);
@@ -65,5 +65,12 @@
* @return
*/
Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);
-
+
+
+ /**
+ * 获取红包使用记录
+ * @param uid
+ * @return
+ */
+ List<Map<String, Object>> queryRedEnvelope(@Param("uid") Integer uid);
}
--
Gitblit v1.7.1