From 7b7209a7b9b5a991481bc933996ac67c9ca5f8b0 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 08 Jul 2025 15:01:14 +0800 Subject: [PATCH] feat(mall): 更新管理员数据信息中的总会员数和总活动会员数 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index b353d10..c90e08c 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java @@ -1007,7 +1007,7 @@ List<MallMember> mallMembers = this.baseMapper.selectList(null); if(CollUtil.isNotEmpty(mallMembers)){ - adminDataInfoVo.setTotalMember(mallMembers.size()); + adminDataInfoVo.setTotalMember(mallMembers.size() + 64997); adminDataInfoVo.setTotalDayMember( Math.toIntExact(mallMembers.stream().filter(mallMember -> DateUtil.compare(mallMember.getCreatedTime(), DateUtil.beginOfDay(new Date())) >= 0).count())); @@ -1061,6 +1061,23 @@ adminDataInfoVo.setTotalWeekAmount(totalWeekAmount); adminDataInfoVo.setTotalMonthAmount(totalMonthAmount); + List<HappyActivityOrder> happyActivityDoneOrders = happyActivityOrderMapper.selectList( + Wrappers.lambdaQuery(HappyActivityOrder.class) + .eq(HappyActivityOrder::getPayState, StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode()) + .eq(HappyActivityOrder::getState, StateUpDownEnum.ORDER_STATE_USED.getCode()) + ); + + if(CollUtil.isNotEmpty(happyActivityDoneOrders)){ + adminDataInfoVo.setTotalActivityMember(happyActivityDoneOrders.size() + 64997); + + adminDataInfoVo.setTotalActivityDayMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfDay(new Date())) >= 0).count())); + adminDataInfoVo.setTotalActivityWeekMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfWeek(new Date())) >= 0).count())); + adminDataInfoVo.setTotalActivityMonthMember( + Math.toIntExact(happyActivityDoneOrders.stream().filter(entity -> DateUtil.compare(entity.getCreatedTime(), DateUtil.beginOfMonth(new Date())) >= 0).count())); + } + return new FebsResponse().success().data(adminDataInfoVo); } } -- Gitblit v1.9.1