From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 04 七月 2025 19:42:49 +0800 Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付 --- cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 82 ++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java index 65f9804..1adf03e 100644 --- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java +++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java @@ -139,47 +139,47 @@ //查出临时表里的数据,也去重 List<Participant> list = this.list(new QueryWrapper<Participant>().eq("appUserId", uid).eq("state", 1)); List<ParticipantVo> listVo = new ArrayList<>(); - for (Participant participant : list) { - ParticipantVo participantVo = new ParticipantVo(); - participantVo.setId(participant.getId()); - participantVo.setName(participant.getName()); - participantVo.setIdcard(participant.getIdcard()); - if (null != participant.getBirthday()){ - Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday())); - participantVo.setAge(age); - }else{ - participantVo.setAge(18); - - } - Student student = null; - if(ToolUtil.isNotEmpty(participant.getPhone())){ - student = studentClient.queryStudentByPhone(participant.getPhone()); - } - //设为不是学员 - participantVo.setIsStudent(0); - - if (null != student) { - Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId()); - participantVo.setResidueClassHour(integer); - } else { - participantVo.setResidueClassHour(0); - } - participantVo.setPhone(participant.getPhone()); - participantVo.setHeight(participant.getHeight()); - participantVo.setWeight(participant.getWeight()); - participantVo.setHeadImg(participant.getHeadImg()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (null != participant.getBirthday()) { - String format = sdf.format(participant.getBirthday()); - participantVo.setBirthday(format); - } - participantVo.setGender(participant.getGender()); - if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) { - listVo1.add(participantVo); - continue; - } - linkedHashMap.put(participant.getIdcard(), participantVo); - } +// for (Participant participant : list) { +// ParticipantVo participantVo = new ParticipantVo(); +// participantVo.setId(participant.getId()); +// participantVo.setName(participant.getName()); +// participantVo.setIdcard(participant.getIdcard()); +// if (null != participant.getBirthday()){ +// Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday())); +// participantVo.setAge(age); +// }else{ +// participantVo.setAge(18); +// +// } +// Student student = null; +// if(ToolUtil.isNotEmpty(participant.getPhone())){ +// student = studentClient.queryStudentByPhone(participant.getPhone()); +// } +// //设为不是学员 +// participantVo.setIsStudent(0); +// +// if (null != student) { +// Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId()); +// participantVo.setResidueClassHour(integer); +// } else { +// participantVo.setResidueClassHour(0); +// } +// participantVo.setPhone(participant.getPhone()); +// participantVo.setHeight(participant.getHeight()); +// participantVo.setWeight(participant.getWeight()); +// participantVo.setHeadImg(participant.getHeadImg()); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// if (null != participant.getBirthday()) { +// String format = sdf.format(participant.getBirthday()); +// participantVo.setBirthday(format); +// } +// participantVo.setGender(participant.getGender()); +// if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) { +// listVo1.add(participantVo); +// continue; +// } +// linkedHashMap.put(participant.getIdcard(), participantVo); +// } for (TStudent tStudent : tStudents) { ParticipantVo participantVo = new ParticipantVo(); -- Gitblit v1.7.1