赛事模块

liujie

3 天以前 06f076c677332d496c5c95676cbd64e466001648

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java

@@ -311,9 +311,10 @@
            map.put("total", 0);
            return map;
        }
        List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
        List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect).orderByDesc("createTime"));
        List<Map<String, Object>> list2 = new ArrayList<>();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        for (WorldCupPaymentParticipant on : list1) {
            WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
            Map<String, Object> map1 = new HashMap<>();
@@ -337,6 +338,7 @@
                map1.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
                map1.put("idcard", tStudent.getIdCard());
                map1.put("state", worldCupPayment.getPayStatus() - 1);
                map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
            }else{
                Participant participant = participantClient.getParticipant(on.getParticipantId());
                if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
@@ -356,6 +358,7 @@
                map1.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
                map1.put("idcard", participant.getIdcard());
                map1.put("state", worldCupPayment.getPayStatus() - 1);
                map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
            }
            list2.add(map1);
        }
@@ -408,6 +411,9 @@
            userGameRecordList.put("participantType", participantType);
            userGameRecordList.put("participantId", participantId);
            AppUser appUser = appUserClient.getAppUser(appUserId);
            if(appUser==null){
                continue;
            }
            userGameRecordList.put("province", appUser.getProvince() + appUser.getCity());
            if(1 == participantType){
                TStudent tStudent = studentClient.queryById(participantId.intValue());