From 7a4ca677840905b4d910fc843dccf1d5878d58fc Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 10:37:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=BD=93=E6=97=A5=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=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 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 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(); + result.add(memberStatisticsData); + return result; + } + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.between("create_date", startTime, endTime); From 46d937270d5e9f8ef2cf6cf5468a3fab43b750f6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 14:48:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=9A=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/statistics/model/vo/OnlineMemberVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java index ecad5579..0e2d0b77 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java @@ -17,7 +17,7 @@ import java.util.Date; public class OnlineMemberVO { //在线时间 - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH") + @JsonFormat(timezone = "GMT+8", pattern = "MM-dd HH") private Date date; //在线会员人数 From 393c246018fef9ada8481ab5541e666850f5b7b2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 14:49:48 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=BC=A9=E7=9F=AD?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0vo=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=97=A5=E6=9C=9F=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/statistics/model/vo/OnlineMemberVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java index 0e2d0b77..e0a13915 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java @@ -17,7 +17,7 @@ import java.util.Date; public class OnlineMemberVO { //在线时间 - @JsonFormat(timezone = "GMT+8", pattern = "MM-dd HH") + @JsonFormat(timezone = "GMT+8", pattern = "dd HH") private Date date; //在线会员人数 From 83c86ab1da4b41fe268c88cdbee0bd5b8a4cc7fc Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 15:42:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IndexStatisticsService.java | 6 ++++-- .../GoodsStatisticsDataServiceImpl.java | 3 +-- .../IndexStatisticsServiceImpl.java | 19 +++++++++---------- .../IndexStatisticsManagerController.java | 14 ++++++++++---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java index 5ddbfa12..b22148c8 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java @@ -1,5 +1,7 @@ package cn.lili.modules.statistics.service; +import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; import cn.lili.modules.statistics.model.vo.*; import java.util.List; @@ -38,14 +40,14 @@ public interface IndexStatisticsService { * * @return 热卖商品TOP10 */ - List goodsStatisticsOfMonth(); + List goodsStatistics(GoodsStatisticsQueryParam statisticsQueryParam); /** * 查询热卖店铺TOP10 * * @return 当月的热卖店铺TOP10 */ - List storeStatisticsOfMonth(); + List storeStatistics(StatisticsQueryParam statisticsQueryParam); } diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index d8d65ddb..f7c498de 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,7 +44,7 @@ public class GoodsStatisticsDataServiceImpl extends ServiceImpl(1, num); return goodsStatisticsDataMapper.getGoodsStatisticsData(page, queryWrapper); } diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index 8a8ab473..08183341 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -19,9 +19,9 @@ import cn.lili.modules.statistics.mapper.StoreStatisticsDataMapper; import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; import cn.lili.modules.statistics.model.enums.SearchTypeEnum; -import cn.lili.modules.statistics.model.enums.StatisticsQuery; import cn.lili.modules.statistics.model.vo.*; import cn.lili.modules.statistics.service.*; +import cn.lili.modules.statistics.util.StatisticsDateUtil; import cn.lili.modules.store.entity.enums.BillStatusEnum; import cn.lili.modules.store.service.BillService; import cn.lili.modules.store.service.StoreService; @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -146,7 +147,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { //下单统计 Map map = orderStatisticsDataService.getOrderStatisticsPrice(); //今日下单数 - indexStatisticsVO.setTodayOrderNum(map.get("num") == null ? 0L : (Long)map.get("num")); + indexStatisticsVO.setTodayOrderNum(map.get("num") == null ? 0L : (Long) map.get("num")); //今日下单金额 indexStatisticsVO.setTodayOrderPrice(map.get("price") == null ? 0D : (Double) map.get("price")); @@ -234,20 +235,19 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { } @Override - public List goodsStatisticsOfMonth() { - //获取查询参数 - GoodsStatisticsQueryParam goodsStatisticsQueryParam = getGoodsStatisticsQueryParam(); + public List goodsStatistics(GoodsStatisticsQueryParam statisticsQueryParam) { //查询商品 - return goodsStatisticsDataService.getGoodsStatisticsData(goodsStatisticsQueryParam, 10); + return goodsStatisticsDataService.getGoodsStatisticsData(statisticsQueryParam, 10); } @Override - public List storeStatisticsOfMonth() { + public List storeStatistics(StatisticsQueryParam statisticsQueryParam) { QueryWrapper queryWrapper = Wrappers.query(); - queryWrapper.between("create_time", cn.hutool.core.date.DateUtil.beginOfYear(new DateTime()), - cn.hutool.core.date.DateUtil.endOfYear(new DateTime())); + Date[] dates = StatisticsDateUtil.getDateArray(statisticsQueryParam); + Date startTime = dates[0], endTime = dates[1]; + queryWrapper.between("create_time", startTime, endTime); queryWrapper.orderByDesc("price"); @@ -288,7 +288,6 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { goodsStatisticsQueryParam.setStoreId(UserContext.getCurrentUser().getStoreId()); } - goodsStatisticsQueryParam.setType(StatisticsQuery.PRICE.name()); DateTime dateTime = new DateTime(); goodsStatisticsQueryParam.setYear(dateTime.year()); goodsStatisticsQueryParam.setMonth(dateTime.monthBaseOne()); diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index 97f8ff7c..1477776b 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -2,6 +2,9 @@ package cn.lili.controller.statistics; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; +import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; +import cn.lili.modules.statistics.model.enums.StatisticsQuery; import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.model.vo.IndexNoticeVO; import cn.lili.modules.statistics.model.vo.IndexStatisticsVO; @@ -46,14 +49,17 @@ public class IndexStatisticsManagerController { @ApiOperation(value = "获取首页查询热卖商品TOP10") @GetMapping("/goodsStatistics") - public ResultMessage> goodsStatistics() { - return ResultUtil.data(indexStatisticsService.goodsStatisticsOfMonth()); + public ResultMessage> goodsStatistics(GoodsStatisticsQueryParam goodsStatisticsQueryParam) { + + //按照金额查询 + goodsStatisticsQueryParam.setType(StatisticsQuery.PRICE.name()); + return ResultUtil.data(indexStatisticsService.goodsStatistics(goodsStatisticsQueryParam)); } @ApiOperation(value = "获取首页查询热卖店铺TOP10") @GetMapping("/storeStatistics") - public ResultMessage> storeStatistics() { - return ResultUtil.data(indexStatisticsService.storeStatisticsOfMonth()); + public ResultMessage> storeStatistics(StatisticsQueryParam statisticsQueryParam) { + return ResultUtil.data(indexStatisticsService.storeStatistics(statisticsQueryParam)); } @ApiOperation(value = "通知提示信息") From 571bc0ed937e9fe166c3c30b7602e2ad0adab5f0 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 2 Jun 2021 16:05:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/GoodsStatisticsDataServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index f7c498de..d892dca2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -46,6 +46,7 @@ public class GoodsStatisticsDataServiceImpl extends ServiceImpl(1, num); + return goodsStatisticsDataMapper.getGoodsStatisticsData(page, queryWrapper); } @@ -67,10 +68,10 @@ public class GoodsStatisticsDataServiceImpl extends ServiceImpl Date: Wed, 2 Jun 2021 17:28:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/statistics/model/vo/OnlineMemberVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java index e0a13915..ecad5579 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java @@ -17,7 +17,7 @@ import java.util.Date; public class OnlineMemberVO { //在线时间 - @JsonFormat(timezone = "GMT+8", pattern = "dd HH") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH") private Date date; //在线会员人数 From ce70a93ff5ce9e204550124927cddc08560e1b85 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 2 Jun 2021 17:56:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B9=B0=E5=AE=B6=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer-api/src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 8e2617c1..b423c287 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -138,18 +138,18 @@ ignored: - /MP_verify_qSyvBPhDsPdxvOhC.txt - /weixin/** - /source/** - - /buyer/store/** - /buyer/mini-program/** - /buyer/cashier/** - /buyer/pageData/** - /buyer/article/** - /buyer/goods/** - /buyer/category/** - - /buyer/shop/** + - /buyer/store/** - /buyer/connect/** - /buyer/members/** - - /buyer/promotion/pintuan - - /buyer/promotion/seckill + - /buyer/promotion/pintuan/** + - /buyer/promotion/seckill/** + - /buyer/promotion/pointsGoods/** - /buyer/memberEvaluation/**/goodsEvaluation - /buyer/memberEvaluation/**/evaluationNumber - /buyer/appVersion/**