From 06f076c677332d496c5c95676cbd64e466001648 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 八月 2025 20:07:46 +0800
Subject: [PATCH] 赛事模块

---
 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
index 1dd31e0..b2c677a 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -797,7 +797,7 @@
                 cupCompetitor.setLoseIntegral(worldCup.getLoseIntegral());
             }
             //如果之前平了,现在赢了,需要扣减积分
-            if(cupCompetitor.getMatchResult() == 0 && blue.compareTo(red) >0){
+            if(cupCompetitor.getMatchResult() == 0 && blue>red){
                 //先扣除
                 SaveUserIntegralChangesVo vo1 = new SaveUserIntegralChangesVo();
                 vo1.setAppUserId(cupCompetitor.getAppUserId());
@@ -1045,7 +1045,8 @@
     @Override
     public List<WorldCupCodeListVo> getWorldCupCodeListId(Integer worldCupId) {
         List<WorldCupCompetitor> worldCupCompetitors = this.baseMapper.selectList(new LambdaQueryWrapper<WorldCupCompetitor>().eq(WorldCupCompetitor::getWorldCupId, worldCupId)
-                .le(WorldCupCompetitor::getStartTime, new Date()).ge(WorldCupCompetitor::getEndTime, new Date()));
+                        .and(w->w.isNull(WorldCupCompetitor::getEndTime).or(s->s.le(WorldCupCompetitor::getStartTime, new Date()).ge(WorldCupCompetitor::getEndTime, new Date()))))
+             ;
         List<WorldCupCodeListVo> worldCupCodeListVos = new ArrayList<>();
 
         // worldCupCompetitors 通过code分组

--
Gitblit v1.7.1