1、陪练课调整

2、付费陪练课

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 public class CourseListDto {
 
     @ApiModelProperty(value = "班级类型", required = true)
@@ -75,12 +77,22 @@ public class CourseListDto {
 
     private String practiceRenewUrl;
 
+    private Date courseExpireDate;
+
     @ApiModelProperty(value = "是否有陪练报告")
     private Boolean hasReport = false;
 
     @ApiModelProperty(value = "陪练报告地址")
     private String studyReportUrl;
 
+    public Date getCourseExpireDate() {
+        return courseExpireDate;
+    }
+
+    public void setCourseExpireDate(Date courseExpireDate) {
+        this.courseExpireDate = courseExpireDate;
+    }
+
     public String getPracticeRenewUrl() {
         return practiceRenewUrl;
     }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -737,6 +737,7 @@
         <result column="teacher_school_id_" property="teacherSchoolId"/>
         <result column="class_mode_" property="classMode"/>
         <result column="practice_type_" property="practiceType"/>
+        <result column="courses_expire_date_" property="courseExpireDate"/>
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -768,6 +769,7 @@
         SELECT cg.id_ class_group_id_,pg.name_ music_group_name_,su.real_name_,
         cg.current_class_times_,cg.total_class_times_,pg.single_class_minutes_,
         pg.id_ practice_id_,cg.type_,1 class_mode_,
+        pg.courses_expire_date_,
         IF(pg.buy_months_ IS NULL,0,1) practice_type_
         FROM practice_group pg
         LEFT JOIN class_group cg ON cg.music_group_id_ = pg.id_