Browse Source

1、陪练课调整
2、付费陪练课可预约时间调整

Joburgess 5 years ago
parent
commit
4bbc007c08

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -756,10 +756,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         Set<Long> existCourseScheduleIdsSet=new HashSet<>(existCourseScheduleIds);
 
-        Map<Date, List<CourseSchedule>> existClassDateCoursesMap = allCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getClassDate));
-        Map<Date, List<CourseSchedule>> newClassDateCoursesMap = courseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getClassDate));
+        Map<String, List<CourseSchedule>> existClassDateCoursesMap = allCourseSchedules.stream().collect(Collectors.groupingBy(c -> DateUtil.dateToString(c.getClassDate(), "yyyy-MM-dd")));
+        Map<String, List<CourseSchedule>> newClassDateCoursesMap = courseSchedules.stream().collect(Collectors.groupingBy(c -> DateUtil.dateToString(c.getClassDate(), "yyyy-MM-dd")));
         if (allCourseSchedules.size() > 1) {
-            for (Map.Entry<Date, List<CourseSchedule>> classDateCourseEntry : newClassDateCoursesMap.entrySet()) {
+            for (Map.Entry<String, List<CourseSchedule>> classDateCourseEntry : newClassDateCoursesMap.entrySet()) {
                 List<CourseSchedule> existClassDateCourses = existClassDateCoursesMap.get(classDateCourseEntry.getKey());
                 if(CollectionUtils.isEmpty(existClassDateCourses)){
                     continue;