From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 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 bc18bca..bf1a715 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
@@ -177,7 +177,8 @@
-
+ @Autowired
+ private IOperatorUserService operatorUserService;
@ResponseBody
@PostMapping("/api/game/payGame")
@ApiOperation(value = "支付游戏", tags = {"用户—游戏"})
@@ -195,6 +196,14 @@
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
+ }
+ Site byId = siteService.getById(spaceId);
+ // 是否分账 0否1是
+ int isFenZhang= 1;
+ String merchantNumber = "";
+ if (byId.getOperatorId()==null || byId.getOperatorId()==0){
+ // 平台
+ isFenZhang = 0;
}
//判断当前用户是否是员工
AppUser appUser1 = appUserClient.queryAppUser(uid);
@@ -218,7 +227,7 @@
tGameRecord.setMoney(config.getCash());
gameRecordService.updateById(tGameRecord);
String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
- ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", params, code, config.getCash().toString(),
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(),
"/base/game/wechatPaymentGameCallback", "APP", "");
if (weixinpay.getCode() == 200) {
new Thread(new Runnable() {
@@ -262,7 +271,43 @@
}
gameRecordService.updateBatchById(list);
Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
+ 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, config.getCash().multiply(bigDecimal1), s2,nonce_str);
+ if (!fenzhang.getCode().equals(500)){
+ System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+ }else{
+ tGameRecord.setFenzhangNo(fenzhang.getMsg());
+ tGameRecord.setFenzhangOrderNo(nonce_str);
+ tGameRecord.setFenzhangAmount(config.getCash().multiply(bigDecimal1));
+ gameRecordService.updateById(tGameRecord);
+ }
+ }
+ }
break;
+
}
if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
num++;
@@ -414,7 +459,7 @@
map.put("space_id", spaceId + "");
map.put("sutu_id", sutuId + "");
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/gameStart", map);
+ 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))) {
@@ -433,13 +478,16 @@
map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
map.put("custom", "{\"gameType\": 2}");
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/quickStart", map);
+ 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;
}
}
@@ -468,7 +516,8 @@
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;
+ //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));
@@ -487,7 +536,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ 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 {
@@ -508,7 +557,8 @@
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;
+ //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));
@@ -527,7 +577,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ 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 {
--
Gitblit v1.7.1