From c52f83ef5f702b3c178881d3eee72267c77e7751 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:26:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index e110d25..05e06df 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -9,6 +9,8 @@
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.StudentClient;
import com.dsh.course.feignClient.account.model.TAppUser;
+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.ListQuery;
import com.dsh.course.feignClient.course.CoursePackageClient;
@@ -389,6 +391,8 @@
private ISiteBookingService siteBookingService;
@Autowired
private BallClient ballClient;
+ @Autowired
+ private WorldCupClient worldCupClient;
/**
* 获取列表
*/
@@ -398,11 +402,39 @@
List<Integer> ids = new ArrayList<>();
if(UserExt.getUser().getObjectType()==3){
+ List<Integer> storeIds = new ArrayList<>();
+ storeIds.add(UserExt.getUser().getObjectId());
+ ListQuery listQuery = new ListQuery();
+ listQuery.setIds(storeIds);
+ // 赛事
+ List<Integer> list = competitionClient.getUserIds(listQuery);
+ // 获取场地预约记录 拿到用户ids
+ List<Integer> siteUsers = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds))
+ .stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
+ // 获取课程购买记录 拿到用户ids
+ List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
+ // 获取游戏记录 拿到用户ids
+ List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ // 世界杯参与记录 拿到用户ids
+ StoreIds req = new StoreIds();
+ req.setStoreIds(storeIds);
+ List<Integer> studentIds = worldCupClient.getStudentIds(req);
+ // 用户ids
+ List<Integer> users = new ArrayList<>();
+ users.addAll(list);
+ users.addAll(siteUsers);
+ users.addAll(cpUsers);
+ users.addAll(gameUsers);
+ users.addAll(studentIds);
+ // 去重后的用户id
+ List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
ids = appUserClient.getUserStore(UserExt.getUser().getObjectId());
+ ids.addAll(collect);
+ List<Integer> collect1 = ids.stream().distinct().collect(Collectors.toList());
if(ids.size()==0){
ids.add(-1);
}
- search.setIds(ids);
+ search.setIds(collect1);
}
if(UserExt.getUser().getObjectType()==2){
// 获取运营商下的所有门店id集合
@@ -422,12 +454,17 @@
List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
// 获取游戏记录 拿到用户ids
List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ // 世界杯参与记录 拿到学员ids
+ StoreIds req = new StoreIds();
+ req.setStoreIds(storeIds);
+ List<Integer> studentIds = worldCupClient.getStudentIds(req);
// 用户ids
List<Integer> users = new ArrayList<>();
users.addAll(list);
users.addAll(siteUsers);
users.addAll(cpUsers);
users.addAll(gameUsers);
+ users.addAll(studentIds);
// 去重后的用户id
List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
ids = appUserClient.getUserYYs(UserExt.getUser().getObjectId());
--
Gitblit v1.7.1