From 8da101629c47cec91d68f785b0f5e829d4a9bab1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 24 一月 2024 15:18:46 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 1f325ff..e48e4e1 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 删除标签
@@ -111,7 +112,7 @@
* @param mgtUserIdByKeywordDto
* @return MgtUserIdByKeywordVo
*/
- List<Long> getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
+ List<Long> getUserIdByKeyword(@Param("param")MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
/**
* @description 总用户数
@@ -120,7 +121,7 @@
* @author jqs34
* @date 2023/6/18 16:46
*/
- Integer memberTotal();
+ Integer memberTotal(@Param("userIds") List<Long> userIds);
/**
* @description 今日新增用户数
@@ -129,7 +130,7 @@
* @author jqs34
* @date 2023/6/18 16:47
*/
- Integer memberToday();
+ Integer memberToday(@Param("userIds") List<Long> userIds);
/**
@@ -410,6 +411,15 @@
* @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