From a8698fbd1a6a8cf75b7cbb9872ae6f025d47c1a4 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 6 Dec 2021 11:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BC=9A=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=9A=E5=8A=A1=E8=87=B3=E7=BB=9F=E8=AE=A1=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/mapper/MemberMapper.java | 7 ------- .../lili/modules/member/service/MemberService.java | 7 ------- .../member/serviceimpl/MemberServiceImpl.java | 7 ------- .../statistics/mapper/MemberStatisticsMapper.java | 10 ++++++++++ .../statistics/service/MemberStatisticsService.java | 10 ++++++++++ .../serviceimpl/MemberStatisticsServiceImpl.java | 12 +++++++++++- .../serviceimpl/PlatformViewServiceImpl.java | 12 ++++++------ 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java index 4e214753..4455e63e 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java @@ -28,13 +28,6 @@ public interface MemberMapper extends BaseMapper { @Select("select m.mobile from li_member m") List getAllMemberMobile(); - /** - * 获取会员分布列表 - * @return 会员分布列表 - */ - @Select("select client_enum,count(0) as num from li_member group by client_enum") - List distribution(); - @Select("select * from li_member ${ew.customSqlSegment}") IPage pageByMemberVO(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index f3f0d44a..d2b991e6 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -197,13 +197,6 @@ public interface MemberService extends IService { */ Boolean updateMemberStatus(List memberIds, Boolean status); - /** - * 查看会员数据分布 - * - * @return 会员数据分布 - */ - List distribution(); - /** * 根据条件查询会员总数 * diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 3150b7db..81f04a13 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -423,13 +423,6 @@ public class MemberServiceImpl extends ServiceImpl impleme return this.update(updateWrapper); } - - @Override - public List distribution() { - List memberDistributionVOS = this.baseMapper.distribution(); - return memberDistributionVOS; - } - /** * 根据手机号获取会员 * diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java index 37b0d782..4e9f0206 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsMapper.java @@ -1,5 +1,6 @@ package cn.lili.modules.statistics.mapper; +import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * 会员统计数据处理层 * @@ -24,4 +27,11 @@ public interface MemberStatisticsMapper extends BaseMapper @Select("SELECT COUNT(0) FROM li_member ${ew.customSqlSegment}") Integer customSqlQuery(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 获取会员分布列表 + * @return 会员分布列表 + */ + @Select("select client_enum,count(0) as num from li_member group by client_enum") + List distribution(); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java index 0f96bb73..8dd9a447 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsService.java @@ -1,5 +1,6 @@ package cn.lili.modules.statistics.service; +import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import com.baomidou.mybatisplus.extension.service.IService; @@ -61,4 +62,13 @@ public interface MemberStatisticsService extends IService * @return */ List statistics(StatisticsQueryParam statisticsQueryParam); + + + /** + * 查看会员数据分布 + * + * @return 会员数据分布 + */ + List distribution(); + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java index c96c0965..716828c2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsServiceImpl.java @@ -1,10 +1,11 @@ package cn.lili.modules.statistics.serviceimpl; import cn.hutool.core.date.DateUtil; -import cn.lili.modules.statistics.mapper.MemberStatisticsMapper; +import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.statistics.entity.dos.MemberStatisticsData; import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; +import cn.lili.modules.statistics.mapper.MemberStatisticsMapper; import cn.lili.modules.statistics.service.MemberStatisticsService; import cn.lili.modules.statistics.util.StatisticsDateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -85,4 +86,13 @@ public class MemberStatisticsServiceImpl extends ServiceImpl distribution() { + List memberDistributionVOS = this.baseMapper.distribution(); + return memberDistributionVOS; + } + } diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java index 69a53aad..d0db1cb9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java @@ -2,20 +2,20 @@ package cn.lili.modules.statistics.serviceimpl; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; +import cn.lili.common.properties.StatisticsProperties; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.CurrencyUtil; -import cn.lili.common.properties.StatisticsProperties; -import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.vo.MemberDistributionVO; -import cn.lili.modules.member.service.MemberService; -import cn.lili.modules.statistics.mapper.PlatformViewMapper; import cn.lili.modules.statistics.entity.dos.PlatformViewData; import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam; import cn.lili.modules.statistics.entity.enums.SearchTypeEnum; import cn.lili.modules.statistics.entity.vo.OnlineMemberVO; import cn.lili.modules.statistics.entity.vo.PlatformViewVO; +import cn.lili.modules.statistics.mapper.PlatformViewMapper; +import cn.lili.modules.statistics.service.MemberStatisticsService; import cn.lili.modules.statistics.service.PlatformViewService; import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.statistics.util.StatisticsSuffix; @@ -53,7 +53,7 @@ public class PlatformViewServiceImpl extends ServiceImpl) cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix()); } - List memberDistributionVOS = memberService.distribution(); + List memberDistributionVOS = memberStatisticsService.distribution(); //统计总数 int count = 0;