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/controller/WorldCupController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 44e8560..1cdca40 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -1243,17 +1243,17 @@
.eq(WorldCupPaymentParticipant::getAlreadyEntered, 0));
ArrayList<WorldCupUserListVo> worldCupUserListVos = new ArrayList<>();
if(list.size()>0){
- List<Integer> collect = list.stream().map(WorldCupPaymentParticipant::getAppUserId).collect(Collectors.toList());
+ List<Long> collect = list.stream().map(WorldCupPaymentParticipant::getParticipantId).collect(Collectors.toList());
search.setUseIds(collect);
- List<AppUser> appUsers = appUserClient.queryAppUserByIds(search);
+ List<TStudent> appUsers = appUserClient.queryAppUserByIds(search);
- for (AppUser appUser : appUsers) {
+ for (TStudent appUser : appUsers) {
WorldCupUserListVo worldCupUserListVo = new WorldCupUserListVo();
- WorldCupPaymentParticipant worldCupPaymentParticipant = list.stream().filter(e -> e.getAppUserId().equals(appUser.getId())).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list.stream().filter(e -> e.getParticipantId().toString().equals(appUser.getId().toString())).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
- worldCupUserListVo.setId(worldCupPaymentParticipant.getId());
+ worldCupUserListVo.setId(worldCupPaymentParticipant.getId().toString());
worldCupUserListVo.setName(appUser.getName());
- worldCupUserListVo.setSex(appUser.getGender() !=null && appUser.getGender()==2?"女":"男");
+ worldCupUserListVo.setSex(appUser.getSex() !=null && appUser.getSex()==2?"女":"男");
worldCupUserListVo.setPhone(appUser.getPhone());
worldCupUserListVo.setIdCard(appUser.getIdCard());
// 当前日期和生日计算年龄
@@ -1297,7 +1297,7 @@
String code = UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3);
ArrayList<WorldCupCompetitor> worldCupCompetitors = new ArrayList<>(red.length + blue.length);
for (String s : blue) {
- WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().equals(s)).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().toString().equals(s)).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
WorldCupCompetitor worldCupCompetitor =new WorldCupCompetitor();
worldCupCompetitor.setCode(code);
@@ -1308,6 +1308,7 @@
worldCupCompetitor.setParticipant(1);
worldCupCompetitor.setStartTime(startTime);
worldCupCompetitor.setEndTime(endTime);
+ worldCupCompetitor.setOurScore(blueScore);
if(blueScore>redScore){
worldCupCompetitor.setMatchResult(1);
worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
@@ -1353,7 +1354,7 @@
}
for (String s : red) {
- WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().equals(s)).findFirst().orElse(null);
+ WorldCupPaymentParticipant worldCupPaymentParticipant = list1.stream().filter(e -> e.getId().toString().equals(s)).findFirst().orElse(null);
if(worldCupPaymentParticipant!=null){
WorldCupCompetitor worldCupCompetitor =new WorldCupCompetitor();
worldCupCompetitor.setCode(code);
@@ -1361,9 +1362,10 @@
worldCupCompetitor.setParticipantType(worldCupPaymentParticipant.getParticipantType());
worldCupCompetitor.setAppUserId(worldCupPaymentParticipant.getAppUserId());
worldCupCompetitor.setParticipantId(worldCupPaymentParticipant.getParticipantId());
- worldCupCompetitor.setParticipant(1);
+ worldCupCompetitor.setParticipant(2);
worldCupCompetitor.setStartTime(startTime);
worldCupCompetitor.setEndTime(endTime);
+ worldCupCompetitor.setOurScore(redScore);
if(redScore>blueScore){
worldCupCompetitor.setMatchResult(1);
worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
--
Gitblit v1.7.1