From 4d17e9219dfeb41db32e82340ec9af9faedb4ca5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 27 十一月 2023 16:06:34 +0800
Subject: [PATCH] 11.27.3
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 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 65c5561..bcd5212 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
@@ -172,6 +172,9 @@
}
coursePackageClient.updateCoursePackage(coursePackage);
coursePackagePaymentConfigClient.delCoursePackagePaymentConfig(coursePackage.getId());
+ List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient
+ .queryByCoursePackageId(coursePackage.getId());
+
JSONArray jsonArray = JSON.parseArray(coursePackagePaymentConfig);
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
@@ -185,7 +188,11 @@
coursePackagePaymentConfig1.setCashPayment(cashPayment);
coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin);
coursePackagePaymentConfig1.setCouponIds(couponIds);
- coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
+ int i1 = coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
+// for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+// tCoursePackageDiscount.setCoursePackagePaymentConfigId(coursePackagePaymentConfig1.getId());
+// coursePackageDiscountClient.update(tCoursePackageDiscount);
+// }
}
}
@@ -402,7 +409,7 @@
public ResultUtil cancelReservation(Long id) {
CoursePackageStudent coursePackageStudent = coursePackageStudentClient.queryCoursePackageStudentById(id);
if(coursePackageStudent.getSignInOrNot() == 1){
- return ResultUtil.error("无法取消预约");
+ return ResultUtil.error("当前学员已到课不能请假");
}
// TCoursePackagePayment payment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
// payment.setAbsencesNumber(payment.getAbsencesNumber()+1);
@@ -505,6 +512,7 @@
for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
integers.add(coursePackageScheduling.getId());
coursePackageScheduling.setCourseId(courseId);
+ coursePackageScheduling.setIntegral(integral);
}
coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
@@ -540,27 +548,25 @@
@Override
public ResultUtil cancellationRecord(Long id, String cancelClasses, Integer deductClassHour) {
// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
-
- List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
List<Long> integers = new ArrayList<>();
- for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
- integers.add(coursePackageScheduling.getId());
- coursePackageScheduling.setCancelClasses(cancelClasses);
- coursePackageScheduling.setDeductClassHour(deductClassHour);
- }
-
-
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
// for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
-
// if(coursePackageScheduling.getStatus() == 1 || coursePackageScheduling.getStatus() == 4){
// return ResultUtil.error("不能添加消课凭证");
// }
// coursePackageScheduling.setCancelClasses(cancelClasses);
// coursePackageScheduling.setDeductClassHour(deductClassHour);
- coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
-
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(integers);
for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
+ for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+ if (coursePackageStudent.getSignInOrNot()==2){
+ break;
+ }
+ integers.add(coursePackageScheduling.getId());
+ coursePackageScheduling.setCancelClasses(cancelClasses);
+ coursePackageScheduling.setDeductClassHour(deductClassHour);
+ }
+
if(coursePackageStudent.getReservationStatus() == 0){
continue;
}
@@ -597,6 +603,7 @@
}
+ coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
// }
return ResultUtil.success();
@@ -700,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