From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 04 七月 2025 19:42:49 +0800 Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付 --- cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 379 +++++++++++++++++++++++++++++------------------------- 1 files changed, 203 insertions(+), 176 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 028ba01..cf6861a 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 @@ -17,18 +17,23 @@ import com.dsh.other.service.*; import com.dsh.other.util.*; import com.dsh.other.util.httpClinet.HttpResult; +import com.dsh.other.util.wx.WxV3PayConfig; +import com.wechat.pay.contrib.apache.httpclient.util.AesUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -176,10 +181,11 @@ - + private String smidVx = "2088330203191220";//平台微信商户号 @Autowired private IOperatorUserService operatorUserService; + @ResponseBody @PostMapping("/api/game/payGame") @ApiOperation(value = "支付游戏", tags = {"用户—游戏"}) @@ -198,13 +204,13 @@ if (null == uid) { return ResultUtil.tokenErr(); } - Site byId = siteService.getById(spaceId); - Store byId1 = storeService.getById(byId.getStoreId()); + Site site = siteService.getById(spaceId); + Store store = storeService.getById(site.getStoreId()); // 是否分账 0否1是 int isFenZhang= 1; String merchantNumber = ""; - if (byId1.getOperatorId()==null || byId1.getOperatorId()==0){ + if (store.getOperatorId()==null || store.getOperatorId()==0){ // 平台 isFenZhang = 0; } @@ -232,67 +238,27 @@ tGameRecord.setMoney(config.getCash()); gameRecordService.updateById(tGameRecord); String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType; - ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(), - "/base/game/wechatPaymentGameCallback", "APP", ""); +// ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付-"+isFenZhang, params, code, config.getCash().toString(), +// "/base/game/wechatPaymentGameCallback", "APP", ""); System.err.println("启动游戏支付"); - if (weixinpay.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - try { - int num = 1; - int wait = 0; - while (num <= 15) { - int min = 5000; - wait += (min * num); - Thread.sleep(wait); - List<TGameRecord> list = gameRecordService - .list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 1)); - TGameRecord one = list.get(0); - - if (one.getStatus() == 1) { - break; - } - ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, ""); - if (resultUtil.getCode() == 200 && one.getStatus() == 0) { - /** - * SUCCESS—支付成功, - * REFUND—转入退款, - * NOTPAY—未支付, - * CLOSED—已关闭, - * REVOKED—已撤销(刷卡支付), - * USERPAYING--用户支付中, - * PAYERROR--支付失败(其他原因,如银行返回失败) - */ - Map<String, String> data1 = resultUtil.getData(); - String s = data1.get("trade_state"); - String transaction_id = data1.get("transaction_id"); - if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) { - break; - } - if ("SUCCESS".equals(s)) { - for (TGameRecord gameRecord : list) { - gameRecord.setStatus(1); - gameRecord.setOrderNo(transaction_id); - } - gameRecordService.updateBatchById(list); - Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId); - - break; - - } - if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) { - num++; - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - }).start(); + if (store.getOperatorId()==null||store.getOperatorId()==0){ + // 平台 + ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", params, code, config.getCash().toString(), + "/base/game/wechatPaymentGameCallback", "APP", ""); + return weixinpay; + }else{ + String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId()); + if (!StringUtils.hasLength(smidVx)){ + return ResultUtil.error("运营商未配置微信商户号,获取支付失败!"); + } + return payMoneyUtil.weixinpayV3(smidVx,"游戏支付" + ,code,"/base/huimin/callBack/wechatPaymentGameCallback1", + config.getCash().toString(),params); } - return weixinpay; + + + + } else if (type == 2) { tGameRecord.setMoney(config.getCash()); gameRecordService.updateById(tGameRecord); @@ -305,81 +271,81 @@ // 是平台的 smid1 = smid; }else{ - String smidByOperatorId = siteService.getSMIDByOperatorId(operationId); + String smidByOperatorId = siteService.getmerchantNumberAliByOperatorId(operationId); smid1 = smidByOperatorId; } ResultUtil alipay = payMoneyUtil.alipay(smid1,"游戏支付", "游戏支付", params, code, config.getCash().toString(), "/base/game/aliPaymentGameCallback"); - if (alipay.getCode() == 200) { - new Thread(new Runnable() { - @Override - public void run() { - try { - int num = 1; - int wait = 0; - while (num <= 10) { - int min = 5000; - wait += (min * num); - Thread.sleep(wait); - List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 2)); - TGameRecord one = list.get(0); - if (one.getStatus() == 1) { - break; - } - AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code); - if (resultUtil.getCode().equals("10000") && one.getStatus() == 0) { - /** - * WAIT_BUYER_PAY(交易创建,等待买家付款)、 - * TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、 - * TRADE_SUCCESS(交易支付成功)、 - * TRADE_FINISHED(交易结束,不可退款) - */ - 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 gameRecord : list) { - gameRecord.setStatus(1); - gameRecord.setOrderNo(tradeNo); - - CourseCounsum courseCounsum = new CourseCounsum(); - courseCounsum.setChangeType(3); - courseCounsum.setInsertTime(new Date()); - courseCounsum.setReason("智慧球场;" + config.getCash()); - courseCounsum.setAppUserId(uid); - courseRecordClient.save(courseCounsum); - - } - gameRecordService.updateBatchById(list); - Integer integer = startGame(uid, gameType, 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)) { - num++; - } - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - }).start(); - } +// if (alipay.getCode() == 200) { +// new Thread(new Runnable() { +// @Override +// public void run() { +// try { +// int num = 1; +// int wait = 0; +// while (num <= 10) { +// int min = 5000; +// wait += (min * num); +// Thread.sleep(wait); +// List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 2)); +// TGameRecord one = list.get(0); +// if (one.getStatus() == 1) { +// break; +// } +// AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code); +// if (resultUtil.getCode().equals("10000") && one.getStatus() == 0) { +// /** +// * WAIT_BUYER_PAY(交易创建,等待买家付款)、 +// * TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、 +// * TRADE_SUCCESS(交易支付成功)、 +// * TRADE_FINISHED(交易结束,不可退款) +// */ +// 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 gameRecord : list) { +// gameRecord.setStatus(1); +// gameRecord.setOrderNo(tradeNo); +// +// CourseCounsum courseCounsum = new CourseCounsum(); +// courseCounsum.setChangeType(3); +// courseCounsum.setInsertTime(new Date()); +// courseCounsum.setReason("智慧球场;" + config.getCash()); +// courseCounsum.setAppUserId(uid); +// courseRecordClient.save(courseCounsum); +// +// } +// gameRecordService.updateBatchById(list); +// Integer integer = startGame(uid, gameType, 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)) { +// num++; +// } +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// }).start(); +// } return alipay; } else if (type == 3) { tGameRecord.setMoney(config.getPlayCoin()); @@ -515,49 +481,49 @@ Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); TGameRecord one = gameRecordService.getOne(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1)); System.err.println("游戏支付记录"+one); - if (one!=null){ - Integer gameId = one.getGameId(); - Site byId1 = siteService.getById(one.getSiteId()); - Store byId = storeService.getById(byId1.getStoreId()); - if (byId!=null){ - 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, one.getMoney().multiply(bigDecimal1), s2,nonce_str,"玩游戏分账"); - if (!fenzhang.getCode().equals(200)){ - System.err.println("分账失败 原因是:"+fenzhang.getMsg()); - }else{ - one.setFenzhangNo(fenzhang.getData().toString()); - one.setFenzhangOrderNo(nonce_str); - one.setFenzhangAmount(one.getMoney().multiply(bigDecimal1)); - gameRecordService.updateById(one); - } - } - } - } - - } +// if (one!=null){ +// Integer gameId = one.getGameId(); +// Site byId1 = siteService.getById(one.getSiteId()); +// Store byId = storeService.getById(byId1.getStoreId()); +// if (byId!=null){ +// 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, one.getMoney().multiply(bigDecimal1), s2,nonce_str,"玩游戏分账"); +// if (!fenzhang.getCode().equals(200)){ +// System.err.println("分账失败 原因是:"+fenzhang.getMsg()); +// }else{ +// one.setFenzhangNo(fenzhang.getData().toString()); +// one.setFenzhangOrderNo(nonce_str); +// one.setFenzhangAmount(one.getMoney().multiply(bigDecimal1)); +// gameRecordService.updateById(one); +// } +// } +// } +// } +// +// } PrintWriter out = null; try { @@ -570,6 +536,67 @@ out.close(); } } + @ResponseBody + @PostMapping("/base/game/wechatPaymentGameCallback1") + public void wechatPaymentGameCallback1(HttpServletRequest request, HttpServletResponse response) throws Exception { + System.err.println("进入游戏回调"); + try { + System.err.println("微信回调"); + System.err.println("请求" + request); + BufferedReader reader = request.getReader(); + String string1 = reader.toString(); + System.err.println("请求reader" + string1); + StringBuilder requestBody = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + requestBody.append(line); + } + System.err.println("全部请求体" + requestBody); + JSONObject jsonObject = JSONObject.parseObject(requestBody.toString()); + JSONObject resource = jsonObject.getJSONObject("resource"); + + AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8)); + String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8), + resource.getString("ciphertext")); + System.err.println("微信解密的字符串信息" + decryptedData); + JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData); + String out_trade_no = jsonInfo.getString("out_trade_no"); + String transaction_id = jsonInfo.getString("transaction_id"); + String trade_state = jsonInfo.getString("trade_state"); + String attach = jsonInfo.getString("attach"); + if (trade_state.equals("SUCCESS")) { + List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1)); + for (TGameRecord gameRecord : list) { + gameRecord.setStatus(1); + gameRecord.setOrderNo(transaction_id); + CourseCounsum courseCounsum = new CourseCounsum(); + courseCounsum.setChangeType(3); + courseCounsum.setInsertTime(new Date()); + courseCounsum.setReason("智慧球场;" + gameRecord.getMoney()); + courseCounsum.setAppUserId(gameRecord.getUserId()); + courseRecordClient.save(courseCounsum); + + } + gameRecordService.updateBatchById(list); + String[] s = attach.split("_"); + Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); + TGameRecord one = gameRecordService.getOne(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1)); + System.err.println("游戏支付记录" + one); + + PrintWriter out = null; + try { + out = response.getWriter(); + } catch (IOException e) { + e.printStackTrace(); + } + out.print("SUCCESS"); + out.flush(); + out.close(); + } + }catch (Exception e){ + e.printStackTrace(); + } + } @ResponseBody @PostMapping("/base/game/aliPaymentGameCallback") -- Gitblit v1.7.1