Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1924,7 +1924,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             teacherAttendances.add(teacherAttendance);
         }
         courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
-        courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
         teacherAttendanceDao.batchInsert(teacherAttendances);
 
         Student student = studentDao.get(practiceGroup.getStudentId());
@@ -1951,37 +1950,39 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (!CollectionUtils.isEmpty(studentRepeatCourse1)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "STUDENT_COURSE_REPEAT");
-            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程"+studentRepeatCourse1.get(0).getName()+"」时段冲突；请选择其他时段重试");
+            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程「"+studentRepeatCourse1.get(0).getName()+"」时段冲突；请选择其他时段重试");
             return result;
         }
         List<CourseSchedule> studentRepeatCourse2 = courseScheduleDao.findStudentCoursesWithIncludeDateRange(practiceGroup.getStudentId(), allCourseDates.get(1), DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
         if (!CollectionUtils.isEmpty(studentRepeatCourse2)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "STUDENT_COURSE_REPEAT");
-            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程"+studentRepeatCourse2.get(0).getName()+"」时段冲突；请选择其他时段重试");
+            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程「"+studentRepeatCourse2.get(0).getName()+"」时段冲突；请选择其他时段重试");
             return result;
         }
         List<CourseSchedule> studentRepeatCourse3 = courseScheduleDao.findStudentCoursesWithIncludeDateRange(practiceGroup.getStudentId(), allCourseDates.get(2), DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
         if (!CollectionUtils.isEmpty(studentRepeatCourse3)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "STUDENT_COURSE_REPEAT");
-            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程"+studentRepeatCourse3.get(0).getName()+"」时段冲突；请选择其他时段重试");
+            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程「"+studentRepeatCourse3.get(0).getName()+"」时段冲突；请选择其他时段重试");
             return result;
         }
         List<CourseSchedule> studentRepeatCourse4 = courseScheduleDao.findStudentCoursesWithIncludeDateRange(practiceGroup.getStudentId(), allCourseDates.get(3), DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
         if (!CollectionUtils.isEmpty(studentRepeatCourse4)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             result.put("status", "STUDENT_COURSE_REPEAT");
-            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程"+studentRepeatCourse4.get(0).getName()+"」时段冲突；请选择其他时段重试。");
+            result.put("info", "抱歉啦，当前所选时段组合，与您现有课程「"+studentRepeatCourse4.get(0).getName()+"」时段冲突；请选择其他时段重试。");
             return result;
         }
+        courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 
         //推送
         List<CourseSchedule> courseSchedules1 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(0), DateUtil.addMinutes(allCourseDates.get(0), practiceCourseMinutes));
         List<CourseSchedule> courseSchedules2 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(1), DateUtil.addMinutes(allCourseDates.get(1), practiceCourseMinutes));
         List<CourseSchedule> courseSchedules3 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(2), DateUtil.addMinutes(allCourseDates.get(2), practiceCourseMinutes));
         List<CourseSchedule> courseSchedules5 = courseScheduleDao.findTeacherCoursesWithIncludeDateRange(practiceGroup.getUserId(), allCourseDates.get(3), DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
-        if (!CollectionUtils.isEmpty(courseSchedules1) || !CollectionUtils.isEmpty(courseSchedules2)) {
+        if (!CollectionUtils.isEmpty(courseSchedules1) || !CollectionUtils.isEmpty(courseSchedules2)
+                ||!CollectionUtils.isEmpty(courseSchedules3) || !CollectionUtils.isEmpty(courseSchedules5)) {
             if (courseSchedules1 == null) {
                 courseSchedules1 = new ArrayList<>();
             }