From 4f3785a686441da0b7435f0b126d3748eb2fe289 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 二月 2024 17:23:54 +0800
Subject: [PATCH] 修改bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 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 70ebdf3..00bc62d 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
@@ -13,8 +13,12 @@
import com.dsh.course.feignclient.other.StoreClient;
import com.dsh.course.feignclient.other.model.Store;
import com.dsh.course.mapper.*;
+import com.dsh.course.model.DeductionClassHour;
+import com.dsh.course.model.DeductionClassHourList;
+import com.dsh.course.service.CourseCounsumService;
import com.dsh.course.service.ICoursePackageOrderStudentService;
import com.dsh.course.service.ICoursePackageSchedulingService;
+import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.DateTimeHelper;
import com.dsh.course.util.DateUtil;
import com.dsh.course.util.ToolUtil;
@@ -44,11 +48,17 @@
@Autowired
private ICoursePackageSchedulingService coursePackageSchedulingService;
+ @Autowired
+ private CourseCounsumService courseCounsumService;
+
@Resource
private TCoursePackageMapper tcpmapper;
@Resource
private StoreClient stoClient;
+
+ @Autowired
+ private TCoursePackageService coursePackageService;
@@ -198,4 +208,66 @@
return ids;
}
+
+
+ /**
+ * 扣除学员课时
+ * @param deductionClassHourList
+ * @return
+ */
+ @Override
+ public boolean deductionClassHour(DeductionClassHourList deductionClassHourList) {
+ try {
+ 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());
+
+ //计算需要删除几个排课记录
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());
+ Integer codeTime = coursePackage.getCodeTime();
+ //未上的排课数据
+ List<CoursePackageScheduling> packageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().eq("studentId", coursePackageOrderStudent.getStudentId())
+ .eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId()).eq("status", 1).orderByDesc("classDate"));
+ //排课使用的总课时
+ int classHour = packageSchedulings.size() * codeTime;
+ //未排课的课时
+ int notClass = laveClassHours - classHour;
+
+ //判断是否需要删除排课数据
+ if(notClass < deductionClassHour.getClassHour()){
+ int clss = deductionClassHour.getClassHour() - notClass;
+ int n = clss % codeTime;
+ int l = 0;
+ //不整除的情况，需要多删除一节排课，回加差额课时。
+ if(n != 0){
+ n += 1;
+ l = (codeTime * n) - clss;
+ }
+ coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + l);
+
+ //删除已排的课程
+ List<CoursePackageScheduling> coursePackageSchedulings = packageSchedulings.subList(0, n);
+ List<Long> collect = coursePackageSchedulings.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
+ coursePackageSchedulingService.removeByIds(collect);
+ }
+
+ this.updateById(coursePackageOrderStudent);
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
+ courseCounsum.setChangeType(0);
+ courseCounsum.setNum(deductionClassHour.getClassHour());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("社区世界杯报名");
+ courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId());
+ courseCounsumService.save(courseCounsum);
+ }
+ return true;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return false;
+ }
}
--
Gitblit v1.7.1