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-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 20 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 f109c1c..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
@@ -6,12 +6,9 @@
import com.ruoyi.member.domain.dto.MerMemberPageDto;
import com.ruoyi.member.domain.dto.MgtMemberPageDto;
import com.ruoyi.member.domain.vo.*;
-import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
-import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
-import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+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;
@@ -78,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 删除标签
@@ -96,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获取用户简易返回
@@ -114,7 +120,7 @@
* @param mgtUserIdByKeywordDto
* @return MgtUserIdByKeywordVo
*/
- List<Long> getUserIdByKeyword(MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
+ List<Long> getUserIdByKeyword(@Param("param")MgtUserIdByKeywordDto mgtUserIdByKeywordDto);
/**
* @description 总用户数
@@ -123,7 +129,7 @@
* @author jqs34
* @date 2023/6/18 16:46
*/
- Integer memberTotal();
+ Integer memberTotal(@Param("shopIds") List<Long> shopIds);
/**
* @description 今日新增用户数
@@ -132,7 +138,7 @@
* @author jqs34
* @date 2023/6/18 16:47
*/
- Integer memberToday();
+ Integer memberToday(@Param("shopIds") List<Long> shopIds);
/**
@@ -160,7 +166,16 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getTotalMemberTotalNurse(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ 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);
/**
@@ -170,7 +185,7 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getTotalMemberTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ List<MgtMapIntTotalVo> getTotalMemberTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
* @description getTotalMemberTotalActiveness
@@ -190,7 +205,7 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getTotalMemberRankPay(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ List<MgtMapIntTotalVo> getTotalMemberRankPay(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
@@ -200,7 +215,7 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getTotalMemberRankCustomerSource(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+ List<MgtMapIntTotalVo> getTotalMemberRankCustomerSource(@Param("param") MgtBaseShopDto mgtBaseShopDto);
/**
* @description
@@ -210,6 +225,7 @@
* @return List<Long>
*/
List<Long> listUserIdByAge(@Param("param")MgtActivityAgeDto mgtActivityAgeDto);
+
/**
@@ -237,7 +253,7 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getPlTotalMemberTotalNurse(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> getPlTotalMemberTotalNurse(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 会员人数统计
@@ -246,7 +262,16 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getPlTotalMemberTotalGoodsType(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ 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
@@ -266,7 +291,7 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getPlTotalMemberRankPay(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> getPlTotalMemberRankPay(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 会员人数统计
@@ -275,16 +300,16 @@
* @param
* @return MgtTotalMemberTotalVo
*/
- List<MgtMapTotalVo> getPlTotalMemberRankCustomerSource(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> getPlTotalMemberRankCustomerSource(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description
* @author jqs
* @date 2023/6/21 14:35
* @param mgtBasePlatformDto
- * @return List<MgtMapTotalVo>
+ * @return List<MgtMapIntTotalVo>
*/
- List<MgtMapTotalVo> getPlTotalMemberRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+ List<MgtMapIntTotalVo> getPlTotalMemberRank(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 通过shopId获取userId
@@ -294,6 +319,115 @@
* @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