vip定制课

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -170,6 +170,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     //老师修改课程规划
     TEACHER_UPDATE_COURSE_PLAN("老师修改课程规划"),
     TEACHER_UPDATE_COURSE_PLAN_VIP("老师修改课程规划"),
+    TEACHER_UPDATE_COURSE_PLAN_PIANO_ROOM_CLASS("老师修改课程规划"),
     ;
 
     MessageTypeEnum(String msg) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -523,6 +523,8 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                 MessageTypeEnum messageType = MessageTypeEnum.TEACHER_UPDATE_COURSE_PLAN;
                 if(CourseTypeEnum.valueOf(courseGroup.getType()) == CourseTypeEnum.VIP){
                     messageType = MessageTypeEnum.TEACHER_UPDATE_COURSE_PLAN_VIP;
+                }else if (CourseTypeEnum.valueOf(courseGroup.getType()) == CourseTypeEnum.PIANO_ROOM_CLASS){
+                    messageType = MessageTypeEnum.TEACHER_UPDATE_COURSE_PLAN_PIANO_ROOM_CLASS;
                 }
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
                         messageType,

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherFreeTimeMapper.xml

@@ -61,6 +61,7 @@
         LEFT JOIN sys_user u ON t.user_id_ = u.id_
         LEFT JOIN teacher_total tt ON t.user_id_=tt.user_id_
         <where>
+            t.lock_flag_ = 0
             <if test="param.subjectId != null">
                 AND tsp.subject_id_ = #{param.subjectId}
             </if>