java/PlayPai.git

			@@ -5,6 +5,8 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.dsh.course.controller.CoursePackagePaymentController;
			import com.dsh.course.entity.*;
			import com.dsh.course.feignclient.account.StudentClient;
			import com.dsh.course.feignclient.account.model.Student;
			import com.dsh.course.mapper.CoursePackageSchedulingMapper;
			import com.dsh.course.mapper.CoursePackageStudentMapper;
			import com.dsh.course.model.QueryCoursePackageSchedulingList;
			@@ -44,6 +46,9 @@

			@Resource
			private CoursePackageStudentMapper coursePackageStudentMapper;

			@Resource
			private StudentClient studentClient;


			/**
			@@ -157,6 +162,8 @@
			.orderByDesc("classDate")
			.last(" limit 0, 1")
			);
			Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
			Date validity = student.getValidity();
			TCoursePackage coursePackage = coursePackageService.getById(coursePackageScheduling.getCoursePackageId());
			//上课星期
			String classWeeks = coursePackage.getClassWeeks();
			@@ -206,7 +213,7 @@
			continue;
			}
			//大于有效期不进行排课
			if (start.getTimeInMillis() >= useTime.getTime()) {
			if (start.getTimeInMillis() >= validity.getTime()) {
			break;
			}
			for (int j = 0; j < split.length; j++) {
			@@ -303,6 +310,8 @@
			Integer codeTime = coursePackage.getCodeTime();
			Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
			Date classDate = coursePackageScheduling.getClassDate();
			Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
			Date validity = student.getValidity();

			Calendar calendar = Calendar.getInstance();
			calendar.setTime(new Date());
			@@ -319,7 +328,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);
			@@ -342,7 +351,7 @@
			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 time = format.substring(format.indexOf(" ") + 1);
			String classStartTime = coursePackage.getClassStartTime();
			String classEndTime = coursePackage.getClassEndTime();
			String[] split = classStartTime.split(",");
			@@ -397,7 +406,7 @@
			}

			//大于有效期不进行排课
			if (startTime.getTimeInMillis() >= useTime.getTime()) {
			if (startTime.getTimeInMillis() >= validity.getTime()) {
			break;
			}
			for (int j = 0; j < split.length; j++) {