From 7b487d4c819bc67021cf224c5042066bf73df1e3 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期六, 28 十月 2023 17:01:00 +0800
Subject: [PATCH] 10.28。2
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 38cf153..b7b81ff 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
@@ -2,6 +2,7 @@
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
+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.TGame;
@@ -51,6 +52,24 @@
private PayMoneyUtil payMoneyUtil;
+
+ @ResponseBody
+ @PostMapping("/getIntro")
+ @ApiOperation(value = "获取步骤说明", tags = {"用户—游戏"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<String> getIntro(){
+ try {
+
+ return ResultUtil.success( gameService.getIntro());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@PostMapping("/queryGameList")
@ApiOperation(value = "获取当前场地的游戏列表配置", tags = {"用户—游戏"})
@@ -63,11 +82,10 @@
try {
List<TGameConfig> tGameConfigs = new ArrayList<>();
- List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId));
+ 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);
}
@@ -87,7 +105,7 @@
@ApiImplicitParam(value = "游戏配置id", name = "configId", dataType = "int", required = true),
@ApiImplicitParam(value = "sutuId", name = "sutuId", dataType = "int", required = true),
@ApiImplicitParam(value = "spaceId", name = "spaceId", dataType = "int", required = true),
- @ApiImplicitParam(value = "1微信 2支付宝 3玩湃币", name = "type", dataType = "int", required = true),
+ @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){
@@ -104,6 +122,7 @@
tGameRecord.setPayType(type);
tGameRecord.setUserId(uid);
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", "");
@@ -144,6 +163,7 @@
if("SUCCESS".equals(s)){
for (TGameRecord coursePackagePayment : list) {
coursePackagePayment.setStatus(1);
+ coursePackagePayment.setMoney(config.getCash());
coursePackagePayment.setOrderNo(transaction_id);
}
gameRecordService.updateBatchById(list);
@@ -180,23 +200,26 @@
if(one.getStatus() == 1){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && one.getStatus() == 0){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && one.getStatus() == 0){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+// 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){
break;
}
if("TRADE_SUCCESS".equals(s)){
for (TGameRecord coursePackagePayment : list) {
coursePackagePayment.setStatus(1);
+ coursePackagePayment.setMoney(config.getCash());
coursePackagePayment.setOrderNo(tradeNo);
}
gameRecordService.updateBatchById(list);
@@ -216,6 +239,8 @@
}
return alipay;
}else if(type==3){
+ tGameRecord.setMoney(config.getPlayCoin());
+ gameRecordService.updateById(tGameRecord);
AppUser appUser = appUserClient.queryAppUser(uid);
Integer playPaiCoins = appUser.getPlayPaiCoins();
BigDecimal playCoin = config.getPlayCoin();
@@ -229,6 +254,19 @@
startGame(uid,gameId,spaceId,sutuId);
return ResultUtil.success();
+ }else if(type==5){
+ AppUser appUser = appUserClient.queryAppUser(uid);
+ Integer playPaiCoins = appUser.getIntegral();
+ BigDecimal playCoin = config.getIntegral();
+ int i = playCoin.intValue();
+ if(playPaiCoins<i){
+ return ResultUtil.error("积分不足");
+ }
+ int i1 = playPaiCoins - i;
+ appUser.setIntegral(i1);
+ appUserClient.updateAppUser(appUser);
+ startGame(uid,gameId,spaceId,sutuId);
+ return ResultUtil.success();
}else {
return ResultUtil.error("支付方式错误");
}
@@ -261,8 +299,4 @@
}
- public static void main(String[] args) {
- Integer integer = startGame(1, 13, 1001, 1001);
- System.out.println(integer);
- }
}
--
Gitblit v1.7.1