From b716afd262ff60ff1db0b1e7c95800e7ad2b7202 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 11:07:37 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付

---
 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java |  206 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 121 insertions(+), 85 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..0562ff8 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;
@@ -150,10 +155,11 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
-            //判断当前用户是否是员工
+
             AppUser appUser1 = appUserClient.queryAppUser(uid);
-            User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
-            if (null != one) {
+            //判断当前用户是否是员工
+            List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+            if (!one.isEmpty()) {
                 return ResultUtil.success(1);
             }
             //普通用户校验当前时间是否在预约时间段内
@@ -175,8 +181,10 @@
 
 
 
+    private String smidVx = "2088330203191220";//平台微信商户号
 
-
+    @Autowired
+    private IOperatorUserService operatorUserService;
 
     @ResponseBody
     @PostMapping("/api/game/payGame")
@@ -196,10 +204,12 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
+            Site site = siteService.getById(spaceId);
+            Store store = storeService.getById(site.getStoreId());
             //判断当前用户是否是员工
             AppUser appUser1 = appUserClient.queryAppUser(uid);
-            User one = userService.getOne(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
-            if (null != one) {
+            List<User> one = userService.list(new QueryWrapper<User>().eq("phone", appUser1.getPhone()).eq("status", 1));
+            if (!one.isEmpty()) {
                 Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId);
                 return ResultUtil.success();
             }
@@ -212,83 +222,49 @@
             tGameRecord.setUserId(uid);
             tGameRecord.setNumber(code);
             tGameRecord.setTime(new Date());
+            tGameRecord.setSiteId(spaceId);
             gameRecordService.save(tGameRecord);
 
+            System.err.println("启动游戏支付");
             if (type == 1) {
                 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", "");
+                System.err.println("启动游戏支付");
+                if (store.getOperatorId()==null||store.getOperatorId()==0){
+                    // 平台
+                                    ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", params, code, config.getCash().toString(),
                         "/base/game/wechatPaymentGameCallback", "APP", "");
-                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();
+                                    return weixinpay;
+                }else{
+                    String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
+                    if (!StringUtils.hasLength(smidVx)){
+                        return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
+                    }
+                    return payMoneyUtil.weixinpayV3(smidVx,"游戏支付"
+                            ,code,"/base/game/wechatPaymentGameCallback1",
+                          config.getCash().toString(),params);
                 }
-                return weixinpay;
+
+
+
+
             } else if (type == 2) {
                 tGameRecord.setMoney(config.getCash());
                 gameRecordService.updateById(tGameRecord);
                 String smid1="";
                 String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType;
-                // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+                // 判断属于哪个运营商 根据运营商 id 获取对应的商户号
                 TGame game = gameService.getOne(new QueryWrapper<TGame>().eq("blue", sutuId).or().eq("red", sutuId));
-                Integer operationId = game.getOperationId();
+                Store byId = storeService.getById(game.getStoreId());
+                Integer operationId = byId.getOperatorId();
                 if (operationId==0){
                     // 是平台的
                     smid1 = smid;
                 }else{
-                    String smidByOperatorId = siteService.getSMIDByOperatorId(operationId);
+                    String smidByOperatorId = siteService.getmerchantNumberAliByOperatorId(operationId);
                     smid1 = smidByOperatorId;
                 }
 
@@ -338,18 +314,7 @@
                                             }
                                             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)) {
@@ -414,7 +379,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 +398,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;
             }
         }
@@ -459,16 +427,21 @@
     }
 
 
+    @Resource
+    private StoreService storeService;
 
     @ResponseBody
     @PostMapping("/base/game/wechatPaymentGameCallback")
-    public void wechatPaymentGameCallback(HttpServletRequest request, HttpServletResponse response){
+    public void wechatPaymentGameCallback(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        System.err.println("进入游戏回调");
         Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+        System.err.println("回调参数"+map);
         if(null != map){
             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,8 +460,9 @@
             }
             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]));
+            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();
@@ -500,6 +474,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")
@@ -508,7 +543,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 +563,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