From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 df55dd7..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,10 +37,10 @@
/**
* 收银未结清订单列表
* @param page
- * @param userId
+ * @param pageMerMemberNoClearOrder
* @return
*/
- List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
+ 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
@@ -374,6 +374,24 @@
*/
MgtPlTotalActivityTotalVo getPlTotalActivityTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ /**
+ * @description 活动获客人数
+ * @author jqs
+ * @date 2023/8/26 16:07
+ * @param mgtBasePlatformDto
+ * @return MgtPlTotalActivityTotalVo
+ */
+ MgtPlTotalActivityTotalVo getPlTotalActivityMemberTotal(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 活动获客人数
+ * @author jqs
+ * @date 2023/8/26 16:07
+ * @param mgtBaseShopDto
+ * @return getTotalActivityMemberTotal
+ */
+ MgtTotalActivityTotalVo getTotalActivityMemberTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
/**
* @description listTotalActivityTotalGoodsType
@@ -419,7 +437,7 @@
* @author jqs34
* @date 2023/6/19 22:48
*/
- List<MgtMapBigTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description listTotalActivityTotal
@@ -622,6 +640,9 @@
*/
List<MgtMapIntTotalVo> getStaffActivityGetMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ List<MgtMapIntTotalVo> getMgtActivityGetMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
/**
* @description 员工端获取活动获客人数
* @author jqs
@@ -631,15 +652,20 @@
*/
List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+ List<MgtMapIntTotalVo> getMgtActivityMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ List<MgtMapIntTotalVo> getActivityMemberTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
+
/**
* @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);
/**
@@ -676,4 +702,14 @@
* @return AgencyTotalVo
*/
AgencyTotalVo getAgencyTotalVo(@Param("shopIdList")List<Long> shopIdList);
+
+
+ /**
+ * @description 商户端会员订单统计
+ * @author jqs
+ * @date 2023/8/29 17:39
+ * @param merBaseDto
+ * @return MerMemberSimpleTotalVo
+ */
+ MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(@Param("param") MerBaseDto merBaseDto);
}
--
Gitblit v1.7.1