From 50430e0e13de4e3d0c73fcf9e099a2327706fc4f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 八月 2025 10:47:41 +0800
Subject: [PATCH] 赛事模块

---
 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 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 b22c1d7..1dd31e0 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
@@ -30,6 +30,7 @@
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1049,14 +1050,56 @@
 
         // worldCupCompetitors 通过code分组
         Map<String, List<WorldCupCompetitor>> map = worldCupCompetitors.stream().collect(Collectors.groupingBy(WorldCupCompetitor::getCode));
-
+        LocalDate now = LocalDate.now();
         for (Map.Entry<String, List<WorldCupCompetitor>> entry : map.entrySet()) {
             WorldCupCodeListVo worldCupCodeListVo = new WorldCupCodeListVo();
             String code = entry.getKey();
             List<WorldCupCompetitor> value = entry.getValue();
+            // 蓝队
+            List<WorldCupCompetitor> collect1 = value.stream().filter(item -> item.getParticipant() == 1).collect(Collectors.toList());
+            ArrayList<UserVo> objects = new ArrayList<>();
+            for (WorldCupCompetitor competitor : collect1) {
+                UserVo userVo = new UserVo();
+                AppUser appUser = appUserClient.getAppUser(competitor.getAppUserId());
+                userVo.setUserName(appUser.getName());
+                userVo.setAvatar(appUser.getHeadImg());
+                    // 当前日期和生日计算年龄
+                Date birthday = appUser.getBirthday();
+
+                if(birthday!=null){
+                    int age = now.getYear() - birthday.getYear();
+                    userVo.setAge(age);
+                }
+                objects.add(userVo);
+            }
+            worldCupCodeListVo.setBlue(objects);
+            // 红队
+            List<WorldCupCompetitor> collect2 = value.stream().filter(item -> item.getParticipant() == 2).collect(Collectors.toList());
+            ArrayList<UserVo> objects1 = new ArrayList<>();
+            for (WorldCupCompetitor competitor : collect2) {
+                UserVo userVo = new UserVo();
+                AppUser appUser = appUserClient.getAppUser(competitor.getAppUserId());
+                userVo.setUserName(appUser.getName());
+                userVo.setAvatar(appUser.getHeadImg());
+                    // 当前日期和生日计算年龄
+                Date birthday = appUser.getBirthday();
+
+                if(birthday!=null){
+                    int age = now.getYear() - birthday.getYear();
+                    userVo.setAge(age);
+                }
+                objects1.add(userVo);
+            }
+            worldCupCodeListVo.setRed(objects1);
+
             worldCupCodeListVo.setCode(code);
             worldCupCodeListVo.setStartTime(value.get(0).getStartTime());
-            worldCupCodeListVo.setWorldCupId(value.get(0).getWorldCupId());
+            Integer worldCupId1 = value.get(0).getWorldCupId();
+            WorldCup byId = worldCupService.getById(worldCupId1);
+            worldCupCodeListVo.setWorldCupId(worldCupId1);
+            if(byId!=null){
+                worldCupCodeListVo.setName(byId.getName());
+            }
             List<Long> collect = value.stream().map(WorldCupCompetitor::getId).collect(Collectors.toList());
             worldCupCodeListVo.setCustoms(collect);
             worldCupCodeListVos.add(worldCupCodeListVo);

--
Gitblit v1.7.1