Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,6 +14,7 @@ import java.util.Optional;
  * @Author: cy
  * @Date: 2022/4/18
  */
+@Data
 @ApiModel(value = "CourseStudent")
 public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "课程id")
@@ -73,165 +76,13 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "IM聊天用户ID")
     private String imUserId;
 
-    public Integer getStudentReplied() {
-        return studentReplied;
-    }
+    @ApiModelProperty(value = "课程数")
+    private Integer courseNum;
 
-    public void setStudentReplied(Integer studentReplied) {
-        this.studentReplied = studentReplied;
-    }
+    @ApiModelProperty(value = "已上完课的课程数")
+    private Integer completeCourseNum;
 
-    public Integer getTeacherReplied() {
-        return teacherReplied;
-    }
-
-    public void setTeacherReplied(Integer teacherReplied) {
-        this.teacherReplied = teacherReplied;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Integer getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Integer courseId) {
-        this.courseId = courseId;
-    }
-
-    public Integer getCourseGoupId() {
-        return courseGoupId;
-    }
-
-    public void setCourseGoupId(Integer courseGoupId) {
-        this.courseGoupId = courseGoupId;
-    }
-
-    public Date getClassDate() {
-        return classDate;
-    }
-
-    public void setClassDate(Date classDate) {
-        this.classDate = classDate;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getCourseType() {
-        return courseType;
-    }
-
-    public void setCourseType(String courseType) {
-        this.courseType = courseType;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getName() {
-
-        return Optional.ofNullable(name).orElse(getCourseName());
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCover() {
-        return cover;
-    }
-
-    public void setCover(String cover) {
-        this.cover = cover;
-    }
-
-    public String getPayCount() {
-        return payCount;
-    }
-
-    public void setPayCount(String payCount) {
-        this.payCount = payCount;
-    }
-
-    public Integer getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Integer subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getImGroupId() {
-        return imGroupId;
-    }
-
-    public void setImGroupId(String imGroupId) {
-        this.imGroupId = imGroupId;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getImUserId() {
-        return imUserId;
-    }
-
-    public void setImUserId(String imUserId) {
-        this.imUserId = imUserId;
-    }
+    @ApiModelProperty(value = "课程介绍")
+    private String courseIntroduce;
 }
 

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

@@ -553,14 +553,18 @@
         cs.end_time_ AS endTime,
         cs.status_ AS `status`,
         cs.type_ AS courseType,
-        su.username_ AS userId,
+        su.username_ AS realName,
+        su.id_ AS userId,
         CONCAT(g.name_,'-第',cs.class_num_,'课') AS name,
         IFNULL(g.pre_student_num_, 0) AS payCount,
         g.background_pic_ AS cover,
         g.subject_id_ AS subjectId,
         sb.name_ AS subjectName,
         su.avatar_ AS avatar,
-        g.im_group_id_  as imGroupId
+        g.im_group_id_  as imGroupId,
+        g.course_introduce_ as courseIntroduce,
+        g.course_num_ as courseNum,
+        g.complete_course_num_ as completeCourseNum
         FROM
         course_schedule_student_payment as a
         LEFT JOIN course_schedule cs on a.course_id_ = cs.id_