From 21573e8e02dc47202ca3e1f7d4705795a09c1b60 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
index 181ff9b..803d21c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java
@@ -75,7 +75,8 @@
* @param merMemberPageDto
* @return
*/
- List<MgtMemberPageVo> pageMgtMember(Page page, @Param("param") MgtMemberPageDto merMemberPageDto);
+ List<MgtMemberPageVo> pageMgtMember(Page page, @Param("param") MgtMemberPageDto merMemberPageDto,
+ @Param("list")List<Long> list);
/**
* @description 删除标签
@@ -95,6 +96,14 @@
*/
List<Long> listIdBySendType(@Param("sendType")Integer sendType,@Param("shopId")Long shopId);
+
+ /**
+ * 获取商户发送全部用的数据
+ * @param shopId
+ * @return
+ */
+ List<Long> listIdBySendType2(@Param("shopId")Long shopId);
+
/**
* @description 通过ids获取用户简易返回
* @author jqs
@@ -111,7 +120,7 @@
* @param mgtUserIdByKeywordDto
* @return MgtUserIdByKeywordVo
*/
- List<Long> getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
+ List<Long> getUserIdByKeyword(@Param("param")MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
/**
* @description 总用户数
@@ -120,7 +129,7 @@
* @author jqs34
* @date 2023/6/18 16:46
*/
- Integer memberTotal();
+ Integer memberTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description 今日新增用户数
@@ -129,7 +138,7 @@
* @author jqs34
* @date 2023/6/18 16:47
*/
- Integer memberToday();
+ Integer memberToday(@Param("shopIds") List<Long> shopIds);
/**
@@ -158,6 +167,15 @@
* @return MgtTotalMemberTotalVo
*/
List<MgtMapIntTotalVo> getTotalMemberTotalNurse(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getTotalMemberTotalLevel(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
@@ -244,6 +262,15 @@
* @param
* @return MgtTotalMemberTotalVo
*/
+ List<MgtMapIntTotalVo> getPlTotalMemberTotalLevel(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
List<MgtMapIntTotalVo> getPlTotalMemberTotalGoodsType(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
@@ -322,6 +349,15 @@
List<MgtMapIntTotalVo> getMerMemberTotalNurse(@Param("param") MerTotalDto merTotalDto);
/**
+ * @description 会员调理问题人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getMerMemberTotalLevel(@Param("param") MerTotalDto merTotalDto);
+
+ /**
* @description 会员商品类型人数统计
* @author jqs
* @date 2023/6/19 15:26
@@ -370,10 +406,28 @@
* @description 获取各年龄层用户
* @author jqs
* @date 2023/7/4 9:55
- * @param ageType
+ * @param merTotalDto
* @return List<Long>
*/
List<Long> listOrderAgeUser(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 统计商户今日新增会员
+ * @author jqs
+ * @date 2023/7/14 19:54
+ * @param shopIdList
+ * @return Integer
+ */
+ Integer getAreaNewMember(@Param("shopIdList")List<Long> shopIdList);
+
+ /**
+ * @description 获取今日生日用户电话
+ * @author jqs
+ * @date 2023/8/7 16:13
+ * @param
+ * @return List<String>
+ */
+ List<Member> listTodayBirthday();
}
--
Gitblit v1.7.1