1、陪练课调整

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -90,6 +90,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     private static Date activityStartDate, activityEndDate, applyStartDay, courseExpireDate;
 
+    private static List<String> applyDayTimes=new ArrayList<>();
+
     static {
         applyStartDay = DateUtil.stringToDate("2020-02-08 00:00:00");
         activityStartDate = DateUtil.stringToDate("2020-02-09 00:00:00");
@@ -135,6 +137,17 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         for (Integer schoolId : schoolIds3) {
             schoolSubjectTeachersMap.put(schoolId, subjectTeachersMap3);
         }
+
+        applyDayTimes.add("09:00:00");
+        applyDayTimes.add("09:30:00");
+        applyDayTimes.add("11:00:00");
+        applyDayTimes.add("11:30:00");
+        applyDayTimes.add("14:00:00");
+        applyDayTimes.add("14:30:00");
+        applyDayTimes.add("16:00:00");
+        applyDayTimes.add("16:30:00");
+        applyDayTimes.add("17:00:00");
+        applyDayTimes.add("17:30:00");
     }
 
     @Override
@@ -1379,15 +1392,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(enableEndTimeStr.split(":")[0]));
             calendar.set(Calendar.MINUTE, Integer.valueOf(enableEndTimeStr.split(":")[1]));
             Date enableApplyDayEndTime = calendar.getTime();
-            result.add(enableApplyDayStartTime);
             Calendar applyStartCalendar = Calendar.getInstance();
             applyStartCalendar.setTime(enableApplyDayStartTime);
-            while (true) {
-                applyStartCalendar.add(Calendar.MINUTE, practiceApplyIntervalMinutes);
-                if (applyStartCalendar.getTime().after(enableApplyDayEndTime)) {
-                    break;
-                }
-                result.add(applyStartCalendar.getTime());
+            for (String applyDayTime : applyDayTimes) {
+                String temp=DateUtil.dateToString(applyStartCalendar.getTime(),"yyyy-MM-dd");
+                temp=temp+" "+applyDayTime;
+                result.add(DateUtil.stringToDate(temp,"yyyy-MM-dd HH:mm:ss"));
             }
         }
         return result;