From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 三月 2024 17:42:58 +0800 Subject: [PATCH] 合并代码 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 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..1667380 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 @@ -40,7 +39,7 @@ * @param id * @return */ - MyWorldCupInfo getMyWorldCupInfo(String id); + MyWorldCupInfo getMyWorldCupInfo(String id, String lon, String lat); /** @@ -49,4 +48,15 @@ * @return */ List<ParticipantVo> getParticipant(Integer uid); + + + /** + * 获取已报名人员列表 + * @param registeredPersonnel + * @return + */ + Map<String, Object> getRegisteredPersonnel(RegisteredPersonnel registeredPersonnel); + + + int getCount(Integer worldCupId, List<Long> worldCupPaymentId); } -- Gitblit v1.7.1