From 197431f6ce578d87a0156d2b8b13f1d327ba5e1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 14:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 3806b5b..482a6be 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
@@ -61,8 +61,6 @@
@Autowired
private ISiteBookingService siteBookingService;
- @Autowired
- private IOperatorUserService operatorUserService;
@ResponseBody
@PostMapping("/getIntro")
@@ -167,7 +165,9 @@
-
+ private String smid = "2088330203191220";//平台支付宝商户号
+ @Autowired
+ private ISiteService siteService;
@@ -265,23 +265,21 @@
}
return weixinpay;
} else if (type == 2) {
- String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId + "_" + code + "_" + configId;
- TGame byId = gameService.getById(gameId);
- String smid="";
- // 属于平台
- if (byId.getOperationId()==null){
- smid ="2088330203191220";
- }else if(byId.getOperationId()==0){
- smid= "2088330203191220";
+ String smid1="";
+ String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
+ // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+ TGame game = gameService.getById(gameId);
+
+ Integer operationId = game.getOperationId();
+ if (operationId==0){
+ // 是平台的
+ smid1 = smid;
}else{
- // 根据运营商id 查询商户号
- OperatorUser operatorId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
- .eq("operatorId", byId.getOperationId()));
- if (operatorId!=null){
- smid = operatorId.getAlipayNum();
- }
+ String smidByOperatorId = siteService.getSMIDByOperatorId(operationId);
+ smid1 = smidByOperatorId;
}
- ResultUtil alipay = payMoneyUtil.alipay(smid,"游戏支付", "游戏支付", 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
@@ -327,6 +325,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)) {
--
Gitblit v1.7.1