From 54c2de7b7a4ca46bf186ee6c41485459c1ad59dc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:07 +0800
Subject: [PATCH] 玩湃门店数据权限修改 收入管理增加世界杯记录
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 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 27b13d2..fa40e6e 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
@@ -13,6 +13,8 @@
import com.dsh.course.feignClient.activity.model.BodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointmentVO;
+import com.dsh.course.feignClient.communityWorldCup.Model.StoreIds;
+import com.dsh.course.feignClient.communityWorldCup.WorldCupClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.ListQuery;
@@ -167,6 +169,8 @@
return PREFIX + "TAppUser_edit.html";
}
+ @Autowired
+ private WorldCupClient worldCupClient;
/**
* 获取所有用户信息
* @return
@@ -212,14 +216,69 @@
List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
// 获取游戏记录 拿到用户ids
List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ // 查询世界杯记录 获取用户ids
+ StoreIds storeIds1 = new StoreIds();
+ storeIds1.setStoreIds(storeIds);
+ List<Integer> userIds = worldCupClient.getUserIds(storeIds1);
// 用户ids
List<Integer> users = new ArrayList<>();
users.addAll(list);
users.addAll(siteUsers);
users.addAll(cpUsers);
users.addAll(gameUsers);
+ users.addAll(userIds);
// 去重后的用户id
List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ 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);
+// }
+// }
+ }
+ if (objectType == 3){
+ // 获取运营商下的所有门店id集合
+ List<Integer> storeIds = new ArrayList<>();
+ storeIds.add(objectId);
+ // 根据门店id集合查询 属于该运营商下的门店举办的赛事
+ ListQuery listQuery = new ListQuery();
+ listQuery.setIds(storeIds);
+ // 通过门店ids 获取赛事的支付记录 获取到用户的ids
+ List<Integer> list = competitionClient.getUserIds(listQuery);
+ // 获取场地预约记录 拿到用户ids
+ List<Integer> siteUsers = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds)
+ .ne("status",0)
+ .ne("status",5)
+ )
+ .stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
+ // 获取课程购买记录 拿到用户ids
+ List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
+ // 获取游戏记录 拿到用户ids
+ List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ StoreIds storeIds1 = new StoreIds();
+ storeIds1.setStoreIds(storeIds);
+ // 查询世界杯记录 获取用户ids
+ List<Integer> userIds = worldCupClient.getUserIds(storeIds1);
+ // 用户ids
+ List<Integer> users = new ArrayList<>();
+ users.addAll(list);
+ users.addAll(siteUsers);
+ users.addAll(cpUsers);
+ users.addAll(gameUsers);
+ users.addAll(userIds);
+ // 去重后的用户id
+ List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
queryAppUser.setUserIds(collect);
// List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
// // 根据用户消费记录 去查询用户ids
--
Gitblit v1.7.1