java/PlayPai.git

			@@ -163,6 +163,15 @@
			.gt("useTime", "now()")
			.gt("laveClassHours", 0)
			);

			List<CoursePackageOrder> list1 = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
			.eq("payStatus", 2)
			.eq("status", 1)
			.eq("state", 1)
			.gt("laveClassHours", 0)
			.orderByAsc("insertTime")
			);

			for (CoursePackageOrderStudent coursePackageOrderStudent : list) {
			CoursePackageScheduling coursePackageScheduling = this.getOne(new QueryWrapper<CoursePackageScheduling>()
			.eq("appUserId", coursePackageOrderStudent.getAppUserId())
			@@ -414,7 +423,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 +437,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 +459,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(",");