From 4a055748da8c4e8baf002dff7b74e12ec150610a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 20:24:59 +0800
Subject: [PATCH] 11.10
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index d060cd8..796705b 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -10,11 +10,13 @@
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
import com.dsh.competition.feignclient.model.BillingRequest;
import com.dsh.competition.feignclient.other.StoreClient;
import com.dsh.competition.feignclient.other.model.Store;
+import com.dsh.competition.mapper.CompetitionMapper;
import com.dsh.competition.mapper.PaymentCompetitionMapper;
import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
@@ -68,6 +70,8 @@
+ @Resource
+ private CompetitionMapper competitionMapper;
/**
* 获取我的报名赛事记录
@@ -84,7 +88,12 @@
if(0 == type){
type = null;
}
- return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+ List<CompetitionListVo> competitionListVos = this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+ for (CompetitionListVo competitionListVo : competitionListVos) {
+ Integer counts = competitionMapper.counts(competitionListVo.getPId());
+ competitionListVo.setHeat(competitionListVo.getHeat()+counts);
+ }
+ return competitionListVos;
}
@@ -188,6 +197,21 @@
participantVo.setPhone(participant1.getPhone());
participant.add(participantVo);
}
+
+ for (Integer i : collect) {
+ TStudent tStudent = studentClient.queryById(i);
+ ParticipantVo participantVo = new ParticipantVo();
+ participantVo.setId(tStudent.getId());
+ participantVo.setName(tStudent.getName());
+ participantVo.setIdcard(tStudent.getIdCard());
+ Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
+ participantVo.setAge(age);
+ participantVo.setPhone(tStudent.getPhone());
+ participant.add(participantVo);
+
+
+ }
+
competitionInfo.setParticipant(participant);
competitionInfo.setStatus(competition.getStatus());
if(paymentCompetition.getPayStatus() == 3){
@@ -266,10 +290,10 @@
if(paymentCompetition.getPayType() == 4){//课程支付
List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
for (UserCompetition userCompetition : list) {
- Participant participant = participantService.getById(userCompetition.getId());
- Student student = studentClient.queryStudentByPhone(participant.getPhone());
+// Participant participant = participantService.getById(userCompetition.getId());
+// Student student = studentClient.queryStudentByPhone(participant.getPhone());
PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
- paymentDeductionClassHour.setId(student.getId());
+ paymentDeductionClassHour.setId(userCompetition.getParticipantId());
paymentDeductionClassHour.setClassHour(competition.getClassPrice());
paymentDeductionClassHour.setCode(code);
coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);
--
Gitblit v1.7.1