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 | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 9ff7dbf..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;
@@ -81,7 +82,7 @@
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));
@@ -121,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", "");
@@ -161,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);
@@ -197,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);
@@ -233,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();
--
Gitblit v1.7.1