From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberMapper.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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..56b649e 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
@@ -11,7 +11,7 @@
 import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
 import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
 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;
@@ -160,7 +160,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getTotalMemberTotalNurse(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapIntTotalVo> getTotalMemberTotalNurse(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
@@ -170,7 +170,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getTotalMemberTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapIntTotalVo> getTotalMemberTotalGoodsType(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
     * @description getTotalMemberTotalActiveness
@@ -190,7 +190,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getTotalMemberRankPay(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapIntTotalVo> getTotalMemberRankPay(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
 
     /**
@@ -200,7 +200,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getTotalMemberRankCustomerSource(@Param("param") MgtBaseShopDto mgtBaseShopDto);
+    List<MgtMapIntTotalVo> getTotalMemberRankCustomerSource(@Param("param") MgtBaseShopDto mgtBaseShopDto);
 
     /**
      * @description
@@ -237,7 +237,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getPlTotalMemberTotalNurse(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> getPlTotalMemberTotalNurse(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  会员人数统计
@@ -246,7 +246,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getPlTotalMemberTotalGoodsType(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> getPlTotalMemberTotalGoodsType(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description getTotalMemberTotalActiveness
@@ -266,7 +266,7 @@
      * @param
      * @return  MgtTotalMemberTotalVo
      */
-    List<MgtMapTotalVo> getPlTotalMemberRankPay(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
+    List<MgtMapIntTotalVo> getPlTotalMemberRankPay(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);
 
     /**
      * @description  会员人数统计
@@ -275,16 +275,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

--
Gitblit v1.7.1