From 1eb07ec3e65ae47267becdbe7e7bc95ce40fec52 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 31 十月 2023 20:25:26 +0800
Subject: [PATCH] 10.31.1

---
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index d310d4a..d8fa0ea 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -239,15 +239,15 @@
         if(paymentCompetitionVo.getPayType() == 4){//课程
             money = new BigDecimal(competition.getClassPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
             for (String s : split) {
-                Participant participant = participantService.getById(s);
-                Student student = studentClient.queryStudentByPhone(participant.getPhone());
-                if(null == student){
-                    return ResultUtil.error(participant.getName() + "不是学员,无法使用课时支付。");
-                }
+//                Participant participant = participantService.getById(s);
+//                Student student = studentClient.queryStudentByPhone(participant.getPhone());
+//                if(null == student){
+//                    return ResultUtil.error(participant.getName() + "不是学员,无法使用课时支付。");
+//                }
                 // 2.0
                 Integer integer = coursePackagePaymentClient.queryResidueClassHourById(paymentCompetitionVo.getCoursePaymentId());
                 if(new BigDecimal(integer).compareTo(new BigDecimal(competition.getClassPrice())) < 0){
-                    return ResultUtil.error(participant.getName() + "剩余课时不足,无法完成支付。");
+                    return ResultUtil.error( "剩余课时不足,无法完成支付。");
                 }
             }
         }
@@ -297,10 +297,10 @@
         }
         if(paymentCompetitionVo.getPayType() == 4){//课程
             for (String s : split) {
-                Participant participant = participantService.getById(s);
-                Student student = studentClient.queryStudentByPhone(participant.getPhone());
+//                Participant participant = participantService.getById(s);
+//                Student student = studentClient.queryStudentByPhone(participant.getPhone());
                 PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
-                paymentDeductionClassHour.setId(student.getId());
+                paymentDeductionClassHour.setId(Integer.valueOf(s));
                 paymentDeductionClassHour.setClassHour(competition.getClassPrice());
                 paymentDeductionClassHour.setCode(code);
                 paymentDeductionClassHour.setCourseId(paymentCompetitionVo.getCoursePaymentId());

--
Gitblit v1.7.1