From ed621a16a9ad1ec27bf62884b08f0aa02344a598 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 26 Feb 2024 10:25:50 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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..c99e8d9 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;
@@ -32,10 +33,7 @@
import javax.servlet.http.HttpSession;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author MrBird
@@ -51,6 +49,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,11 +97,21 @@
// 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()));
- data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
- data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue()));
+ List<Long> states = new ArrayList();
+ states.add(2L);
+ states.add(3L);
+ states.add(4L);
+// data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.WECHAT.getName(), OrderStatusEnum.FINISH.getValue()));
+ data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.WECHAT.getName(), states));
+// data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
+ data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.ALIPAY.getName(), states));
+// data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
+ data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.BANK.getName(), states));
+// data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue()));
+ data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndSomeStatue(OrderPayMethodEnum.BALANCE.getName(), states));
data.put("lastDay", mallAchieveRecordMapper.selectAchieveTotal("D", DateUtil.offsetDay(new Date(), -1)));
@@ -122,17 +131,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