From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
index 074d63e..20bda70 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.admin.service.impl;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.mapper.UserMapper;
@@ -39,15 +40,12 @@
@Override
public List<UserTrendsVO> userTrends(List<String> city) {
- if (null == city || city.isEmpty()) {
- return new ArrayList<>();
- }
List<UserTrendsVO> userTrendsList = baseMapper.userTrends(city);
return null == userTrendsList || userTrendsList.isEmpty() ? new ArrayList<>() : userTrendsList;
}
@Override
- public Object userDataCount(UserDataCountRequest userDataCountRequest) {
+ public UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest) {
List<String> cityList = userDataCountRequest.getCityList();
List<User> userList = lambdaQuery().eq(User::getIsDelete, 0).list();
// 用户总量
@@ -67,12 +65,16 @@
BigDecimal withdrawalTotalMoney;
if (OrderConstants.QUARTER.equals(userDataCountRequest.getCountType())) {
// 用户增长数
- increaseNumber = lambdaQuery().ge(User::getCreateTime, startDateStr).le(User::getCreateTime, endDateStr)
- .in(User::getCity, cityList).eq(User::getIsDelete, 0).count();
+ LambdaQueryChainWrapper<User> wrapper = lambdaQuery().ge(User::getCreateTime, startDateStr)
+ .le(User::getCreateTime, endDateStr);
+ if (!cityList.isEmpty()) {
+ wrapper.in(User::getCity, cityList);
+ }
+ increaseNumber = wrapper.eq(User::getIsDelete, 0).count();
// 用户总交易额
totalMoney = orderService.totalMoneyByQuarter(startDateStr, endDateStr, cityList);
// 用户提现总额
- withdrawalTotalMoney = withdrawService.withdrawalTotalMoney(cityList);
+ withdrawalTotalMoney = withdrawService.withdrawalTotalMoney(cityList,startDateStr,endDateStr);
} else if (OrderConstants.YEAR.equals(userDataCountRequest.getCountType())) {
// 用户增长数
increaseNumber = baseMapper.increaseNumberByYear(cityList);
--
Gitblit v1.7.1