From 026d15ddf508317942482da480cb79c0ee9f68fd Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 13 九月 2023 13:19:16 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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..2d2bddd 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);
@@ -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
@@ -630,6 +651,12 @@
* @return List<MgtMapIntTotalVo>
*/
List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);
+
+
+ List<MgtMapIntTotalVo> getMgtActivityMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+
+ List<MgtMapIntTotalVo> getActivityMemberTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);
/**
* @description 获取用户商品购买数量
@@ -676,4 +703,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