From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
index b8e875a..f94add7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -320,7 +320,7 @@
TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());
Integer codeTime = coursePackage.getCodeTime();
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
- Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
+ Student student = studentClient.queryStudentById(coursePackageOrderStudent.getStudentId());
Date validity = student.getValidity();
Calendar calendar = Calendar.getInstance();
@@ -344,7 +344,7 @@
//从第二天开始
Calendar startTime = Calendar.getInstance();
startTime.setTime(new Date());
- startTime.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ startTime.set(Calendar.DAY_OF_YEAR, startTime.get(Calendar.DAY_OF_YEAR) + 1);
startTime.set(Calendar.HOUR_OF_DAY, 0);
startTime.set(Calendar.MINUTE, 0);
startTime.set(Calendar.SECOND, 0);
@@ -414,12 +414,26 @@
}
}else{
- Date classDate = coursePackageScheduling.getClassDate();
- if(codeTime.compareTo(laveClassHours) > 0 && calendar.getTimeInMillis() > classDate.getTime()){
+ Date classDate = new Date();
+
+ if (coursePackageScheduling!=null){
+ classDate = coursePackageScheduling.getClassDate();
+ }
+
+ int count = this.count(new QueryWrapper<CoursePackageScheduling>()
+ .eq("appUserId", coursePackageOrderStudent.getAppUserId())
+ .eq("studentId", coursePackageOrderStudent.getStudentId())
+ .eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId())
+ .eq("status", 1)
+ );
+
+ Integer number = laveClassHours - count;
+ if((number.compareTo(codeTime) > 0 && calendar.getTimeInMillis() > classDate.getTime())||coursePackageScheduling==null){
//从第二天开始
Calendar startTime = Calendar.getInstance();
- startTime.setTime(new Date());
- startTime.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+// startTime.setTime(coursePackageScheduling.getClassDate());
+ startTime.setTime(classDate);
+ startTime.set(Calendar.DAY_OF_YEAR, startTime.get(Calendar.DAY_OF_YEAR) + 1);
startTime.set(Calendar.HOUR_OF_DAY, 0);
startTime.set(Calendar.MINUTE, 0);
startTime.set(Calendar.SECOND, 0);
@@ -431,13 +445,13 @@
String classWeeks = coursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
//新剩余课时
- laveClassHours += classNumber;
+ number += classNumber;
//判断最后一天是否所有时段都已排完
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
- String format = sdf.format(coursePackageScheduling.getClassDate());
- String time = format.substring(format.indexOf(" "));
+ String format = sdf.format(classDate);
+ String time = format.substring(0,format.indexOf(" ") + 1);
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
String[] split = classStartTime.split(",");
@@ -448,10 +462,10 @@
n++;
for (int i = n; i < split.length; i++) {
//剩余数量不足以排课
- if (laveClassHours.compareTo(codeTime) < 0) {
+ if (number.compareTo(codeTime) < 0) {
break;
}
- laveClassHours -= codeTime;
+ number -= codeTime;
CoursePackageScheduling packageScheduling = new CoursePackageScheduling();
packageScheduling.setType(coursePackage.getType());
packageScheduling.setAppUserId(coursePackageOrderStudent.getAppUserId());
@@ -493,11 +507,11 @@
}
for (int j = 0; j < split.length; j++) {
//剩余数量不足以排课
- if (laveClassHours.compareTo(codeTime) < 0) {
+ if (number.compareTo(codeTime) < 0) {
break;
}
- laveClassHours -= codeTime;
+ number -= codeTime;
CoursePackageScheduling packageScheduling = new CoursePackageScheduling();
packageScheduling.setType(coursePackage.getType());
@@ -533,6 +547,12 @@
coursePackageOrderStudent.setUseTime(useTime);
coursePackageOrderStudent.setStatus(1);
coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
+ if(null == student.getValidity()){
+ student.setValidity(useTime);
+ }else if(student.getValidity().getTime() < useTime.getTime()){
+ student.setValidity(useTime);
+ }
+ studentClient.frozen(student);
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.7.1