From b0254c5a17b3915eb00fdcb33f0eea222cff78ee Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 06 三月 2024 15:06:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 193 ++++++++++++++++++++++++++++++++----------------
1 files changed, 128 insertions(+), 65 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 6acdef8..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
@@ -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;
@@ -69,7 +79,6 @@
List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", appUserId)
.eq("studentId", stuId)
-// .lt("classDate", sdf.format(calendar.getTime()))
.orderByAsc("classDate")
);
List<Long> ids = list.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
@@ -77,8 +86,6 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
if (list.size() > 0) {
-
-// int pageNum = 1; // 页码
int pageSize = 10; // 每页记录数
Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize);
IPage<CoursePackageStudent> coursePackageStudentPage = cpsMapper.selectPage(page, new QueryWrapper<CoursePackageStudent>()
@@ -115,12 +122,12 @@
}
- CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
- if (byId == null) {
+ CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
+ if (coursePackageScheduling == null) {
continue;
}
- String dateString1 = sdf.format(byId.getClassDate());
- String dateString2 = sdf.format(byId.getEndDate());
+ String dateString1 = sdf.format(coursePackageScheduling.getClassDate());
+ String dateString2 = sdf.format(coursePackageScheduling.getEndDate());
recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));
@@ -132,73 +139,45 @@
String[] split = classWeeks.split(";");
List<String> integerList = Arrays.asList(split);
String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
-// if (integerList.contains(weekOfDate)) {
- String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);
- String ed = simpleDateFormat.format(byId.getEndDate()) + " " + dateString2.substring(11);
+ String dat = simpleDateFormat.format(coursePackageScheduling.getClassDate()) + " " + dateString1.substring(11);
+ String ed = simpleDateFormat.format(coursePackageScheduling.getEndDate()) + " " + dateString2.substring(11);
- Date start = null;
- Date end = null;
- try {
- start = format.parse(dat);
- end = format.parse(ed);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
+ Date start = null;
+ Date end = null;
+ try {
+ start = format.parse(dat);
+ end = format.parse(ed);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
-// else {
-// Date now = new Date();
-// if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
-// recordVo.setStatus(2);
-// } else {
-// recordVo.setStatus(3);
-//
-// }
-// }
+ .eq("coursePackageSchedulingId", coursePackageScheduling.getId()).last("limit 1"));
- //已取消
- if (byId.getStatus() == 4) {
- recordVo.setStatus(4);
- } else if (coursePackageStudent.getSignInOrNot() == 2) {
- //已请假
- recordVo.setStatus(5);
- }else if (ToolUtil.isNotEmpty(cancelledClasses)) {
+
+ if (new Date().after(start)&&new Date().before(end)){
+ recordVo.setStatus(2);
+ }
+ //待上课
+ if (start.after(new Date())) {
+ recordVo.setStatus(1);
+ }
+ //已取消
+ if (coursePackageScheduling.getStatus() == 4) {
+ recordVo.setStatus(4);
+ }
+ //已请假
+ if (coursePackageStudent.getSignInOrNot() == 2) {
+ recordVo.setStatus(5);
+ }
+ //已完成
+ if (ToolUtil.isNotEmpty(cancelledClasses)) {
recordVo.setStatus(3);
// 消课 到课状态0 旷课
if (coursePackageStudent.getSignInOrNot() == 0) {
recordVo.setStatus(6);
}
-
- }else if (new Date().after(start)&&new Date().before(end)){
- recordVo.setStatus(2);
- }else if (start.after(new Date())) {
- //待上课
- recordVo.setStatus(1);
- }
- else {
-// CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
-// .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
-// if (ToolUtil.isNotEmpty(cancelledClasses)) {
-// recordVo.setStatus(3);
-// // 消课 到课状态0 旷课
-// if (coursePackageStudent.getSignInOrNot() == 0) {
-// recordVo.setStatus(6);
-// }
-//
-// } else {
-// Date now = new Date();
-// if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
-// recordVo.setStatus(2);
-// } else {
-// recordVo.setStatus(3);
-//
-// }
-// }
- }
-// } else {
-// recordVo.setStatus(1);
-// }
+ }
recordVoList.add(recordVo);
}
@@ -229,4 +208,88 @@
return ids;
}
+
+
+ /**
+ * 扣除学员课时
+ * @param deductionClassHourList
+ * @return
+ */
+ @Override
+ public DeductionClassHourList 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);
+
+ deductionClassHour.setScheduledCourses(n);
+ }
+
+ 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 deductionClassHourList;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ 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