From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index 81bf5a8..27ee251 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/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())
- .le(WorldCupCompetitor::getStartTime, new Date()).ge(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("无效的游戏二维码");
}
--
Gitblit v1.7.1