From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 1268a81..befcf1d 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
@@ -551,6 +551,12 @@
// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
+ CoursePackageScheduling coursePackageScheduling1 = coursePackageSchedulings.get(0);
+ Date classDate = coursePackageScheduling1.getEndDate();
+
+ if (new Date().before(classDate)){
+ return ResultUtil.error("课程未结束，无法消课");
+ }
List<Long> integers = new ArrayList<>();
for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
integers.add(coursePackageScheduling.getId());
@@ -714,17 +720,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