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/smallLogistics/dao/OrderLogisticsMapper.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 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 8cef2bb..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); @@ -58,4 +58,19 @@ @Param("endMoney") Double endMoney, @Param("uid") Integer uid, @Param("orderType") Integer orderType); + + /** + * 获取订单详情 + * @param orderId + * @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