From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 4f7bc26..0b297c6 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
@@ -48,6 +48,9 @@
}
@Override
public List<UserTrendsVO> userTrends1(List<String> city,List<Integer> userIds) {
+ if (userIds.isEmpty()){
+ return new ArrayList<>();
+ }
List<UserTrendsVO> userTrendsList = baseMapper.userTrends1(city,userIds);
return null == userTrendsList || userTrendsList.isEmpty() ? new ArrayList<>() : userTrendsList;
}
@@ -117,9 +120,12 @@
@Override
- public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds) {
+ public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds,List<String> siteIds) {
List<String> cityList = userDataCountRequest.getCityList();
String type = userDataCountRequest.getCountType();
+ if (userIds.isEmpty()){
+ return new UserDataCountVO(null,null,null,null);
+ }
LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0).isNotNull(User::getPhone).in(!userIds.isEmpty(),User::getId,userIds);
// if (null != cityList && !cityList.isEmpty()) {
@@ -152,8 +158,12 @@
// 结果数据封装
Long increaseNumber;
// 交易额
- BigDecimal totalMoney = orderClient.tradeMoney(new MoneyQueryRequest(cityList,userDataCountRequest.getCountType())).getData();
- BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(new MoneyQueryRequest(cityList, type))
+ MoneyQueryRequest moneyQueryRequest1 = new MoneyQueryRequest(cityList, userDataCountRequest.getCountType());
+ moneyQueryRequest1.setSiteIds(siteIds);
+ BigDecimal totalMoney = orderClient.tradeMoney(moneyQueryRequest1).getData();
+ MoneyQueryRequest moneyQueryRequest = new MoneyQueryRequest(cityList, type);
+ moneyQueryRequest.setSiteIds(siteIds);
+ BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(moneyQueryRequest)
.getData();
if (OrderConstants.QUARTER.equals(type)) {
// 用户增长数
--
Gitblit v1.7.1