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 | 151 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 118 insertions(+), 33 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 3d1174c..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
@@ -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;
@@ -63,6 +65,12 @@
@Autowired
private ISiteBookingService siteBookingService;
+ private String smid = "2088330203191220";//平台支付宝商户号
+ @Autowired
+ private ISiteService siteService;
+
+
+
@ResponseBody
@PostMapping("/api/game/getIntro")
@@ -111,6 +119,13 @@
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());
@@ -160,16 +175,15 @@
- private String smid = "2088330203191220";//平台支付宝商户号
+
+
@Autowired
- private ISiteService siteService;
-
-
-
+ private IOperatorUserService operatorUserService;
@ResponseBody
@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),
@@ -177,17 +191,25 @@
@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);
+ // 是否分账 0否1是
+ int isFenZhang= 1;
+ String merchantNumber = "";
+ if (byId.getOperatorId()==null || byId.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);
+ Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
return ResultUtil.success();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -204,8 +226,8 @@
if (type == 1) {
tGameRecord.setMoney(config.getCash());
gameRecordService.updateById(tGameRecord);
- String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId;
- ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", params, code, config.getCash().toString(),
+ String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType;
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(),
"/base/game/wechatPaymentGameCallback", "APP", "");
if (weixinpay.getCode() == 200) {
new Thread(new Runnable() {
@@ -248,8 +270,44 @@
gameRecord.setOrderNo(transaction_id);
}
gameRecordService.updateBatchById(list);
- Integer integer = startGame(uid, gameId, spaceId, sutuId);
+ 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++;
@@ -267,7 +325,7 @@
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.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or().eq("red", sutuId));
Integer operationId = game.getOperationId();
@@ -324,7 +382,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="";
@@ -364,7 +422,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) {
@@ -379,7 +437,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("支付方式错误");
@@ -391,22 +449,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;
+ }
}
}
@@ -433,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));
@@ -452,7 +536,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), 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 {
@@ -473,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));
@@ -492,7 +577,7 @@
}
gameRecordService.updateBatchById(list);
String[] s = attach.split("_");
- Integer integer = startGame(Integer.valueOf(s[0]), 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