From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
index c1e4e85..74a124c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -37,7 +37,7 @@
/**
* 收银未结清订单列表
* @param page
- * @param userId
+ * @param pageMerMemberNoClearOrder
* @return
*/
List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("param") MerMemberNoClearOrderDto pageMerMemberNoClearOrder);
@@ -141,7 +141,7 @@
* @author jqs34
* @date 2023/6/18 17:20
*/
- MgtBulletinBoardVo boardOrderTotal();
+ MgtBulletinBoardVo boardOrderTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description 活动人数统计
@@ -150,7 +150,7 @@
* @param
* @return Integer
*/
- Integer activityUserTotal();
+ Integer activityUserTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description getTotalOrderTotalOrderFrom
@@ -662,11 +662,10 @@
* @description 获取用户商品购买数量
* @author jqs
* @date 2023/7/23 18:17
- * @param userId
* @param goodsId
* @return Integer
*/
- Integer countUserBuyGoodsNum(@Param("userId")Long userId, @Param("goodsId")String goodsId);
+ Integer countUserBuyGoodsNum(@Param("goodsId")String goodsId);
/**
--
Gitblit v1.7.1