From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期三, 29 十一月 2023 18:19:43 +0800 Subject: [PATCH] 11.29 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java index 05b26cf..bd6496a 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java @@ -556,6 +556,7 @@ integers.add(coursePackageScheduling.getId()); coursePackageScheduling.setCancelClasses(cancelClasses); coursePackageScheduling.setDeductClassHour(deductClassHour); + coursePackageScheduling.setStatus(3); } @@ -570,7 +571,7 @@ List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(integers); for (CoursePackageStudent coursePackageStudent : coursePackageStudents) { - if(coursePackageStudent.getReservationStatus() == 0){ + if(coursePackageStudent.getSignInOrNot() == 2){ continue; } // TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId()); @@ -713,17 +714,21 @@ */ @Override public ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId){ - ResultUtil resultUtil = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId); -// System.out.println("=========coursePackagePayment=====>"+coursePackagePayment); -// if(coursePackagePayment.getStatus() == 2){ -// return ResultUtil.error("该学员已退课"); +// try { + Integer is = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId); + if (is==1){ + return ResultUtil.error("课时数不足"); + }else { + return ResultUtil.success("补课成功"); + } +// return resultUtil; +// return ResultUtil.success("补课成功"); +// }catch (Exception e){ +// return ResultUtil.success("课时数不足"); +// // } -// if(coursePackagePayment.getAbsencesNumber() == 0){ -// return ResultUtil.error("当前不需要补课"); -// } -// coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1); -// coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment); - return resultUtil; + +// return resultUtil; } -- Gitblit v1.7.1