10.31.8

nickchange

2023-11-02 6af0c7434178ca41e727c700af8174201a865de9

 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;
@@ -27,6 +28,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/api/game")
@@ -81,14 +83,17 @@
        try {
            List<TGameConfig> tGameConfigs = new ArrayList<>();

            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId));
            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState,0));
            if(list.size()>0){
                Integer id = list.get(0).getId();
//                tGameConfigs = gameConfigService.list(new LambdaQueryWrapper<TGameConfig>().eq(TGameConfig::getOtherId, id));
                tGameConfigs = gameConfigService.listJs(id);

            }
            return ResultUtil.success(tGameConfigs);
            List<TGameConfig> filteredList = tGameConfigs.stream()
                    .filter(gameConfig -> !gameConfig.getImg().isEmpty())
                    .collect(Collectors.toList());
            return ResultUtil.success(filteredList);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -199,17 +204,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;
                                        }