From 3ba2d33c27aea91c14bbf34e04e72f3d758a5105 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 22 十一月 2023 19:36:01 +0800
Subject: [PATCH] 11.21.2
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index 0148a97..924a16e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -87,19 +87,25 @@
})
public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId){
try {
+
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ AppUser appUser = appUserClient.queryAppUser(uid);
List<TGameConfig> tGameConfigs = new ArrayList<>();
- List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
+ if (appUser.getAddUserId()==null) {
- Date now = new Date();
- for (SiteLock siteLock : lock) {
- if (now.after(siteLock.getStartTime())&&now.before(siteLock.getEndTime())){
- return ResultUtil.error("当前场地已被锁定");
+
+
+ List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
+
+ Date now = new Date();
+ for (SiteLock siteLock : lock) {
+ if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) {
+ return ResultUtil.error("当前场地已被锁定");
+ }
}
-
}
-
List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState,0));
if(list.size()>0){
--
Gitblit v1.7.1