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 | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 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 10dfd09..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
@@ -189,11 +189,10 @@
coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin);
coursePackagePaymentConfig1.setCouponIds(couponIds);
int i1 = coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
-
- for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
- tCoursePackageDiscount.setCoursePackagePaymentConfigId(i1);
- coursePackageDiscountClient.update(tCoursePackageDiscount);
- }
+// for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+// tCoursePackageDiscount.setCoursePackagePaymentConfigId(coursePackagePaymentConfig1.getId());
+// coursePackageDiscountClient.update(tCoursePackageDiscount);
+// }
}
}
@@ -409,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);
@@ -419,8 +418,8 @@
coursePackageStudent = new CoursePackageStudent();
coursePackageStudent.setId(id);
- coursePackageStudent.setReservationStatus(0);
-
+// coursePackageStudent.setReservationStatus(0);
+ coursePackageStudent.setSignInOrNot(2);
coursePackageStudent.getCoursePackagePaymentId();
@@ -708,18 +707,18 @@
* @return
*/
@Override
- public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId) {
- TCoursePackagePayment coursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackagePaymentId);
- System.out.println("=========coursePackagePayment=====>"+coursePackagePayment);
- if(coursePackagePayment.getStatus() == 2){
- return ResultUtil.error("该学员已退课");
- }
- if(coursePackagePayment.getAbsencesNumber() == 0){
- return ResultUtil.error("当前不需要补课");
- }
- coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1);
- coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment);
- return ResultUtil.success();
+ public ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId){
+ ResultUtil resultUtil = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId);
+// System.out.println("=========coursePackagePayment=====>"+coursePackagePayment);
+// if(coursePackagePayment.getStatus() == 2){
+// return ResultUtil.error("该学员已退课");
+// }
+// if(coursePackagePayment.getAbsencesNumber() == 0){
+// return ResultUtil.error("当前不需要补课");
+// }
+// coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1);
+// coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment);
+ return resultUtil;
}
--
Gitblit v1.7.1