Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -54,7 +54,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 		CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderDao.queryByOrderId(order.getId());
 
 		if (cloudTeacherOrder == null) {
-			throw new BizException("云教练订单找不到");
+			return true;
 		}
 		Date date = new Date();
 

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

@@ -3676,7 +3676,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			int newMinutes = DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime());
 
 			// 如果修改了老师、课程类型、课程时长、教学模式，需要修改课酬
-			if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
+			if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList)
+					|| !newCourseSchedule.getActualTeacherId().equals(oldCourseSchedule.getActualTeacherId())
+					|| newCourseSchedule.getType() != oldCourseSchedule.getType()
 					|| newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
 
 				Map<Integer, Teacher> teacherMap = null;

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -136,6 +136,7 @@ public class StudentManageController extends BaseController {
 		student.setCurrentGrade(user.getCurrentGrade());
 		student.setRealName(user.getRealName());
 		student.setIdCardNo(user.getIdCardNo());
+		student.setImToken(user.getImToken());
 		if (student != null) {
 			// 获取会员等级图标
 			MemberRankSetting memberRankSetting = memberRankSettingService.get(student.getMemberRankSettingId());