From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 324 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 263 insertions(+), 61 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 c2ac606..028ba01 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
@@ -1,6 +1,8 @@
package com.dsh.other.controller;
import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,6 +11,7 @@
import com.dsh.other.feignclient.CourseRecordClient;
import com.dsh.other.feignclient.account.AppUserClient;
import com.dsh.other.feignclient.account.model.AppUser;
+import com.dsh.other.model.GetTGameRecord;
import com.dsh.other.model.QueryMySiteVo;
import com.dsh.other.model.User;
import com.dsh.other.service.*;
@@ -21,13 +24,17 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@RestController
-@RequestMapping("/api/game")
+@RequestMapping("")
public class GameController {
@Autowired
@@ -58,9 +65,15 @@
@Autowired
private ISiteBookingService siteBookingService;
+ private String smid = "2088330203191220";//平台支付宝商户号
+ @Autowired
+ private ISiteService siteService;
+
+
+
@ResponseBody
- @PostMapping("/getIntro")
+ @PostMapping("/api/game/getIntro")
@ApiOperation(value = "获取步骤说明", tags = {"用户—游戏"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -80,7 +93,7 @@
@ResponseBody
- @PostMapping("/queryGameList")
+ @PostMapping("/api/game/queryGameList")
@ApiOperation(value = "获取当前场地的游戏列表配置", tags = {"用户—游戏"})
@ApiImplicitParams({
@ApiImplicitParam(value = "siteId", name = "siteId", dataType = "int", required = true),
@@ -89,30 +102,30 @@
})
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.listJs(id);
}
+ tGameConfigs.forEach(g -> {
+ if(g.getGameId() == 0){
+ g.setGameType(2);
+ }else{
+ g.setGameType(1);
+ }
+ });
List<TGameConfig> filteredList = tGameConfigs.stream()
.filter(gameConfig -> !gameConfig.getImg().isEmpty())
.collect(Collectors.toList());
@@ -125,7 +138,7 @@
@ResponseBody
- @PostMapping("/gameStartupCheck")
+ @PostMapping("/api/game/gameStartupCheck")
@ApiOperation(value = "扫码启动游戏前的校验（0=不通过，1=通过）", tags = {"用户—游戏"})
@ApiImplicitParams({
@ApiImplicitParam(value = "三方游戏id", name = "gameId", dataType = "int", required = true),
@@ -137,10 +150,11 @@
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) {
+ //判断当前用户是否是员工
+ List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+ if (!one.isEmpty()) {
return ResultUtil.success(1);
}
//普通用户校验当前时间是否在预约时间段内
@@ -162,16 +176,15 @@
- private String smid = "2088330203191220";//平台支付宝商户号
+
+
@Autowired
- private ISiteService siteService;
-
-
-
+ private IOperatorUserService operatorUserService;
@ResponseBody
- @PostMapping("/payGame")
+ @PostMapping("/api/game/payGame")
@ApiOperation(value = "支付游戏", tags = {"用户—游戏"})
@ApiImplicitParams({
+ @ApiImplicitParam(value = "游戏类型（1=普通游戏，2=世界杯）", name = "gameType", dataType = "int", required = true),
@ApiImplicitParam(value = "三方游戏id", name = "gameId", dataType = "int", required = true),
@ApiImplicitParam(value = "游戏配置id", name = "configId", dataType = "int", required = true),
@ApiImplicitParam(value = "sutuId", name = "sutuId", dataType = "int", required = true),
@@ -179,17 +192,27 @@
@ApiImplicitParam(value = "1微信 2支付宝 3玩湃币 5积分", name = "type", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil payGame(Integer gameId, Integer configId, Integer type, Integer sutuId, Integer spaceId) {
+ public ResultUtil payGame(Integer gameType, Integer gameId, Integer configId, Integer type, Integer sutuId, Integer spaceId) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
+ Site byId = siteService.getById(spaceId);
+ Store byId1 = storeService.getById(byId.getStoreId());
+
+ // 是否分账 0否1是
+ int isFenZhang= 1;
+ String merchantNumber = "";
+ if (byId1.getOperatorId()==null || byId1.getOperatorId()==0){
+ // 平台
+ isFenZhang = 0;
+ }
//判断当前用户是否是员工
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);
+ List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+ if (!one.isEmpty()) {
+ Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
return ResultUtil.success();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -201,10 +224,17 @@
tGameRecord.setUserId(uid);
tGameRecord.setNumber(code);
tGameRecord.setTime(new Date());
+ tGameRecord.setSiteId(spaceId);
gameRecordService.save(tGameRecord);
+ System.err.println("启动游戏支付");
if (type == 1) {
- ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", "", code, config.getCash().toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
+ tGameRecord.setMoney(config.getCash());
+ gameRecordService.updateById(tGameRecord);
+ String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(),
+ "/base/game/wechatPaymentGameCallback", "APP", "");
+ System.err.println("启动游戏支付");
if (weixinpay.getCode() == 200) {
new Thread(new Runnable() {
@Override
@@ -212,11 +242,12 @@
try {
int num = 1;
int wait = 0;
- while (num <= 10) {
+ while (num <= 15) {
int min = 5000;
wait += (min * num);
Thread.sleep(wait);
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("code", code).eq("payType", 2));
+ List<TGameRecord> list = gameRecordService
+ .list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 1));
TGameRecord one = list.get(0);
if (one.getStatus() == 1) {
@@ -236,20 +267,21 @@
Map<String, String> data1 = resultUtil.getData();
String s = data1.get("trade_state");
String transaction_id = data1.get("transaction_id");
- if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
break;
}
if ("SUCCESS".equals(s)) {
- for (TGameRecord coursePackagePayment : list) {
- coursePackagePayment.setStatus(1);
- coursePackagePayment.setMoney(config.getCash());
- coursePackagePayment.setOrderNo(transaction_id);
+ for (TGameRecord gameRecord : list) {
+ gameRecord.setStatus(1);
+ gameRecord.setOrderNo(transaction_id);
}
gameRecordService.updateBatchById(list);
- Integer integer = startGame(uid, gameId, spaceId, sutuId);
+ Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
+
break;
+
}
- if ("USERPAYING".equals(s)) {
+ if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
num++;
}
}
@@ -262,11 +294,12 @@
}
return weixinpay;
} else if (type == 2) {
+ tGameRecord.setMoney(config.getCash());
+ gameRecordService.updateById(tGameRecord);
String smid1="";
- String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
+ String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType;
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
- TGame game = gameService.getById(gameId);
-
+ TGame game = gameService.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or().eq("red", sutuId));
Integer operationId = game.getOperationId();
if (operationId==0){
// 是平台的
@@ -276,7 +309,8 @@
smid1 = smidByOperatorId;
}
- ResultUtil alipay = payMoneyUtil.alipay(smid1,"游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/site/gameCallback");
+ ResultUtil alipay = payMoneyUtil.alipay(smid1,"游戏支付", "游戏支付", params, code, config.getCash().toString(),
+ "/base/game/aliPaymentGameCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
@@ -307,10 +341,9 @@
break;
}
if ("TRADE_SUCCESS".equals(s)) {
- for (TGameRecord coursePackagePayment : list) {
- coursePackagePayment.setStatus(1);
- coursePackagePayment.setMoney(config.getCash());
- coursePackagePayment.setOrderNo(tradeNo);
+ for (TGameRecord gameRecord : list) {
+ gameRecord.setStatus(1);
+ gameRecord.setOrderNo(tradeNo);
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setChangeType(3);
@@ -321,7 +354,7 @@
}
gameRecordService.updateBatchById(list);
- Integer integer = startGame(uid, gameId, spaceId, sutuId);
+ Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
TGame game = gameService.getById(gameId);
String smid2="";
@@ -361,7 +394,7 @@
int i1 = playPaiCoins - i;
appUser.setPlayPaiCoins(i1);
appUserClient.updateAppUser(appUser);
- startGame(uid, gameId, spaceId, sutuId);
+ startGame(uid, gameType, gameId, spaceId, sutuId);
return ResultUtil.success();
} else if (type == 5) {
@@ -376,7 +409,7 @@
appUser.setIntegral(i1);
appUser.setPoints(playCoin.intValue());
appUserClient.updateAppUser(appUser);
- startGame(uid, gameId, spaceId, sutuId);
+ startGame(uid, gameType, gameId, spaceId, sutuId);
return ResultUtil.success();
} else {
return ResultUtil.error("支付方式错误");
@@ -388,22 +421,47 @@
}
- private static Integer startGame(Integer uid, Integer gameId, Integer spaceId, Integer sutuId) {
- HashMap<String, String> map = new HashMap<>();
- map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map.put("app_user_id", uid + "");
- map.put("game_id", gameId + "");
- map.put("space_id", spaceId + "");
- map.put("sutu_id", sutuId + "");
+ public Integer startGame(Integer uid, Integer gameType, Integer gameId, Integer spaceId, Integer sutuId) {
+ TGame game = gameService.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or().eq("red", sutuId));
+ if(1 == gameType){
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map.put("app_user_id", uid + "");
+ map.put("game_id", gameId + "");
+ map.put("space_id", spaceId + "");
+ map.put("sutu_id", sutuId + "");
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/gameStart", map);
- 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;
+ String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/gameStart", map);
+ 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;
+ }
+ }else{
+ //2、调起开启游戏的接口。
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ 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("custom", "{\"gameType\": 2}");
+
+ String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
+ JSONObject jsonObject = JSONObject.parseObject(s);
+ Integer code1 = jsonObject.getInteger("code");
+ String message = jsonObject.getString("message");
+ if (200 == code1) {
+ System.err.println("--------------启动了世界杯游戏");
+ System.err.println(s);
+ return 200;
+ } else {
+ System.err.println(message);
+ return 500;
+ }
}
}
@@ -414,9 +472,153 @@
* @return
*/
@ResponseBody
- @PostMapping("/getTGameBySutuId")
+ @PostMapping("/api/game/getTGameBySutuId")
public TGame getTGameBySutuId(@RequestBody String sutuId){
return gameService.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or()
.eq("red", sutuId).eq("state", 0));
}
+
+
+ @Resource
+ private StoreService storeService;
+
+ @ResponseBody
+ @PostMapping("/base/game/wechatPaymentGameCallback")
+ public void wechatPaymentGameCallback(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ System.err.println("进入游戏回调");
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ System.err.println("回调参数"+map);
+ if(null != map){
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ String result = map.get("result");
+ //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
+ //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
+ String attach = map.get("attach");
+
+ List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1));
+ for (TGameRecord gameRecord : list) {
+ gameRecord.setStatus(1);
+ gameRecord.setOrderNo(transaction_id);
+
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setChangeType(3);
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("智慧球场;" + gameRecord.getMoney());
+ courseCounsum.setAppUserId(gameRecord.getUserId());
+ courseRecordClient.save(courseCounsum);
+
+ }
+ gameRecordService.updateBatchById(list);
+ String[] s = attach.split("_");
+ Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ TGameRecord one = gameRecordService.getOne(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1));
+ System.err.println("游戏支付记录"+one);
+ if (one!=null){
+ Integer gameId = one.getGameId();
+ Site byId1 = siteService.getById(one.getSiteId());
+ Store byId = storeService.getById(byId1.getStoreId());
+ if (byId!=null){
+ if (byId.getOperatorId()!=null && byId.getOperatorId()!=0){
+ // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
+ Thread.sleep(120000);
+ // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+ OperatorUser operatorId = operatorUserService.getOne(
+ new QueryWrapper<OperatorUser>().eq("operatorId",byId.getOperatorId())
+ );
+ if (operatorId.getWechatProportion() == null){
+ operatorId.setWechatProportion("0");
+ }
+ if (operatorId.getAlipayProportion() == null){
+ operatorId.setAlipayProportion("0");
+ }
+ String proportion= operatorId.getWechatProportion()+","+operatorId.getAlipayProportion();
+ String[] split = proportion.split(",");
+ String s1 = split[0];
+ if (!s1.equals("未设置")){
+ BigDecimal bigDecimal = new BigDecimal(s1);
+ // 分账比例
+ BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+ // 微信商户号
+ String s2 =siteService.getmerchantNumberByOperatorId(byId.getOperatorId());
+ String nonce_str = UUIDUtil.getRandomCode(16);
+
+ ResultUtil fenzhang = payMoneyUtil.fenzhang(transaction_id, one.getMoney().multiply(bigDecimal1), s2,nonce_str,"玩游戏分账");
+ if (!fenzhang.getCode().equals(200)){
+ System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+ }else{
+ one.setFenzhangNo(fenzhang.getData().toString());
+ one.setFenzhangOrderNo(nonce_str);
+ one.setFenzhangAmount(one.getMoney().multiply(bigDecimal1));
+ gameRecordService.updateById(one);
+ }
+ }
+ }
+ }
+
+ }
+
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.print(result);
+ out.flush();
+ out.close();
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/base/game/aliPaymentGameCallback")
+ public void aliPaymentGameCallback(HttpServletRequest request, HttpServletResponse response){
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ if(null != map){
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("trade_no");
+ //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType;
+ //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
+ String attach = map.get("passback_params");
+
+ List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 2));
+ for (TGameRecord gameRecord : list) {
+ gameRecord.setStatus(1);
+ gameRecord.setOrderNo(transaction_id);
+
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setChangeType(3);
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("智慧球场;" + gameRecord.getMoney());
+ courseCounsum.setAppUserId(gameRecord.getUserId());
+ courseRecordClient.save(courseCounsum);
+
+ }
+ gameRecordService.updateBatchById(list);
+ String[] s = attach.split("_");
+ Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.print("success");
+ out.flush();
+ out.close();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/game/getTGameRecord")
+ public List<TGameRecord> getTGameRecord(@RequestBody GetTGameRecord getTGameRecord){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return gameRecordService.list(new QueryWrapper<TGameRecord>().eq("userId", getTGameRecord.getAppUserId()).eq("status", 1).in("payType", Arrays.asList(1, 2))
+ .last(" and DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') between '" + sdf.format(getTGameRecord.getStartTiem()) +"' and '" + sdf.format(getTGameRecord.getEndTime()) + "'"));
+ }
}
--
Gitblit v1.7.1