vip定制课

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseScheduleController.java

@@ -96,6 +96,7 @@ public class StudentCourseScheduleController extends BaseController {
     @PostMapping("/queryCourseTeacher")
     public HttpResponseResult<Map<String, Object>> queryCourseTeacher(@RequestBody MyCourseSearch search) {
         search.setStudentId(sysUserService.getUserId());
+        search.setCourseType(null);
         return succeed(courseScheduleService.queryCourseTeacher(search));
     }
 

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

@@ -2912,6 +2912,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
         List<CourseSchedule> courseSchedules = this.lambdaQuery()
                 .in(CourseSchedule::getId, courseIds)
+                .eq(StringUtils.isNotEmpty(query.getStatus()), CourseSchedule::getStatus, query.getStatus())
                 .ne(query.getAttendanceStatus() != null,CourseSchedule::getStatus,"NOT_START")
                 .orderByAsc(CourseSchedule::getStartTime).list();
         if(StringUtils.isNotEmpty(query.getClassMonth())){

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

@@ -516,7 +516,7 @@
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN
-        (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'PRACTICE')
+        (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ IN ('VIP','PRACTICE'))
         AND s.class_date_ = #{param.classDate}
         UNION
         SELECT