Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-01 8e524f6e570fca66f670a8072edefc6ca2d4e2f9

 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java

@@ -2,6 +2,7 @@

import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.TGame;
@@ -199,17 +200,19 @@
                                    if(one.getStatus() == 1){
                                        break;
                                    }
                                    ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
                                    if(resultUtil.getCode() == 200 && one.getStatus() == 0){
                                    AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
                                    if(resultUtil.getCode().equals("10000") && one.getStatus() == 0){
                                        /**
                                         * WAIT_BUYER_PAY（交易创建，等待买家付款）、
                                         * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
                                         * TRADE_SUCCESS（交易支付成功）、
                                         * TRADE_FINISHED（交易结束，不可退款）
                                         */
                                        Map<String, String> data1 = resultUtil.getData();
                                        String s = data1.get("tradeStatus");
                                        String tradeNo = data1.get("tradeNo");
//                                        Map<String, String> data1 = resultUtil.getData();
//                                        String s = data1.get("tradeStatus");
//                                        String tradeNo = data1.get("tradeNo");
                                        String tradeNo = resultUtil.getTradeNo();
                                        String s = resultUtil.getTradeStatus();
                                        if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
                                            break;
                                        }