Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1139,6 +1139,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             throw new BizException("课程无人购买");
         }
 
+        //课程改为过去式避免校验时报错
+        baseMapper.update(null,Wrappers.<CourseSchedule>lambdaUpdate()
+                .eq(CourseSchedule::getId,adjustVo.getCourseId())
+                .set(CourseSchedule::getStartTime,DateUtil.getYesterday())
+                .set(CourseSchedule::getEndTime,DateUtil.getYesterday()));
+
         CourseTimeEntity timeEntity = new CourseTimeEntity();
         timeEntity.setStartTime(startTime);
         timeEntity.setEndTime(endTime);

toolset/utils/src/main/java/com/yonge/toolset/utils/date/DateUtil.java

@@ -1453,6 +1453,10 @@ public class DateUtil {
 		return sdf1.format(calendar1.getTime());
 	}
 
+	public static Date getYesterday(){
+		return new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24);
+	}
+
 	public static void main(String[] args) throws ParseException {
 		// DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 		DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");