bug修改

liujie

昨天 ea1868377e45a89c552021944fd42ed24ad45ae1

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java

@@ -110,7 +110,7 @@
                // 获取正在进行的赛事

                int size = worldCupCompetitorService.list(new LambdaQueryWrapper<WorldCupCompetitor>().eq(WorldCupCompetitor::getWorldCupId, worldCupListCoachVo.getId())
                        .ge(WorldCupCompetitor::getStartTime, new Date()).lt(WorldCupCompetitor::getEndTime, new Date()).groupBy(WorldCupCompetitor::getCode)).size();
                        .and(w->w.isNull(WorldCupCompetitor::getEndTime).or(s->s.le(WorldCupCompetitor::getStartTime, new Date()).ge(WorldCupCompetitor::getEndTime, new Date()))).groupBy(WorldCupCompetitor::getCode)).size();
                worldCupListCoachVo.setNowNum(size);
            }

@@ -148,12 +148,12 @@
        }
        //1、通过扫码获取的sutuid查询t_game表中的红蓝方sutuid
        // 智慧需要判断code

        String code = startWorldCup.getCode();
        JSONObject object = JSON.parseObject(code);
        String sutu_id = object.getString("sutu_id");
        TGame tGame = gameClient.getTGameBySutuId(sutu_id);
        TGame tGame =new TGame();
        if (worldCup.getType() == null || worldCup.getType() == 1) {
            String code = startWorldCup.getCode();
            JSONObject object = JSON.parseObject(code);
            String sutu_id = object.getString("sutu_id");
            tGame = gameClient.getTGameBySutuId(sutu_id);
            if (null == tGame) {
                return ResultUtil.error("无效的游戏二维码");
            }
@@ -236,7 +236,9 @@
            map.put("space_id", tGame.getSiteId() + "");
            map.put("red_sutu_id", tGame.getRed());
            map.put("blue_sutu_id", tGame.getBlue());
            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
//            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
            map.put("api_url", "http://221.182.45.100:1234/communityWorldCup/base/worldCup/endWorldCupCallback");

            map.put("custom", jsonObject.toJSONString());

            String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
@@ -1084,7 +1086,7 @@
                        vo.setType(9);
                        userIntegralChangesClient.saveUserIntegralChanges(vo);
                    }else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){
                        worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral());
                        worldCupCompetitor.setLoseIntegral(worldCup.getLoseIntegral());
                        //增加积分明细
                        SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
                        vo.setAppUserId(worldCupCompetitor.getAppUserId());