玩湃本次新增迭代所有代码

无关风月

2025-11-11 aba8d209561a130b6d849d96ff202fe172b1ad92

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java

@@ -6,7 +6,9 @@
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.PaymentCompetition;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.account.model.Student;
import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
@@ -45,6 +47,8 @@

    @Resource
    private StudentClient studentClient;
    @Resource
    private AppUserClient appUserClient;

    @Autowired
    private UserCompetitionService userCompetitionService;
@@ -314,6 +318,7 @@
    public  Page<CompetitionUser> getPeopleFromId1(long offset, long limit, Integer id, Integer state) {
        List<UserCompetition> peopleFromId1 = this.baseMapper.getPeopleFromId1(id, state, offset, limit);
        int count = this.baseMapper.getPeopleFromIdCount(id, state);
        Map<Integer, AppUser> userMap = appUserClient.getAllUser().stream().collect(Collectors.toMap(AppUser::getId, e -> e));
        List<CompetitionUser> list = new ArrayList<>();
        for (UserCompetition userCompetition : peopleFromId1) {
            Long paymentCompetitionId = userCompetition.getPaymentCompetitionId();
@@ -321,12 +326,22 @@
            Participant participant = this.getById(userCompetition.getParticipantId());
            CompetitionUser competitionUser = new CompetitionUser();
            if(null != participant){
                AppUser appUser = userMap.get(participant.getAppUserId());
                if (appUser!=null){
                    competitionUser.setAppUserId(appUser.getId());
                    competitionUser.setRegisterPhone(appUser.getPhone());
                }
                competitionUser.setName(participant.getName());
                competitionUser.setSex(participant.getGender());
                competitionUser.setPhone(participant.getPhone());
                competitionUser.setIdCard(participant.getIdcard());
            }else{
                TStudent tStudent = studentClient.queryById(userCompetition.getParticipantId());
                AppUser appUser = userMap.get(tStudent.getAppUserId());
                if (appUser!=null){
                    competitionUser.setAppUserId(appUser.getId());
                    competitionUser.setRegisterPhone(appUser.getPhone());
                }
                competitionUser.setName(tStudent.getName());
                competitionUser.setSex(tStudent.getSex());
                competitionUser.setPhone(tStudent.getPhone());