From b3e0d0ea6c1e311566bab861b79cc9b9c6d25287 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 09:49:03 +0800
Subject: [PATCH] 修改bug
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 20 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 c4d585a..1866b2b 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
@@ -7,11 +7,9 @@
import com.dsh.communityWorldCup.entity.WorldCupCompetitor;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
+import com.dsh.communityWorldCup.feignclient.account.StudentHonorClient;
import com.dsh.communityWorldCup.feignclient.account.UserIntegralChangesClient;
-import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
-import com.dsh.communityWorldCup.feignclient.account.model.AppUserIdsByCityName;
-import com.dsh.communityWorldCup.feignclient.account.model.SaveUserIntegralChangesVo;
-import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
+import com.dsh.communityWorldCup.feignclient.account.model.*;
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
import com.dsh.communityWorldCup.feignclient.other.StoreClient;
@@ -53,6 +51,9 @@
@Resource
private UserIntegralChangesClient userIntegralChangesClient;
+
+ @Resource
+ private StudentHonorClient studentHonorClient;
@@ -145,7 +146,7 @@
matchRecord.setPageNo(pageNo);
MatchRecordVo matchRecordVo = new MatchRecordVo();
int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("participantId", matchRecord.getId())
- .eq("participantType", matchRecord.getIsStudent()));
+ .eq("participantType", matchRecord.getIsStudent()).isNotNull("matchResult"));
matchRecordVo.setTotalSession(count);
List<MatchRecordList> matchRecord1 = this.baseMapper.getMatchRecord(matchRecord);
matchRecordVo.setList(matchRecord1);
@@ -196,9 +197,8 @@
}
//参赛人员
if(participantType == 2){
- AppUser appUser1 = appUserClient.getAppUser(appUserId);
Participant participant = participantClient.getParticipant(participantId);
- worldCupRankVo.setAvatar(appUser1.getHeadImg());
+ worldCupRankVo.setAvatar(participant.getHeadImg());
String name = participant.getName();
if(name.length() > 2){
name = name.charAt(0) + "*" + name.substring(2);
@@ -208,7 +208,7 @@
worldCupRankVo.setName(name);
}
- if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){
+ if(worldCupRank.getIsStudent().compareTo(participantType) == 0 && worldCupRank.getId().compareTo(participantId) == 0){
worldCupRankVo.setOneself(1);
b = true;
}else{
@@ -223,7 +223,7 @@
}
//排名前20的数据添加完成后且包含自己，需要将自己找出来后添加到21位
if(i > 19 && !b){
- if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){
+ if(worldCupRank.getIsStudent().compareTo(participantType) == 0 && worldCupRank.getId().compareTo(participantId) == 0){
WorldCupRankVo worldCupRankVo = new WorldCupRankVo();
worldCupRankVo.setRank(i + 1);
worldCupRankVo.setTotalSession(totalSession);
@@ -242,9 +242,8 @@
}
//参赛人员
if(participantType == 2){
- AppUser appUser1 = appUserClient.getAppUser(appUserId);
Participant participant = participantClient.getParticipant(participantId);
- worldCupRankVo.setAvatar(appUser1.getHeadImg());
+ worldCupRankVo.setAvatar(participant.getHeadImg());
String name = participant.getName();
if(name.length() > 2){
name = name.charAt(0) + "*" + name.substring(2);
@@ -319,6 +318,28 @@
}
this.updateBatchById(worldCupCompetitors);
+
+ //添加勋章
+ for (WorldCupCompetitor worldCupCompetitor : worldCupCompetitors) {
+ Integer appUserId = worldCupCompetitor.getAppUserId();
+ //常胜将军
+ if(1 == worldCupCompetitor.getMatchResult()){
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId).eq("matchResult", 1));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(5);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+ //越战越勇
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(6);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+
}
@@ -349,11 +370,11 @@
if(1 == participantType){
TStudent tStudent = studentClient.queryById(participantId.intValue());
map.put("name", tStudent.getName());
- map.put("phone", tStudent.getPhone());
+ map.put("phone", ToolUtil.isNotEmpty(tStudent.getPhone()) ? tStudent.getPhone() : appUser.getPhone());
}else{
Participant participant = participantClient.getParticipant(participantId);
map.put("name", participant.getName());
- map.put("phone", participant.getPhone());
+ map.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
}
}
Integer offset = worldCupRecords.getOffset();
@@ -398,7 +419,7 @@
if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && tStudent.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcard) && tStudent.getIdCard().indexOf(idcard) == -1){
@@ -407,12 +428,13 @@
map.put("name", tStudent.getName());
map.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
+ map.put("idcard", tStudent.getIdCard());
}else{
Participant participant = participantClient.getParticipant(participantId);
if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
continue;
}
- if(ToolUtil.isNotEmpty(phone) && participant.getPhone().indexOf(phone) == -1){
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone()).indexOf(phone) == -1){
continue;
}
if(ToolUtil.isNotEmpty(idcard) && participant.getIdcard().indexOf(idcard) == -1){
@@ -421,14 +443,15 @@
map.put("name", participant.getName());
map.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
+ map.put("idcard", participant.getIdcard());
}
list.add(map);
}
- map1.put("total", mapList.size());
+ map1.put("total", list.size());
Integer offset = worldCupGameStatisticsInfoList.getOffset();
Integer limit = worldCupGameStatisticsInfoList.getLimit();
limit += offset;
- map1.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size()));
+ map1.put("rows", list.subList(offset, list.size() >= limit ? limit : list.size()));
return map1;
}
@@ -575,6 +598,30 @@
cupCompetitor.setOpponentScore(blue);
}
this.updateBatchById(blueList);
+
+
+ //修改勋章
+ List<WorldCupCompetitor> worldCupCompetitors = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()));
+ for (WorldCupCompetitor wcc : worldCupCompetitors) {
+ Integer appUserId = wcc.getAppUserId();
+ //常胜将军
+ if(1 == wcc.getMatchResult()){
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId).eq("matchResult", 1));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(5);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+ //越战越勇
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(6);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+
}
@@ -607,9 +654,7 @@
}
map.put("userName", participant.getName());
}
- map.put("score", ourScore.compareTo(opponentScore) > 0 ?
- ourScore + ":" + opponentScore :
- opponentScore + ":" + ourScore);
+ map.put("score", ourScore + ":" + opponentScore);
map.put("matchResult", matchResult == 1 ? "胜" : matchResult == 0 ? "平" :"负");
mapList.add(map);
}
@@ -621,4 +666,15 @@
map.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size()));
return map;
}
+
+
+ /**
+ * 获取比赛场次
+ * @param worldCupId
+ * @return
+ */
+ @Override
+ public int getMatchTime(Integer worldCupId) {
+ return this.baseMapper.getMatchTime(worldCupId);
+ }
}
--
Gitblit v1.7.1