From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 18:57:58 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 f1a5b51..73db04d 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
@@ -17,6 +17,7 @@
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.course.CoursePackageClient;
+import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.StoreClient;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.config.UserExt;
@@ -72,6 +73,9 @@
private ISiteBookingService siteBookingService;
@Autowired
private CoursePackageClient coursePackageClient;
+ @Autowired
+ private BallClient ballClient;
+
/**
* 跳转体测预约管理首页
*/
@@ -153,7 +157,7 @@
}
if (data.getViplevelId()!=null){
- // todo创建会员等级表
+ // todo 创建会员等级表
model.addAttribute("level","黄金");
}
model.addAttribute("level","黄金");
@@ -202,19 +206,30 @@
listQuery.setIds(storeIds);
// 通过门店ids 获取赛事的支付记录 获取到用户的ids
List<Integer> list = competitionClient.getUserIds(listQuery);
- // todo 写根据用户ids查询用户的方法
// 获取场地预约记录 拿到用户ids
- List<Integer> storeId = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds))
+ 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
+ List<Integer> users = new ArrayList<>();
+ users.addAll(list);
+ users.addAll(siteUsers);
+ users.addAll(cpUsers);
+ 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;
}
-
-
-
-
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
--
Gitblit v1.7.1