puzhibing
2024-03-08 7501140cf637fef9629a80202907ed067c8a5a06
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -6,7 +6,9 @@
import com.dsh.communityWorldCup.entity.WorldCupPayment;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
import com.dsh.communityWorldCup.entity.WorldCupStore;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
@@ -62,6 +64,9 @@
    @Resource
    private StoreClient storeClient;
    @Resource
    private AppUserClient appUserClient;
@@ -73,7 +78,7 @@
     * @return
     */
    @Override
    public WorldCupPaymentParticipant getWorldCupPaymentParticipant(Integer worldCupId, Integer participantType, Integer participantId) {
    public WorldCupPaymentParticipant getWorldCupPaymentParticipant(Integer worldCupId, Integer participantType, Long participantId) {
        return this.baseMapper.getWorldCupPaymentParticipant(worldCupId, participantType, participantId);
    }
@@ -134,11 +139,11 @@
        List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupPaymentId", worldCupPaymentParticipant.getWorldCupPaymentId()));
        for (WorldCupPaymentParticipant wcpp : list1) {
            Integer participantType = wcpp.getParticipantType();
            Integer participantId = wcpp.getParticipantId();
            Long participantId = wcpp.getParticipantId();
            ParticipantVo participantVo = new ParticipantVo();
            //学员
            if(1 == participantType){
                TStudent tStudent = studentClient.queryById(participantId);
                TStudent tStudent = studentClient.queryById(participantId.intValue());
                participantVo.setId(tStudent.getId());
                participantVo.setName(tStudent.getName());
                int age = Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday()));
@@ -214,13 +219,15 @@
            List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
            for (WorldCupPaymentParticipant worldCupPaymentParticipant : list1) {
                Integer participantType = worldCupPaymentParticipant.getParticipantType();
                Integer participantId = worldCupPaymentParticipant.getParticipantId();
                Long participantId = worldCupPaymentParticipant.getParticipantId();
                ParticipantVo participantVo = new ParticipantVo();
                AppUser appUser = appUserClient.getAppUser(worldCupPaymentParticipant.getAppUserId());
                //学员
                if(1 == participantType && !xy.contains(participantId)){
                    TStudent tStudent = studentClient.queryById(participantId);
                    TStudent tStudent = studentClient.queryById(participantId.intValue());
                    participantVo.setId(tStudent.getId());
                    participantVo.setName(tStudent.getName());
                    participantVo.setAvatar(tStudent.getHeadImg());
                    int age = Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday()));
                    participantVo.setAge(age);
                    participantVo.setIdcard(tStudent.getIdCard());
@@ -233,6 +240,7 @@
                    Participant participant = participantClient.getParticipant(participantId);
                    participantVo.setId(participant.getId());
                    participantVo.setName(participant.getName());
                    participantVo.setAvatar(appUser.getHeadImg());
                    int age = Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday()));
                    participantVo.setAge(age);
                    participantVo.setIdcard(participant.getIdcard());
@@ -284,7 +292,7 @@
            WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
            Map<String, Object> map1 = new HashMap<>();
            if(on.getParticipantType() == 1){
                TStudent tStudent = studentClient.queryById(on.getParticipantId());
                TStudent tStudent = studentClient.queryById(on.getParticipantId().intValue());
                if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
                    continue;
                }