From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java index 660d8eb..3b69d79 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java @@ -2,13 +2,12 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant; -import com.dsh.communityWorldCup.model.MyWorldCupInfo; -import com.dsh.communityWorldCup.model.MyWorldCupList; -import com.dsh.communityWorldCup.model.ParticipantVo; -import com.dsh.communityWorldCup.model.WorldCupListVo; +import com.dsh.communityWorldCup.model.*; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; +import java.util.Map; /** * @author zhibing.pu @@ -24,7 +23,7 @@ * @param participantId * @return */ - WorldCupPaymentParticipant getWorldCupPaymentParticipant(Integer worldCupId, Integer participantType, Integer participantId); + WorldCupPaymentParticipant getWorldCupPaymentParticipant(Integer worldCupId, Integer participantType, Long participantId); /** @@ -40,7 +39,7 @@ * @param id * @return */ - MyWorldCupInfo getMyWorldCupInfo(String id); + MyWorldCupInfo getMyWorldCupInfo(Long id, String lon, String lat); /** @@ -49,4 +48,23 @@ * @return */ List<ParticipantVo> getParticipant(Integer uid); + + + /** + * 获取已报名人员列表 + * @param registeredPersonnel + * @return + */ + Map<String, Object> getRegisteredPersonnel(RegisteredPersonnel registeredPersonnel); + + + int getCount(Integer worldCupId, List<Long> worldCupPaymentId); + + + /** + * 获取用户列表 + * @param worldCupGameStatisticsInfoList + * @return + */ + Map<String, Object> getUserGameRecordList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList); } -- Gitblit v1.7.1