From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 baf6f33..b5e85a8 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
@@ -5,12 +5,14 @@
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.other.entity.SiteLock;
import com.dsh.other.entity.TGame;
import com.dsh.other.entity.TGameConfig;
import com.dsh.other.entity.TGameRecord;
import com.dsh.other.feignclient.account.AppUserClient;
import com.dsh.other.feignclient.account.model.AppUser;
import com.dsh.other.model.QueryMySiteVo;
+import com.dsh.other.service.ISiteLockService;
import com.dsh.other.service.TGameConfigService;
import com.dsh.other.service.TGameRecordService;
import com.dsh.other.service.TGameService;
@@ -29,13 +31,13 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
-
@RestController
@RequestMapping("/api/game")
public class GameController {
@Autowired
private TGameRecordService gameRecordService;
+
@Autowired
private TGameService gameService;
@@ -70,6 +72,9 @@
}
}
+@Autowired
+private ISiteLockService lockService;
+
@ResponseBody
@PostMapping("/queryGameList")
@@ -82,6 +87,18 @@
public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId){
try {
List<TGameConfig> tGameConfigs = new ArrayList<>();
+
+ 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){
@@ -187,7 +204,11 @@
}
return weixinpay;
}else if(type==2){
- ResultUtil alipay = payMoneyUtil.alipay("游戏支付", "游戏支付", "", code, config.getCash().toString(), "/base/course/aliPaymentCourseCallback");
+// Integer gameId, Integer configId,Integer type,Integer sutuId,Integer spaceId;
+
+ String params = uid+"_"+gameId+"_"+spaceId+"_"+sutuId;
+
+ ResultUtil alipay = payMoneyUtil.alipay("游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@Override
@@ -268,6 +289,7 @@
}
int i1 = playPaiCoins - i;
appUser.setIntegral(i1);
+ appUser.setPoints(playCoin.intValue());
appUserClient.updateAppUser(appUser);
startGame(uid,gameId,spaceId,sutuId);
return ResultUtil.success();
--
Gitblit v1.7.1