From 7cd3dea07f5b7cefad9dea9fd7daf992449aaac8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 18:24:38 +0800
Subject: [PATCH] 修改bug
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 126 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 27 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 c70bd01..73b6c4e 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
@@ -10,20 +10,15 @@
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;
+import com.dsh.other.model.User;
+import com.dsh.other.service.*;
import com.dsh.other.util.*;
import com.dsh.other.util.httpClinet.HttpResult;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -48,7 +43,7 @@
@Autowired
private TokenUtil tokenUtil;
- @Autowired
+ @Resource
private AppUserClient appUserClient;
@Autowired
@@ -56,6 +51,12 @@
@Resource
private CourseRecordClient courseRecordClient;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private ISiteBookingService siteBookingService;
@ResponseBody
@@ -88,31 +89,22 @@
})
public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId) {
try {
-
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("当前场地已被锁定");
}
}
-
}
-
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();
-// tGameConfigs = gameConfigService.list(new LambdaQueryWrapper<TGameConfig>().eq(TGameConfig::getOtherId, id));
tGameConfigs = gameConfigService.listJs(id);
-
}
List<TGameConfig> filteredList = tGameConfigs.stream()
.filter(gameConfig -> !gameConfig.getImg().isEmpty())
@@ -123,6 +115,50 @@
return ResultUtil.runErr();
}
}
+
+
+ @ResponseBody
+ @PostMapping("/gameStartupCheck")
+ @ApiOperation(value = "扫码启动游戏前的校验（0=不通过，1=通过）", tags = {"用户—游戏"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "三方游戏id", name = "gameId", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<Integer> gameStartupCheck(Integer gameId){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ //判断当前用户是否是员工
+ AppUser appUser1 = appUserClient.queryAppUser(uid);
+ User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+ if (null != one) {
+ return ResultUtil.success(1);
+ }
+ //普通用户校验当前时间是否在预约时间段内
+ TGame game = gameService.getById(gameId);
+ Integer siteId = game.getSiteId();
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>()
+ .eq("state", 1)
+ .in("status", Arrays.asList(1, 2))
+ .eq("appUserId", uid)
+ .eq("siteId", siteId)
+ .last(" and now() between startTime and endTime")
+ );
+ return ResultUtil.success(null == siteBooking ? 0 : 1);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ private String smid = "2088330203191220";//平台支付宝商户号
+ @Autowired
+ private ISiteService siteService;
+
@ResponseBody
@@ -142,6 +178,13 @@
if (null == uid) {
return ResultUtil.tokenErr();
}
+ //判断当前用户是否是员工
+ AppUser appUser1 = appUserClient.queryAppUser(uid);
+ User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+ if (null != one) {
+ Integer integer = startGame(uid, gameId, spaceId, sutuId);
+ return ResultUtil.success();
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
TGameConfig config = gameConfigService.getById(configId);
@@ -152,6 +195,7 @@
tGameRecord.setNumber(code);
tGameRecord.setTime(new Date());
gameRecordService.save(tGameRecord);
+
if (type == 1) {
ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", "", code, config.getCash().toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
if (weixinpay.getCode() == 200) {
@@ -211,11 +255,21 @@
}
return weixinpay;
} else if (type == 2) {
-// Integer gameId, Integer configId,Integer type,Integer sutuId,Integer spaceId;
+ String smid1="";
+ String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
+ // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+ TGame game = gameService.getById(gameId);
- String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId;
+ Integer operationId = game.getOperationId();
+ if (operationId==0){
+ // 是平台的
+ smid1 = smid;
+ }else{
+ String smidByOperatorId = siteService.getSMIDByOperatorId(operationId);
+ smid1 = smidByOperatorId;
+ }
- ResultUtil alipay = payMoneyUtil.alipay("游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
+ ResultUtil alipay = payMoneyUtil.alipay(smid1,"游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
@@ -240,9 +294,6 @@
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
-// Map<String, String> data1 = resultUtil.getData();
-// String s = data1.get("tradeStatus");
-// String tradeNo = data1.get("tradeNo");
String tradeNo = resultUtil.getTradeNo();
String s = resultUtil.getTradeStatus();
if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
@@ -255,7 +306,6 @@
coursePackagePayment.setOrderNo(tradeNo);
CourseCounsum courseCounsum = new CourseCounsum();
-// courseCounsum.setPaymentId(paymentId);
courseCounsum.setChangeType(3);
courseCounsum.setInsertTime(new Date());
courseCounsum.setReason("智慧球场;" + config.getCash());
@@ -265,6 +315,18 @@
}
gameRecordService.updateBatchById(list);
Integer integer = startGame(uid, gameId, spaceId, sutuId);
+ // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+ TGame game = gameService.getById(gameId);
+ String smid2="";
+ Integer operationId = game.getOperationId();
+ if (operationId==0){
+ // 是平台的
+ smid2 = smid;
+ }else{
+ String smidByOperatorId = siteService.getSMIDByOperatorId(operationId);
+ smid2 = smidByOperatorId;
+ }
+ payMoneyUtil.confirm(smid2,code,tradeNo,config.getCash().toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -316,8 +378,6 @@
e.printStackTrace();
return ResultUtil.runErr();
}
-
-
}
@@ -333,6 +393,7 @@
JSONObject jsonObject = JSONObject.parseObject(s);
Object code = jsonObject.get("code");
if (String.valueOf(code) != null && "200".equals(String.valueOf(code))) {
+ System.err.println("--------------启动了一次游戏");
return 200;
} else {
return 500;
@@ -340,4 +401,15 @@
}
+ /**
+ * 根据sutuid获取游戏数据
+ * @param sutuId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getTGameBySutuId")
+ public TGame getTGameBySutuId(@RequestBody String sutuId){
+ return gameService.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or()
+ .eq("red", sutuId).eq("state", 0));
+ }
}
--
Gitblit v1.7.1