From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 23 Sep 2022 19:28:14 +0800 Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy --- src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java index 3a97621..81f7b7f 100644 --- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java +++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java @@ -122,17 +122,17 @@ QueryWrapper<MallMember> todayMember = new QueryWrapper<>(); todayMember.like("CREATED_TIME", DateUtil.today()); - todayMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); +// todayMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); data.put("todayMember",mallMemberMapper.selectCount(todayMember)); QueryWrapper<MallMember> thisMonthMember = new QueryWrapper<>(); thisMonthMember.like("CREATED_TIME", DateUtil.format(DateUtil.date(),"yyyy-MM")); - thisMonthMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); +// thisMonthMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); data.put("thisMonthMember",mallMemberMapper.selectCount(thisMonthMember)); QueryWrapper<MallMember> lastMonthMember = new QueryWrapper<>(); lastMonthMember.like("CREATED_TIME", DateUtil.format(DateUtil.offsetMonth(new Date(), -1),"yyyy-MM")); - lastMonthMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); +// lastMonthMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); data.put("lastMonthMember",mallMemberMapper.selectCount(lastMonthMember)); // 获取近期系统访问记录 -- Gitblit v1.9.1