From 9d7cdb2c01a468b7e722912fc0aae1ab5263ca91 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 22 May 2024 16:49:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java b/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
index 5d7c8df..4bc3e93 100644
--- a/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteAdminServiceImpl.java
@@ -486,6 +486,8 @@
BigDecimal inTotalWithdrawAmount = BigDecimal.ZERO;
BigDecimal usTotalWithdrawAmount = BigDecimal.ZERO;
Map<String, Object> map = new HashMap<>();
+ Long todayRegister = 0L;//今日注册
+ map.put("todayRegister", todayRegister);
//入金
map.put("inTotalAmount", inTotalAmount);
map.put("usTotalAmount", usTotalAmount);
@@ -502,6 +504,13 @@
return ServerResponse.createBySuccess(map);
}
+ //今日开始结束时间
+ LocalDate currentDate = LocalDate.now();
+ LocalDate nextDay = currentDate.plusDays(1);
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ String start = currentDate.format(formatter);
+ String end = nextDay.format(formatter);
+
for (AgentUser agentUser : agentUsers) {
AgentUserNodeVO userNodeVO = ConverterUtil.convert(agentUser, AgentUserNodeVO.class);
List<AgentUserNodeVO> agentUserNodeVOS = ConverterUtil.convertToList(lowerAgentUsers, AgentUserNodeVO.class);
@@ -513,9 +522,19 @@
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getAgentId, ids));
//查询用户充值
List<Integer> userIds = users.stream().map(User::getId).collect(Collectors.toList());
+ if(CollectionUtil.isEmpty(userIds)){
+ continue;
+ }
+
+ //今日注册数量
+ todayRegister = userMapper.selectCount(new LambdaQueryWrapper<User>()
+ .ge(User::getRegTime, start)
+ .le(User::getRegTime, end)
+ .in(CollectionUtil.isNotEmpty(userIds),User::getId,userIds));
+
List<UserRecharge> userRecharges = userRechargeMapper.selectList(new LambdaQueryWrapper<UserRecharge>()
.eq(UserRecharge::getOrderStatus, 1)
- .in(CollectionUtil.isNotEmpty(userIds),UserRecharge::getUserId,userIds));
+ .in(UserRecharge::getUserId,userIds));
Map<String, List<UserRecharge>> typeList = userRecharges.stream().collect(Collectors.groupingBy(UserRecharge::getAssetsType));
List<UserRecharge> inUserRecharge = typeList.get("IN");
List<UserRecharge> usUserRecharge = typeList.get("US");
@@ -548,6 +567,7 @@
}
}
}
+ map.put("todayRegister", todayRegister);
map.put("inTotalAmount", inTotalAmount);
map.put("usTotalAmount", usTotalAmount);
map.put("inTotalWithdrawAmount", inTotalWithdrawAmount);
--
Gitblit v1.9.3