From e9085eb620dcae1ceae24bc8b70e1a6bca228b15 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 19:58:38 +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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 bcd5212..5d58749 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
@@ -408,9 +408,9 @@
@Override
public ResultUtil cancelReservation(Long id) {
CoursePackageStudent coursePackageStudent = coursePackageStudentClient.queryCoursePackageStudentById(id);
- if(coursePackageStudent.getSignInOrNot() == 1){
- return ResultUtil.error("当前学员已到课不能请假");
- }
+// if(coursePackageStudent.getSignInOrNot() == 1){
+// return ResultUtil.error("当前学员已到课不能请假");
+// }
// TCoursePackagePayment payment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
// payment.setAbsencesNumber(payment.getAbsencesNumber()+1);
// coursePackagePaymentClient.editCoursePackagePayment(payment);
@@ -418,8 +418,8 @@
coursePackageStudent = new CoursePackageStudent();
coursePackageStudent.setId(id);
- coursePackageStudent.setReservationStatus(0);
-
+// coursePackageStudent.setReservationStatus(0);
+ coursePackageStudent.setSignInOrNot(2);
coursePackageStudent.getCoursePackagePaymentId();
--
Gitblit v1.7.1