From 94e644443a660b39521f08805b66c27ced736e40 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Aug 2022 11:30:33 +0800
Subject: [PATCH] fix:普通商品不再10天结算，改为及时结算并不能退货
---
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 10 +++++++---
1 files changed, 7 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..001c7a5 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.service.ValidateCodeService;
import cc.mrbird.febs.common.utils.Md5Util;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.MallAchieveRecordMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
@@ -51,6 +52,7 @@
private final MallMemberMapper mallMemberMapper;
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final RedisUtils redisUtils;
@PostMapping("login")
@Limit(key = "login", period = 60, count = 10, name = "登录接口", prefix = "limit")
@@ -98,6 +100,8 @@
// Long todayIp = this.loginLogService.findTodayIp();
// data.put("todayIp", todayIp);
+ //积分池数据
+ data.put("scorePool",redisUtils.get("scorePool"));
//支付统计
data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.WECHAT.getName(), OrderStatusEnum.FINISH.getValue()));
data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
@@ -122,17 +126,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