时间冲突判断

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

@@ -597,7 +597,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     public List<CourseTimeEntity> lockCourseToCache(CheckCourseTimeDto dto) {
 
         for (CourseTimeEntity coursePlanDto : dto.getTimeList()) {
-            coursePlanDto.setFreeEndTime(DateUtil.offsetMinute(coursePlanDto.getStartTime(), dto.getCourseFreeMinutes()));
+            coursePlanDto.setFreeEndTime(DateUtil.offsetMinute(coursePlanDto.getEndTime(), dto.getCourseFreeMinutes()));
         }
         // true：趣纠课PRACTICE     false：LIVE直播课
         boolean courseTypeFlag = Lists.newArrayList(CourseScheduleEnum.PRACTICE,CourseScheduleEnum.VIP).contains(CourseScheduleEnum.existCourseType(dto.getCourseType(), "课程类型不正确！"));

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

@@ -607,17 +607,17 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      *
       */
     private  List<CourseTimeEntity> getPlanTime(List<CourseTimeEntity> timeList, CourseTimeEntity time) {
-        List<CourseTimeEntity> result = new ArrayList<>(timeList);
+        List<CourseTimeEntity> result = new ArrayList<>();
         if (CollectionUtils.isEmpty(timeList)) {
             result.add(time);
             return result;
         }
         for (CourseTimeEntity trainingPlanTimeDetail : timeList) {
             if (time.getStartTime().compareTo(trainingPlanTimeDetail.getStartTime()) < 0) {
-                if (time.getFreeEndTime().compareTo(trainingPlanTimeDetail.getStartTime()) <= 0) {
+                if (time.getEndTime().compareTo(trainingPlanTimeDetail.getStartTime()) <= 0) {
                     result.add(time);
                     return result;
-                } else if (time.getFreeEndTime().compareTo(trainingPlanTimeDetail.getFreeEndTime()) <= 0) {
+                } else if (time.getEndTime().compareTo(trainingPlanTimeDetail.getFreeEndTime()) <= 0) {
                     CourseTimeEntity trainingPlanTimeDetail1 = new CourseTimeEntity();
                     trainingPlanTimeDetail1.setStartTime(time.getStartTime());
                     trainingPlanTimeDetail1.setEndTime(trainingPlanTimeDetail.getStartTime());
@@ -631,7 +631,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                     time.setStartTime(trainingPlanTimeDetail.getEndTime());
                 }
             } else if (time.getStartTime().compareTo(trainingPlanTimeDetail.getFreeEndTime()) <= 0) {
-                if (time.getFreeEndTime().compareTo(trainingPlanTimeDetail.getFreeEndTime()) > 0) {
+                if (time.getEndTime().compareTo(trainingPlanTimeDetail.getFreeEndTime()) > 0) {
                     time.setStartTime(trainingPlanTimeDetail.getFreeEndTime());
                 } else {
                     return result;