From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 1f11123..601afed 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
@@ -417,7 +417,7 @@
}
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(id);
if(coursePackageStudents.size() > 0){
- return ResultUtil.error("不能取消本次");
+// return ResultUtil.error("不能取消本次");
}
coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setId(id);
@@ -479,7 +479,7 @@
tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
}
- if(coursePackageStudent.getSignInOrNot() == 0){
+ if(coursePackageStudent.getReservationStatus() == 0){
tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
}
System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
--
Gitblit v1.7.1