From 75bac456c3d66f6b173b1213776158c3bc5f8b96 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:24 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 73db04d..4a3ec65 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -25,6 +25,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -194,9 +195,6 @@
}
queryAppUser.setInsertType(objectType);
queryAppUser.setTypeId(UserExt.getUser().getObjectId());
- List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
- // 根据赛事支付记录
-
if (objectType == 2){
// 获取运营商下的所有门店id集合
List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
@@ -222,15 +220,20 @@
users.addAll(gameUsers);
// 去重后的用户id
List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
- List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
- for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
- if (collect.contains(queryAppUserVO.getId())){
- queryAppUserVOS1.add(queryAppUserVO);
- }
- }
- queryAppUserVOS = queryAppUserVOS1;
+ queryAppUser.setUserIds(collect);
+// List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
+// // 根据用户消费记录 去查询用户ids
+// for (Integer integer : collect) {
+// if (!collect1.contains(integer)){
+// TAppUser tAppUser = appUserClient.queryAppUser1(integer);
+// QueryAppUserVO queryAppUserVO = new QueryAppUserVO();
+// BeanUtils.copyProperties(tAppUser,queryAppUserVO);
+// queryAppUserVOS.add(queryAppUserVO);
+// }
+// }
}
-
+ List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
+ List<Integer> collect1 = queryAppUserVOS.stream().map(QueryAppUserVO::getId).collect(Collectors.toList());
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
--
Gitblit v1.7.1