From 794a2ec5fa219a0a87be0c72bd59602cb9f6c6dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:19:08 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
index 00bc62d..4c17f15 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
@@ -216,7 +216,7 @@
* @return
*/
@Override
- public boolean deductionClassHour(DeductionClassHourList deductionClassHourList) {
+ public DeductionClassHourList deductionClassHour(DeductionClassHourList deductionClassHourList) {
try {
List<DeductionClassHour> list = deductionClassHourList.getDeductionClassHourList();
for (DeductionClassHour deductionClassHour : list) {
@@ -251,6 +251,8 @@
List<CoursePackageScheduling> coursePackageSchedulings = packageSchedulings.subList(0, n);
List<Long> collect = coursePackageSchedulings.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
coursePackageSchedulingService.removeByIds(collect);
+
+ deductionClassHour.setScheduledCourses(n);
}
this.updateById(coursePackageOrderStudent);
@@ -264,10 +266,30 @@
courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId());
courseCounsumService.save(courseCounsum);
}
- return true;
+ return deductionClassHourList;
}catch (Exception e){
e.printStackTrace();
}
- return false;
+ return null;
+ }
+
+
+ /**
+ * 回退课时和回退排课数据
+ * @param deductionClassHourList
+ */
+ @Override
+ public void backspaceClassHour(DeductionClassHourList deductionClassHourList) {
+ List<DeductionClassHour> list = deductionClassHourList.getDeductionClassHourList();
+ for (DeductionClassHour deductionClassHour : list) {
+ CoursePackageOrderStudent coursePackageOrderStudent = this.getById(deductionClassHour.getId());
+ Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
+ coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + deductionClassHour.getClassHour());
+ //需要排课的节数
+ Integer scheduledCourses = deductionClassHour.getScheduledCourses();
+// coursePackageService
+
+ }
+
}
}
--
Gitblit v1.7.1