update

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

@@ -399,4 +399,10 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @return void
 	 */
 	void practiceCourseAdjust(CourseSchedule courseSchedule);
+
+	/**
+	 * 陪练课老师调整
+	 * @param courseSchedule
+	 */
+    void practiceCourseTeacherAdjust(CourseSchedule courseSchedule);
 }

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

@@ -2374,4 +2374,33 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         checkNewCourseSchedules(courseSchedules,false);
         courseScheduleDao.update(oldCourseSchedule);
     }
+
+    @Override
+    public void practiceCourseTeacherAdjust(CourseSchedule courseSchedule) {
+        if(Objects.isNull(courseSchedule.getId())){
+            throw new BizException("请指定课程");
+        }
+        if(Objects.isNull(courseSchedule.getActualTeacherId())){
+            throw new BizException("请指定上课老师");
+        }
+        CourseSchedule oldCourseSchedule = courseScheduleDao.get(courseSchedule.getId());
+        if(Objects.isNull(oldCourseSchedule)){
+            throw new BizException("未找到对应课程");
+        }
+        if(!oldCourseSchedule.getGroupType().equals(GroupType.PRACTICE)){
+            throw new BizException("请选择陪练课");
+        }
+        Integer practiceCourseMinutes=25;
+        SysConfig practiceCourseMinutesConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_MINUTES);
+        if(Objects.nonNull(practiceCourseMinutesConfig)){
+            practiceCourseMinutes=practiceCourseMinutesConfig.getParanValue(Integer.class);
+        }
+        oldCourseSchedule.setClassDate(courseSchedule.getStartClassTime());
+        oldCourseSchedule.setStartClassTime(courseSchedule.getStartClassTime());
+        oldCourseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(),practiceCourseMinutes));
+        List<CourseSchedule> courseSchedules=new ArrayList<>();
+        courseSchedules.add(oldCourseSchedule);
+        checkNewCourseSchedules(courseSchedules,false);
+        courseScheduleDao.update(oldCourseSchedule);
+    }
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -256,14 +256,14 @@ public class RoomServiceImpl implements RoomService {
         List<Room> roomList = roomDao.findByRid(roomId);
         if (roomList.size() == 0) {
             log.error("room : {} not exist ", roomId);
-//            return false;
-            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
+            return false;
+//            throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
         }
         List<RoomMember> roomMemberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (roomMemberList.size() == 0) {
             log.error("{} not exist in room: {}", userId, roomId);
-//            return false;
-            throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
+            return false;
+//            throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
         }
 
         int userRole = roomMemberList.get(0).getRole();

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -304,5 +304,13 @@ public class CourseScheduleController extends BaseController {
         scheduleService.practiceCourseAdjust(courseSchedule);
         return succeed();
     }
+
+    @ApiOperation(value = "陪练课老师调整")
+    @PostMapping("/practiceCourseTeacherAdjust")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceCourseTeacherAdjust')")
+    public Object practiceCourseTeacherAdjust(CourseSchedule courseSchedule){
+        scheduleService.practiceCourseTeacherAdjust(courseSchedule);
+        return succeed();
+    }
 }