From 7a4ca677840905b4d910fc843dccf1d5878d58fc Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 2 Jun 2021 10:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1=E5=BD=93?=
 =?UTF-8?q?=E6=97=A5=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MemberStatisticsDataServiceImpl.java      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
index 78c0b8e1..470a3ac1 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
@@ -4,14 +4,15 @@ import cn.hutool.core.date.DateUtil;
 import cn.lili.modules.statistics.mapper.MemberStatisticsDataMapper;
 import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
 import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
+import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
 import cn.lili.modules.statistics.service.MemberStatisticsDataService;
 import cn.lili.modules.statistics.util.StatisticsDateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -24,31 +25,26 @@ import java.util.List;
 @Service
 public class MemberStatisticsDataServiceImpl extends ServiceImpl<MemberStatisticsDataMapper, MemberStatisticsData> implements MemberStatisticsDataService {
 
-    /**
-     * 会员统计
-     */
-    @Autowired
-    private MemberStatisticsDataMapper memberStatisticsDataMapper;
 
     @Override
     public Integer getMemberCount() {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("disabled", true);
-        return memberStatisticsDataMapper.customSqlQuery(queryWrapper);
+        return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
     public Integer todayMemberNum() {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.gt("create_time", DateUtil.beginOfDay(new Date()));
-        return memberStatisticsDataMapper.customSqlQuery(queryWrapper);
+        return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
     public Integer memberCount(Date endTime) {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.lt("create_time", endTime);
-        return memberStatisticsDataMapper.customSqlQuery(queryWrapper);
+        return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
@@ -56,20 +52,35 @@ public class MemberStatisticsDataServiceImpl extends ServiceImpl<MemberStatistic
 
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.ge("last_login_date", startTime);
-        return memberStatisticsDataMapper.customSqlQuery(queryWrapper);
+        return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
     public Integer newlyAdded(Date startTime, Date endTime) {
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.between("create_time", startTime, endTime);
-        return memberStatisticsDataMapper.customSqlQuery(queryWrapper);
+        return this.baseMapper.customSqlQuery(queryWrapper);
     }
 
     @Override
     public List<MemberStatisticsData> statistics(StatisticsQueryParam statisticsQueryParam) {
+
         Date[] dates = StatisticsDateUtil.getDateArray(statisticsQueryParam);
         Date startTime = dates[0], endTime = dates[1];
+
+        //如果统计今天，则自行构造数据
+        if(statisticsQueryParam.getSearchType().equals(SearchTypeEnum.TODAY.name())){
+            //构建数据，然后返回集合，提供给前端展示
+            MemberStatisticsData memberStatisticsData = new MemberStatisticsData();
+            memberStatisticsData.setMemberCount(this.memberCount(endTime));
+            memberStatisticsData.setCreateDate(startTime);
+            memberStatisticsData.setActiveQuantity(this.activeQuantity(startTime));
+            memberStatisticsData.setNewlyAdded(this.newlyAdded(startTime, endTime));
+            List result = new ArrayList<MemberStatisticsData>();
+            result.add(memberStatisticsData);
+            return result;
+        }
+
         QueryWrapper queryWrapper = Wrappers.query();
         queryWrapper.between("create_date", startTime, endTime);