Merge remote-tracking branch 'origin/master'

cooleshow-task/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,13 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: task
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true
+

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

@@ -1169,7 +1169,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
         if (studentId == null) {
             StudentHomePage.RecentCourses coursesPractice = baseMapper.selectRecentCoursesPractice(teacherId);
-            StudentHomePage.RecentCourses coursesLive = baseMapper.selectRecentCoursesLive(teacherId);
+            StudentHomePage.RecentCourses coursesLive = baseMapper.selectRecentCoursesLive(teacherId);//直播课&琴房课共用coursesLive
 
             if (coursesPractice == null && coursesLive != null) {
                 homePage.setRecentCourses(coursesLive);
@@ -1486,12 +1486,14 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @return
      */
     public List<DateChangeVo> splicingDate(String day, List<DateVo> strDateList, List<DateChangeVo> rList) {
-        for (DateVo vo : strDateList) {
-            if (vo != null) {
-                DateChangeVo dateChange = new DateChangeVo();
-                dateChange.setStartTime(DateUtil.strToDate(day + " " + vo.getStartTime()));
-                dateChange.setEndTime(DateUtil.strToDate(day + " " + vo.getEndTime()));
-                rList.add(dateChange);
+        if (CollectionUtils.isNotEmpty(strDateList)){
+            for (DateVo vo : strDateList) {
+                if (vo != null) {
+                    DateChangeVo dateChange = new DateChangeVo();
+                    dateChange.setStartTime(DateUtil.strToDate(day + " " + vo.getStartTime()));
+                    dateChange.setEndTime(DateUtil.strToDate(day + " " + vo.getEndTime()));
+                    rList.add(dateChange);
+                }
             }
         }
         return rList;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseStudent.java

@@ -30,7 +30,7 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "课程状态(NOT_START:未开始 ING:进行中 COMPLETE:已完成 CANCEL:已取消)")
     private String status;
 
-    @ApiModelProperty(value = "课程类型(LIVE:直播课 PRACTICE:陪练课")
+    @ApiModelProperty(value = "课程类型(LIVE:直播课 PRACTICE:陪练课 PIANO_ROOM_CLASS:琴房课")
     private String courseType;
 
     @ApiModelProperty(value = "用户id")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomePage.java

@@ -22,6 +22,8 @@ public class StudentHomePage implements Serializable {
     private RecentCourses recentCourses;
 
     public static class RecentCourses{
+        @ApiModelProperty(value = "学生id")
+        private Long studentId;
         @ApiModelProperty(value = "老师id")
         private Long teacherId;
         @ApiModelProperty(value = "老师姓名")
@@ -36,13 +38,21 @@ public class StudentHomePage implements Serializable {
         private Long courseGroupId;
         @ApiModelProperty(value = "课程组名称")
         private String courseGroupName;
-        @ApiModelProperty(value = "课程类型(PRACTICE陪练课 LIVE直播课)")
+        @ApiModelProperty(value = "课程类型(PRACTICE陪练课 LIVE直播课 PIANO_ROOM_CLASS琴房课)")
         private String courseType;
         @ApiModelProperty(value = "课程状态(NOT_START未开始 ING进行中 )")
         private String status;
         @ApiModelProperty(value = "开课时间")
         private Date courseStartTime;
 
+        public Long getStudentId() {
+            return studentId;
+        }
+
+        public void setStudentId(Long studentId) {
+            this.studentId = studentId;
+        }
+
         public String getRealName() {
             return realName;
         }

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

@@ -614,6 +614,7 @@
     </select>
     <select id="selectRecentCoursesPractice" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$RecentCourses">
         SELECT
+            p.user_id_ AS studentId,
             u.id_ AS teacherId,
             u.username_ AS teacherName,
             u.real_name_ AS realName,
@@ -627,6 +628,7 @@
         FROM course_schedule s
         LEFT JOIN sys_user u ON s.teacher_id_=u.id_
         LEFT JOIN course_group g ON s.course_group_id_=g.id_
+        LEFT JOIN course_schedule_student_payment p ON s.id_=p.course_id_
         WHERE s.teacher_id_=#{teacherId}
         AND s.type_='PRACTICE'
         AND s.status_ = 'ING'
@@ -650,7 +652,7 @@
         LEFT JOIN sys_user u ON s.teacher_id_=u.id_
         LEFT JOIN course_group g ON s.course_group_id_=g.id_
         WHERE s.teacher_id_=#{teacherId}
-        AND s.type_='LIVE'
+        AND s.type_ IN ('LIVE','PIANO_ROOM_CLASS')
         AND s.status_ ='ING'
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1