From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 f60f2d6..f36f5f3 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;
@@ -329,17 +331,6 @@
model.addAttribute("item", tStudentDto);
if (tStudentDto.getLateralSurface()!=null&&!tStudentDto.equals("")) {
-// String[] pics = tStudentDto.getLateralSurface().split(";");
-// model.addAttribute("pic1", pics[0]);
-// System.out.println("=====pic1==" + pics[0]);
-// if (pics.length > 1) {
-// model.addAttribute("pic2", pics[1]);
-// System.out.println("=====pic2==" + pics[1]);
-// }
-// if (pics.length > 2) {
-// model.addAttribute("pic3", pics[2]);
-// System.out.println("=====pic3==" + pics[2]);
-// }
model.addAttribute("images",tStudentDto.getLateralSurface());
}
@@ -400,6 +391,8 @@
private ISiteBookingService siteBookingService;
@Autowired
private BallClient ballClient;
+ @Autowired
+ private WorldCupClient worldCupClient;
/**
* 获取列表
*/
@@ -409,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集合
@@ -433,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());
@@ -467,9 +493,7 @@
@RequestMapping("/listcom/{id}")
@ResponseBody
public List<Map<String,Object>> listcom(@PathVariable("id") Integer id) {
-
- List<Map<String,Object>> maps = studentClient.listCom(id);
-
+ List<Map<String,Object>> maps = studentClient.listCom(id);
return maps;
}
@@ -598,11 +622,6 @@
@RequestMapping("/changeStatus/{id}")
@ResponseBody
public ResultUtil changeStatus(@PathVariable Integer id) {
-// InsertBackDto insertBackDto= new InsertBackDto();
-// insertBackDto.setId(id);
-//// insertBackDto.setIds(ids);
-// System.out.println("=====insertBackDto========"+insertBackDto);
-
courseStuddentClient.changeStatus(id);
courseStuddentClient.zeroClass(id);
@@ -613,14 +632,8 @@
@RequestMapping("/noStatus/{id}")
@ResponseBody
public ResultUtil noStatus(@PathVariable Integer id) {
-// InsertBackDto insertBackDto= new InsertBackDto();
-// insertBackDto.setId(id);
-//// insertBackDto.setIds(ids);
-// System.out.println("=====insertBackDto========"+insertBackDto);
-
courseStuddentClient.noStatus(id);
courseStuddentClient.backStausClass(id);
-// courseStuddentClient.zeroClass(id);
System.out.println("============学员查询接口=========");
return new ResultUtil<>(0,0,"已拒绝",null,null);
@@ -833,14 +846,12 @@
System.out.println("========ToHoliDto========="+resultUtil);
if (resultUtil.equals("换课成功")) {
-// return ResultUtil.success(resultUtil);
return new ResultUtil<>(0,0,resultUtil);
}else {
- return new ResultUtil<>(0,1,resultUtil);}
+ return new ResultUtil<>(0,1,resultUtil);
}
-// if (resultUtil==""){
-// }else{
+ }
//赠课
--
Gitblit v1.7.1