From cabda12d788eeb6e056113ac8352dfaf972490d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 17:10:44 +0800
Subject: [PATCH] bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 0562ff8..b0c335e 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
@@ -110,15 +110,15 @@
Integer uid = tokenUtil.getUserIdFormRedis();
AppUser appUser = appUserClient.queryAppUser(uid);
List<TGameConfig> tGameConfigs = new ArrayList<>();
- if (appUser.getAddUserId() == null) {
- 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("当前场地已被锁定");
- }
- }
- }
+// if (appUser.getAddUserId() == null) {
+// 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) {
Integer id = list.get(0).getId();
@@ -271,6 +271,7 @@
ResultUtil alipay = payMoneyUtil.alipay(smid1,"游戏支付", "游戏支付", params, code, config.getCash().toString(),
"/base/game/aliPaymentGameCallback");
if (alipay.getCode() == 200) {
+ String finalSmid = smid1;
new Thread(new Runnable() {
@Override
public void run() {
@@ -314,7 +315,8 @@
}
gameRecordService.updateBatchById(list);
Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
-
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, code, one.getOrderNo(), config.getCash().toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -395,7 +397,7 @@
map.put("space_id", spaceId + "");
map.put("red_sutu_id", game.getRed());
map.put("blue_sutu_id", game.getBlue());
- map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
+ map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
map.put("custom", "{\"gameType\": 2}");
String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
--
Gitblit v1.7.1