玩湃微信商户分账

无关风月

2024-09-24 61bbd595ee2bc3c67b40878894dcc07174c6eea6

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

@@ -144,11 +144,11 @@
                participantVo.setBirthday(format);
            }
            participantVo.setGender(participant.getGender());
//            if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
//                listVo1.add(participantVo);
//                continue;
//            }
            linkedHashMap.put(participant.getName(), participantVo);
            if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(participant.getIdcard(), participantVo);
        }

        for (TStudent tStudent : tStudents) {
@@ -171,11 +171,11 @@
            }
            participantVo.setGender(tStudent.getSex());
            participantVo.setIsStudent(1);
//            if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
//                listVo1.add(participantVo);
//                continue;
//            }
            linkedHashMap.put(tStudent.getName(), participantVo);
            if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(tStudent.getIdCard(), participantVo);
        }
        listVo1.addAll(linkedHashMap.values());
        return listVo1;
@@ -303,6 +303,7 @@
            if(null != paymentCompetition){
                competitionUser.setState(paymentCompetition.getPayStatus());
            }
            competitionUser.setInsertTime(userCompetition.getInsertTime());
            list.add(competitionUser);
        }
        Page<CompetitionUser> page = new Page<>();