Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into zx_online_update_1218

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

@@ -47,13 +47,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends ServiceImpl<CourseS
 
     @Override
     public List<CourseScheduleStudentPayment> getByCourseId(Long courseId) {
-        List<CourseScheduleEnum> courseScheduleEnumList = new ArrayList<>();
-        courseScheduleEnumList.add(CourseScheduleEnum.PIANO_ROOM_CLASS);
-        courseScheduleEnumList.add(CourseScheduleEnum.PRACTICE);
-        courseScheduleEnumList.add(CourseScheduleEnum.VIP);
         List<CourseScheduleStudentPayment> list = this.lambdaQuery()
                 .eq(CourseScheduleStudentPayment::getCourseId, courseId)
-                .in(CourseScheduleStudentPayment::getCourseType,courseScheduleEnumList)
                 .isNotNull(CourseScheduleStudentPayment::getUserId)
                 .list();
         if (CollectionUtils.isEmpty(list)) {

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

@@ -165,9 +165,10 @@
         su.avatar_ as avatar,
         cs.course_num_ as courseNum,
         cs.complete_course_num_ as completeCourseNum,
-        cs.course_introduce_ as courseIntroduce
+        cs.course_introduce_ as courseIntroduce,
+        cs.max_student_num_ as maxStudentNum
         from (select * from (
-        select cg.course_num_,cg.complete_course_num_,cg.course_introduce_,cg.pre_student_num_,
+        select cg.course_num_,cg.complete_course_num_,cg.course_introduce_,cg.pre_student_num_,cg.max_student_num_,
         cg.background_pic_,cg.im_group_id_,cg.name_,cg.subject_id_,cg.teacher_id_,
         CASE WHEN cg.status_ = 'COMPLETE' THEN cg.status_ WHEN cs.status_ = 'NOT_START' THEN 'NOT_START' ELSE 'ING' END as `status_`,
         cs.type_,cs.course_group_id_,cs.class_date_,cs.start_time_,cs.end_time_,cs.id_,cs.class_num_