puzhibing
2023-12-04 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -414,7 +414,12 @@
                }
            }else{
                Date classDate = coursePackageScheduling.getClassDate();
                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())
@@ -423,10 +428,11 @@
                );
                Integer number = laveClassHours - count;
                if(codeTime.compareTo(number) > 0 && calendar.getTimeInMillis() > classDate.getTime()){
                if((number.compareTo(codeTime) > 0 && calendar.getTimeInMillis() > classDate.getTime())||coursePackageScheduling==null){
                    //从第二天开始
                    Calendar startTime = Calendar.getInstance();
                    startTime.setTime(coursePackageScheduling.getClassDate());
//                    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);
@@ -444,8 +450,8 @@
                    //判断最后一天是否所有时段都已排完
                    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(" ") + 1);
                    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(",");