From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 320b592..59b8464 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
@@ -9,6 +9,7 @@
import com.ruoyi.admin.vo.UserDataCountVO;
import com.ruoyi.admin.vo.UserTrendsVO;
import com.ruoyi.common.core.constant.OrderConstants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.entity.MoneyQueryRequest;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.feignClient.WithdrawClient;
@@ -49,9 +50,21 @@
public UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest) {
List<String> cityList = userDataCountRequest.getCityList();
String type = userDataCountRequest.getCountType();
- List<User> userList = lambdaQuery().eq(User::getIsDelete, 0).list();
+ LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0);
+ if (null != cityList && !cityList.isEmpty()) {
+ userWrapper.in(User::getCityCode, cityList);
+ }
+ List<User> userList = userWrapper.list();
+ // 判断用户是否在管辖城市内下过订单
+ for (User user : userList) {
+ Integer userId = user.getId();
+ R<Boolean> r = orderClient.orderByUserId(userId);
+ if (!r.getData()) {
+ userList.remove(user);
+ }
+ }
+ Integer userNumber = userList.size();
// 用户总量
- Integer userNumber = null == userList ? 0 : userList.size();
// 计算当前季度时间所包含时间
int currentYear = Year.now().getValue();
// 获取当前月份
@@ -71,8 +84,8 @@
// 用户增长数
LambdaQueryChainWrapper<User> wrapper = lambdaQuery().ge(User::getCreateTime, startDateStr)
.le(User::getCreateTime, endDateStr);
- if (!cityList.isEmpty()) {
- wrapper.in(User::getCity, cityList);
+ if (null != cityList && !cityList.isEmpty()) {
+ wrapper.in(User::getCityCode, cityList);
}
increaseNumber = wrapper.eq(User::getIsDelete, 0).count();
} else if (OrderConstants.YEAR.equals(type)) {
--
Gitblit v1.7.1