1、陪练课调整

mec-biz/src/main/java/com/ym/mec/biz/service/PracticeGroupService.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.PracticeGroupDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.dto.TeacherBasicDto;
 import com.ym.mec.biz.dal.entity.PracticeGroup;
 import com.ym.mec.biz.dal.page.PracticeGroupQueryInfo;
 import com.ym.mec.common.page.PageInfo;

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

@@ -1950,28 +1950,28 @@ 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);