From 3cb61867769d091f7e20ade8701b6593b82141ad Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 九月 2024 14:40:10 +0800
Subject: [PATCH] 玩湃微信商户分账
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 b8b31e8..d56c271 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
@@ -121,22 +121,23 @@
participantVo.setIdcard(participant.getIdcard());
Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
participantVo.setAge(age);
- Student student = studentClient.queryStudentByPhone(participant.getPhone() == null ? "0" : participant.getPhone());
-
+ 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);
- participantVo.setIsStudent(1);
-
} 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());
@@ -148,8 +149,6 @@
continue;
}
linkedHashMap.put(participant.getIdcard(), participantVo);
-// listVo.add(participantVo);
-
}
for (TStudent tStudent : tStudents) {
@@ -164,6 +163,7 @@
participantVo.setPhone(tStudent.getPhone());
participantVo.setHeight(tStudent.getHeight().intValue());
participantVo.setWeight(tStudent.getWeight());
+ participantVo.setHeadImg(tStudent.getHeadImg());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != tStudent.getBirthday()) {
String format = sdf.format(tStudent.getBirthday());
@@ -177,14 +177,7 @@
}
linkedHashMap.put(tStudent.getIdCard(), participantVo);
}
-
-
listVo1.addAll(linkedHashMap.values());
-
-
-// List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());
-
-
return listVo1;
}
@@ -215,6 +208,7 @@
participant.setGender(editParticipant.getGender());
participant.setIdcard(editParticipant.getIdcard());
participant.setName(editParticipant.getName());
+ participant.setHeadImg(editParticipant.getHeadImg());
if (ToolUtil.isNotEmpty(editParticipant.getBirthday())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
participant.setBirthday(sdf.parse(editParticipant.getBirthday()));
@@ -232,10 +226,16 @@
* @throws Exception
*/
@Override
- public ResultUtil delParticipant(Integer id) throws Exception {
- Participant participant = this.getById(id);
- participant.setState(3);
- this.updateById(participant);
+ public ResultUtil delParticipant(Integer id, Integer isStudent) throws Exception {
+ if(isStudent == 1){
+ TStudent tStudent = studentClient.queryById(id);
+ tStudent.setState(3);
+ studentClient.updateAppUser(tStudent);
+ }else{
+ Participant participant = this.getById(id);
+ participant.setState(3);
+ this.updateById(participant);
+ }
return ResultUtil.success();
}
@@ -303,6 +303,7 @@
if(null != paymentCompetition){
competitionUser.setState(paymentCompetition.getPayStatus());
}
+ competitionUser.setInsertTime(userCompetition.getInsertTime());
list.add(competitionUser);
}
Page<CompetitionUser> page = new Page<>();
--
Gitblit v1.7.1