Merge remote-tracking branch 'origin/feature/1113-vipCourse' into feature/1113-vipCourse

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

@@ -36,13 +36,13 @@
             parameterType="com.yonge.cooleshow.biz.dal.entity.CourseSchedule">
         insert into course_schedule(course_group_id_, type_, status_,class_num_, teacher_id_, class_date_, start_time_,
         end_time_, lock_, lock_time_, ex_student_num_, created_by_, created_time_, updated_by_,
-        updated_time_)
+        updated_time_,free_end_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.courseGroupId}, #{entity.type}, #{entity.status},#{entity.classNum}, #{entity.teacherId}, #{entity.classDate},
             #{entity.startTime}, #{entity.endTime}, #{entity.lock}, #{entity.lockTime},
             #{entity.exStudentNum}, #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},
-            #{entity.updatedTime})
+            #{entity.updatedTime},#{entity.freeEndTime})
         </foreach>
     </insert>
 
@@ -93,7 +93,7 @@
         from student t
         left join course_schedule_student_payment a on t.user_id_ = a.user_id_
         left join course_schedule b on a.course_id_ = b.id_
-        where b.lock_ = 0 and b.type_ in ('PRACTICE','PIANO_ROOM_CLASS')
+        where b.lock_ = 0 and b.type_ in ('PRACTICE','PIANO_ROOM_CLASS','VIP','LIVE')
             <if test="userId != null and userId != ''">
                 and t.user_id_ = #{userId}
             </if>