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-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 330 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 323 insertions(+), 7 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 eaa6253..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
@@ -5,11 +5,11 @@
import com.ruoyi.member.domain.dto.MerCashMemberPageDto;
import com.ruoyi.member.domain.dto.MerMemberPageDto;
import com.ruoyi.member.domain.dto.MgtMemberPageDto;
-import com.ruoyi.member.domain.vo.MerCashMemberPageVo;
-import com.ruoyi.member.domain.vo.MerMemberPageVo;
-import com.ruoyi.member.domain.vo.MgtMemberPageVo;
-import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
+import com.ruoyi.member.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtPlTotalMemberTotalVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
import org.apache.ibatis.annotations.Param;
@@ -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 删除标签
@@ -93,7 +94,15 @@
* @param sendType
* @return List<Long>
*/
- List<Long> listIdBySendType(@Param("sendType")Integer sendType);
+ List<Long> listIdBySendType(@Param("sendType")Integer sendType,@Param("shopId")Long shopId);
+
+
+ /**
+ * 获取商户发送全部用的数据
+ * @param shopId
+ * @return
+ */
+ List<Long> listIdBySendType2(@Param("shopId")Long shopId);
/**
* @description 通过ids获取用户简易返回
@@ -111,7 +120,314 @@
* @param mgtUserIdByKeywordDto
* @return MgtUserIdByKeywordVo
*/
- List<Long> getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
+ List<Long> getUserIdByKeyword(@Param("param")MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
+
+ /**
+ * @description 总用户数
+ * @param
+ * @return Integer
+ * @author jqs34
+ * @date 2023/6/18 16:46
+ */
+ Integer memberTotal(@Param("shopIds") List<Long> shopIds);
+
+ /**
+ * @description 今日新增用户数
+ * @param
+ * @return Integer
+ * @author jqs34
+ * @date 2023/6/18 16:47
+ */
+ Integer memberToday(@Param("shopIds") List<Long> shopIds);
+
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ MgtTotalMemberTotalVo getTotalMemberTotal(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ MgtAgeTotalVo getTotalMemberTotalAge(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @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);
+
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getTotalMemberTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description getTotalMemberTotalActiveness
+ * @param shopId
+ * @param actStartDate
+ * @param actEndDate
+ * @return Integer
+ * @author jqs34
+ * @date 2023/6/19 21:24
+ */
+ Integer getTotalMemberTotalActiveness(@Param("shopId") Long shopId,@Param("actStartDate") String actStartDate,@Param("actEndDate") String actEndDate);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getTotalMemberRankPay(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getTotalMemberRankCustomerSource(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/20 11:49
+ * @param mgtActivityAgeDto
+ * @return List<Long>
+ */
+ List<Long> listUserIdByAge(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+
+
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/21 10:59
+ * @param mgtBasePlatformDto
+ * @return MgtPlTotalMemberTotalVo
+ */
+ MgtPlTotalMemberTotalVo getPlTotalMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ MgtAgeTotalVo getPlTotalMemberTotalAge(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getPlTotalMemberTotalNurse(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @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);
+
+ /**
+ * @description getTotalMemberTotalActiveness
+ * @param shopIdList
+ * @param actStartDate
+ * @param actEndDate
+ * @return Integer
+ * @author jqs34
+ * @date 2023/6/19 21:24
+ */
+ Integer getPlTotalMemberTotalActiveness(@Param("shopIdList") List<Long> shopIdList,@Param("actStartDate") String actStartDate,@Param("actEndDate") String actEndDate);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getPlTotalMemberRankPay(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 会员人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getPlTotalMemberRankCustomerSource(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/21 14:35
+ * @param mgtBasePlatformDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapIntTotalVo> getPlTotalMemberRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+
+ /**
+ * @description 通过shopId获取userId
+ * @author jqs
+ * @date 2023/6/21 17:11
+ * @param shopIdList
+ * @return List<Long>
+ */
+ List<Long> listUserIdByShopId(@Param("shopIdList")List<Long> shopIdList);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/3 18:29
+ * @param merTotalDto
+ * @return MerMemberTotalVo
+ */
+ MerMemberTotalVo getMerMemberTotal(@Param("param")MerTotalDto merTotalDto);
+
+
+ /**
+ * @description 会员年龄分布统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ MgtAgeTotalVo getMerMemberTotalAge(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 会员调理问题人数统计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ 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
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getMerMemberTotalGoodsType(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 会员活跃度统计
+ * @param merTotalDto
+ * @return Integer
+ * @author jqs34
+ * @date 2023/6/19 21:24
+ */
+ Integer getMerMemberTotalActiveness(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 会员消费次数排名
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getMerMemberPayRank(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 会员来源排名计
+ * @author jqs
+ * @date 2023/6/19 15:26
+ * @param
+ * @return MgtTotalMemberTotalVo
+ */
+ List<MgtMapIntTotalVo> getMerMemberCustomerSourceRank(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 会员推荐排名
+ * @author jqs
+ * @date 2023/7/3 19:16
+ * @param merTotalDto
+ * @return List<MgtMapIntTotalVo>
+ */
+ List<MgtMapIntTotalVo> getMerMemberRecommendRank(@Param("param") MerTotalDto merTotalDto);
+
+ /**
+ * @description 获取各年龄层用户
+ * @author jqs
+ * @date 2023/7/4 9:55
+ * @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