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/WorldCupServiceImpl.java | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MatchRecordList.java | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java | 5 +++--
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 3 +++
cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MatchRecordList.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MatchRecordList.java
index b1e5e6c..b4540ac 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MatchRecordList.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MatchRecordList.java
@@ -19,7 +19,7 @@
private Integer opponentScore;
@ApiModelProperty("比赛时间")
private String startTime;
- @ApiModelProperty("比赛结果（1=胜，-1=负）")
+ @ApiModelProperty("比赛结果（1=胜，0平 -1=负）")
private Integer matchResult;
@ApiModelProperty("获得积分")
private Integer award;
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分组
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index ad368b2..9b3b0a8 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -411,6 +411,9 @@
userGameRecordList.put("participantType", participantType);
userGameRecordList.put("participantId", participantId);
AppUser appUser = appUserClient.getAppUser(appUserId);
+ if(appUser==null){
+ continue;
+ }
userGameRecordList.put("province", appUser.getProvince() + appUser.getCity());
if(1 == participantType){
TStudent tStudent = studentClient.queryById(participantId.intValue());
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 114d57e..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);
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
index 746f3c4..33f2634 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/config/RedisConfig.java
@@ -10,7 +10,7 @@
@Configuration
@PropertySource("classpath:redis.properties")
public class RedisConfig {
- @Value("${spring.redis.host}")
+ @Value("192.168.110.106")
private String host;
@Value("${spring.redis.port}")
--
Gitblit v1.7.1