Merge remote-tracking branch 'origin/master'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicAlbumController.java

@@ -1,28 +1,25 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import javax.validation.Valid;
-
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 /**
@@ -51,7 +48,7 @@ public class MusicAlbumController extends BaseController {
 
         musicAlbum.setCreateBy(sysUser.getId());
         musicAlbum.setCreateTime(new Date());
-        musicAlbum.setAlbumStatus(StateEnum.STOP);
+        musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         return succeed(musicAlbumService.createMusicAlbum(musicAlbum));
     }
 
@@ -127,7 +124,7 @@ public class MusicAlbumController extends BaseController {
     public HttpResponseResult<AlbumDetailVo> detailAddMusicSheet(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(1);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query),query);
         return succeed(albumDetailVo);
     }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -12,10 +12,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
@@ -85,7 +82,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheetDto.setUserId(0L);
-        musicSheetDto.setAuditStatus(AuditEnum.OPEN);
+        musicSheetDto.setAuditStatus(AuthStatusEnum.PASS);
         musicSheetDto.setDelFlag(false);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
@@ -99,7 +96,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CoursePlanDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,5 +17,10 @@ public interface CoursePlanDao extends BaseMapper<CoursePlan> {
 
     int insertBatch(@Param("entities") List<CoursePlan> entities);
 
+    /**
+     * 根据课程组id查询课程计划信息
+     */
+    List<LiveCourseInfoVo.PlanVo> queryCoursePlanByGroupId(@Param("groupId") Long groupId);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,14 +19,21 @@ public interface CourseScheduleStudentPaymentDao extends BaseMapper<CourseSchedu
     int insertBatch(@Param("entities") List<CourseScheduleStudentPayment> entities);
 
     /**
-     * @description: 获取学员列表
      * @param courseGroupId
      * @param courseGroupType
      * @return java.util.List<java.lang.Long>
+     * @description: 获取学员列表
      * @author zx
      * @date 2022/3/23 16:18
      */
     Set<Long> queryStudentIds(@Param("courseGroupId") Long courseGroupId,
-                                 @Param("courseGroupType") String courseGroupType);
+                              @Param("courseGroupType") String courseGroupType);
+
+    /**
+     * 根据课程组id查询学员信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(@Param("groupId") Long groupId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicTagDao.java

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 public interface MusicTagDao extends BaseMapper<MusicTag> {
@@ -38,7 +38,7 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param idAndName 标签编号/名称
 	 * @return List
 	 */
-	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") StateEnum state, @Param("idAndName") String idAndName);
+	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") YesOrNoEnum state, @Param("idAndName") String idAndName);
 
 
 	/**
@@ -48,5 +48,5 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param state    状态
 	 * @return 子集集合
 	 */
-	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") StateEnum state);
+	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") YesOrNoEnum state);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,9 +21,9 @@ public class TeacherMusicSheetAuditReq {
     @NotNull(message = "曲目id不能为空 ")
     private Long musicSheetId;
 
-    @ApiModelProperty(value = "审批状态（1：通过，2：不通过）",required = true)
+    @ApiModelProperty(value = "审批状态（2：通过，3：不通过）",required = true)
     @NotNull(message = "审批状态不为空 ")
-    private AuditEnum auditStatus;
+    private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "审核理由",required = true)
     @NotBlank(message = "审核理由不能为空 ")
@@ -37,12 +37,12 @@ public class TeacherMusicSheetAuditReq {
         this.musicSheetId = musicSheetId;
     }
 
-    public AuditEnum getAuditStatus() {
-        return auditStatus;
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
-        this.auditStatus = auditStatus;
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
     }
 
     public String getRemark() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
@@ -28,7 +28,7 @@ public class MusicAlbumSearch extends QueryInfo{
     private List<Long> albumTagIdList;
 
     @ApiModelProperty("专辑状态0：停用，1：启用")
-    private StateEnum albumStatus;
+    private YesOrNoEnum albumStatus;
 
     public String getIdAndName() {
         return idAndName;
@@ -57,11 +57,11 @@ public class MusicAlbumSearch extends QueryInfo{
         this.albumTagIdList = albumTagIdList;
     }
 
-    public StateEnum getAlbumStatus() {
+    public YesOrNoEnum getAlbumStatus() {
         return albumStatus;
     }
 
-    public void setAlbumStatus(StateEnum albumStatus) {
+    public void setAlbumStatus(YesOrNoEnum albumStatus) {
         this.albumStatus = albumStatus;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
@@ -35,15 +35,15 @@ public class MusicSheetSearch  extends QueryInfo{
     private List<Long> subjectIdList;
 
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
     @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
-    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    @ApiModelProperty(value = "假删除 false : 未删除 true：已删除",hidden = true)
     private Boolean delFlag = false;
 
     public String getIdAndName() {
@@ -92,19 +92,19 @@ public class MusicSheetSearch  extends QueryInfo{
         }
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 
-    public AuditEnum getAuditStatus() {
+    public AuthStatusEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
+    public void setAuditStatus(AuthStatusEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicTagSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +17,7 @@ public class MusicTagSearch extends QueryInfo{
 	private String idAndName;
 
 	@ApiModelProperty("标签状态（0：禁用，1：启用）")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
 	public String getIdAndName() {
 		return idAndName;
@@ -27,11 +27,11 @@ public class MusicTagSearch extends QueryInfo{
 		this.idAndName = idAndName;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherMusicSheetAuditSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,8 +36,8 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
     private Date endTime;
 
 
-    @ApiModelProperty("审核状态（0：审核中，1：已通过，2：已拒绝）")
-    private AuditEnum state;
+    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
     private Boolean delFlag = false;
@@ -74,12 +74,12 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
         this.endTime = endTime;
     }
 
-    public AuditEnum getState() {
-        return state;
+    public AuthStatusEnum getAuthStatus() {
+        return authStatus;
     }
 
-    public void setState(AuditEnum state) {
-        this.state = state;
+    public void setAuthStatus(AuthStatusEnum authStatus) {
+        this.authStatus = authStatus;
     }
 
     public Boolean getDelFlag() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseGroup.java

@@ -75,6 +75,10 @@ public class CourseGroup implements Serializable {
     @ApiModelProperty(value = "最少成课人数")
     private Integer mixStudentNum;
 
+    @TableField("pre_student_num_")
+    @ApiModelProperty(value = "预计上课人数")
+    private Integer preStudentNum;
+
     @TableField("course_start_time_")
     @ApiModelProperty(value = "课程开始时间")
     private Date courseStartTime;
@@ -208,6 +212,14 @@ public class CourseGroup implements Serializable {
         this.mixStudentNum = mixStudentNum;
     }
 
+    public Integer getPreStudentNum() {
+        return preStudentNum;
+    }
+
+    public void setPreStudentNum(Integer preStudentNum) {
+        this.preStudentNum = preStudentNum;
+    }
+
     public Date getCourseStartTime() {
         return courseStartTime;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseSchedule.java

@@ -61,10 +61,6 @@ public class CourseSchedule implements Serializable {
     @ApiModelProperty(value = "开始锁定的时间")
     private Date lockTime;
 
-    @TableField("pre_student_num_")
-    @ApiModelProperty(value = "预计上课人数")
-    private Integer preStudentNum;
-
     @TableField("ex_student_num_")
     @ApiModelProperty(value = "实际上课人数")
     private Integer exStudentNum;
@@ -166,14 +162,6 @@ public class CourseSchedule implements Serializable {
         this.lockTime = lockTime;
     }
 
-    public Integer getPreStudentNum() {
-        return preStudentNum;
-    }
-
-    public void setPreStudentNum(Integer preStudentNum) {
-        this.preStudentNum = preStudentNum;
-    }
-
     public Integer getExStudentNum() {
         return exStudentNum;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicAlbum.java

@@ -1,11 +1,10 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -47,7 +46,7 @@ public class MusicAlbum extends BaseEntity {
 
     @TableField("album_status_")
     @ApiModelProperty(value = "专辑状态(1:启用;0:停用)")
-    private StateEnum albumStatus;  //专辑状态(1:启用;0:停用)
+    private YesOrNoEnum albumStatus;  //专辑状态(1:启用;0:停用)
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -123,12 +122,12 @@ public class MusicAlbum extends BaseEntity {
 	    return this.albumCoverUrl;
 	}
 
-	public MusicAlbum setAlbumStatus(StateEnum albumStatus) {
+	public MusicAlbum setAlbumStatus(YesOrNoEnum albumStatus) {
 	    this.albumStatus = albumStatus;
 	    return this;
 	}
 
-	public StateEnum getAlbumStatus() {
+	public YesOrNoEnum getAlbumStatus() {
 	    return this.albumStatus;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -47,10 +47,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @NotBlank(message = "曲谱音频文件类型不能为空!")
+    @NotNull(message = "曲谱音频文件类型不能为空!")
     @TableField("audio_type_")
-    @ApiModelProperty(value = "曲目音频类型 1：mp3, 2:midi, 3:mp3_metronome")
-    private AudioTypeEnum audioType;  //曲谱音频文件类型(midi;mp3)
+    @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi, MP3_METRONOME:mp3_metronome")
+    private AudioTypeEnum audioType;
 
     @NotBlank(message = "曲谱标签不能为空!")
     @TableField("music_tag_")
@@ -71,17 +71,17 @@ public class MusicSheet implements Serializable {
 
     @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
-    @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
+    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
 
 	@TableField("state_")
 	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -226,19 +226,19 @@ public class MusicSheet implements Serializable {
 		this.chargeType = chargeType;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 
-	public AuditEnum getAuditStatus() {
+	public AuthStatusEnum getAuditStatus() {
 		return auditStatus;
 	}
 
-	public void setAuditStatus(AuditEnum auditStatus) {
+	public void setAuditStatus(AuthStatusEnum auditStatus) {
 		this.auditStatus = auditStatus;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAuthRecord.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,9 +26,9 @@ public class MusicSheetAuthRecord implements Serializable {
     @ApiModelProperty("曲目id ")
 	@TableField(value = "music_sheet_id_")
     private Long musicSheetId;
-    @ApiModelProperty("审核状态 0:审核中;1:通过;2:未通过 ")
+    @ApiModelProperty("审核状态 DOING:审核中;PASS:通过;UNPASS:未通过 ")
 	@TableField(value = "audit_state_")
-    private AuditEnum auditState;
+    private AuthStatusEnum auditState;
     @ApiModelProperty("审核人 ")
 	@TableField(value = "verify_user_id_")
     private Long verifyUserId;
@@ -60,11 +60,11 @@ public class MusicSheetAuthRecord implements Serializable {
         this.musicSheetId = musicSheetId;
     }
     
-	public AuditEnum getAuditState() {
+	public AuthStatusEnum getAuditState() {
         return auditState;
     }
 
-    public void setAuditState(AuditEnum auditState) {
+    public void setAuditState(AuthStatusEnum auditState) {
         this.auditState = auditState;
     }
     

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicTag.java

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 音乐标签表
@@ -34,7 +33,7 @@ public class MusicTag implements Serializable {
 
     @TableField(value = "state_")
     @ApiModelProperty(value = "标签状态（0：禁用，1：启用）")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
 	@TableField(value = "del_flag_")
     @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
@@ -108,11 +107,11 @@ public class MusicTag implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/RoomInfoCache.java

@@ -17,6 +17,9 @@ public class RoomInfoCache implements Serializable {
     @ApiModelProperty(value = "主讲人名称")
     private String speakerName;
 
+    @ApiModelProperty(value = "主讲人头像")
+    private String speakerPic;
+
     @ApiModelProperty(value = "主讲人 0在房间 1不在房间")
     private Integer speakerState;
 
@@ -156,4 +159,12 @@ public class RoomInfoCache implements Serializable {
     public void setLookNum(Integer lookNum) {
         this.lookNum = lookNum;
     }
+
+    public String getSpeakerPic() {
+        return speakerPic;
+    }
+
+    public void setSpeakerPic(String speakerPic) {
+        this.speakerPic = speakerPic;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AudioTypeEnum.java

@@ -9,23 +9,24 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-01
  */
-public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
+public enum AudioTypeEnum implements BaseEnum<String,AudioTypeEnum> {
 
 
-    MP3(1,"mp3"),
-    MIDI(2,"midi"),
-    MP3_METRONOME(3,"mp3_metronome");
+    MP3("MP3","mp3"),
+    MIDI("MIDI","midi"),
+    MP3_METRONOME("MP3_METRONOME","mp3_metronome");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    AudioTypeEnum(Integer code, String msg) {
+    AudioTypeEnum(String code,String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    @Override
+    public String getCode() {
+        return this.code;
     }
 
     public String getMsg() {
@@ -35,9 +36,4 @@ public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
     public void setMsg(String msg) {
         this.msg = msg;
     }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ChargeTypeEnum.java

@@ -4,26 +4,26 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
- * Description 收费类型(0:免费;1:会员;2:单曲收费)
+ * Description 收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
  *
  * @author: liujunchi
  * @date: 2022-03-30
  */
-public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
+public enum ChargeTypeEnum implements BaseEnum<String,ChargeTypeEnum> {
 
-    FREE(0,"免费"),
-    VIP(1,"会员"),
-    CHARGE(2,"单曲收费");
+    FREE("FREE","免费"),
+    VIP("VIP","会员"),
+    CHARGE("CHARGE","单曲收费");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    ChargeTypeEnum(Integer code, String msg) {
+    ChargeTypeEnum(String code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
@@ -36,7 +36,7 @@ public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
     }
 
     @Override
-    public Integer getCode() {
+    public String getCode() {
         return this.code;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OpenEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description 标签列表是否展开列表
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum OpenEnum implements BaseEnum<Integer, OpenEnum> {
-    OPEN(0,"展开"),
-    CLOSE(1, "不展开");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    OpenEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/StateEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum StateEnum implements BaseEnum<Integer, StateEnum> {
-    STOP(0,"停用"),
-    ENABLE(1, "启用");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    StateEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

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

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import com.yonge.cooleshow.common.page.PageInfo;
 
 import java.util.List;
@@ -23,6 +24,13 @@ public interface CourseGroupService extends IService<CourseGroup> {
     CourseGroupDao getDao();
 
     /**
+     * 查询课程组详情-直播课详情
+     *
+     * @param groupId 课程组id
+     */
+    LiveCourseInfoVo queryLiveCourseInfo(Long groupId);
+
+    /**
      * 分页查询课程组列表
      *
      * @param param 传入参数
@@ -43,7 +51,7 @@ public interface CourseGroupService extends IService<CourseGroup> {
     /**
      * 创建直播课程组-解除锁定课程时间-删除写到缓存当作锁定的课时
      */
-   void unlockCourseToCache(Long teacherId);
+    void unlockCourseToCache(Long teacherId);
 
 }
 

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

@@ -3,6 +3,9 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CoursePlanDao;
 import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
+
+import java.util.List;
 
 /**
  * 课程计划表(CoursePlan)表服务接口
@@ -13,5 +16,12 @@ import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
 public interface CoursePlanService extends IService<CoursePlan> {
 
     CoursePlanDao getDao();
+
+    /**
+     * 根据课程组id查询课程计划信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.PlanVo> queryCoursePlanByGroupId(Long groupId);
 }
 

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

@@ -3,6 +3,10 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 课程学生缴费表(CourseScheduleStudentPayment)表服务接口
@@ -13,5 +17,12 @@ import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
 public interface CourseScheduleStudentPaymentService extends IService<CourseScheduleStudentPayment> {
 
     CourseScheduleStudentPaymentDao getDao();
+
+    /**
+     * 根据课程组id查询学员信息
+     *
+     * @param groupId 课程组id
+     */
+    List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(@Param("groupId") Long groupId);
 }
 

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

@@ -1,5 +1,12 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+
+import java.util.Date;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,10 +25,7 @@ import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.biz.dal.enums.CourseGroupEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
-import com.yonge.cooleshow.biz.dal.service.CoursePlanService;
-import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
 import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
@@ -66,6 +70,11 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     private CoursePlanService coursePlanService;
     @Autowired
     private SysConfigService sysConfigService;
+    @Autowired
+    private SubjectService subjectService;
+    @Autowired
+    private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
+
 
     @Override
     public CourseGroupDao getDao() {
@@ -75,11 +84,35 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     /**
      * 查询课程组详情-直播课详情
      *
-     * @param groupId
+     * @param groupId 课程组id
      */
-    public void queryLiveCourseInfo(Long groupId) {
+    @Override
+    public LiveCourseInfoVo queryLiveCourseInfo(Long groupId) {
+        CourseGroup group = Optional.ofNullable(groupId).map(this::getById)
+                .orElseThrow(() -> new BizException("课程组信息不存在"));
+
         LiveCourseInfoVo result = new LiveCourseInfoVo();
+        result.setCourseGroupId(group.getId());
+        result.setCourseGroupName(group.getName());
+        result.setCourseStartTime(group.getCourseStartTime());
+        result.setSingleCourseMinutes(group.getSingleCourseMinutes());
+        result.setStatus(group.getStatus());
+        result.setStudentCount(group.getPreStudentNum());
+        result.setBackgroundPic(group.getBackgroundPic());
+        result.setTeacherId(group.getTeacherId());
+        result.setCoursePrice(group.getCoursePrice());
+        result.setCourseNum(group.getCourseNum());
+        result.setCourseIntroduce(group.getCourseIntroduce());
+        Optional.ofNullable(group.getTeacherId()).map(this::getSysUser)
+                .ifPresent(sysUser -> result.setTeacherName(sysUser.getRealName()));
+        Optional.ofNullable(group.getSubjectId()).map(subjectService::get)
+                .ifPresent(subject -> result.setSubjectName(subject.getName()));
+        //课程组计划
+        result.setPlanList(coursePlanService.queryCoursePlanByGroupId(groupId));
+        //课程组学员信息
+        result.setStudentList(courseScheduleStudentPaymentService.queryStudentInfoByGroupId(groupId));
 
+        return result;
     }
 
     /**
@@ -234,7 +267,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
      * <p>1.把前面2节课的时间循环+1周直到填满5节课为止
      * <p>2.如果自动排课时的时间和未来课程时间有冲突则继续往后面延续一周
      *
-     * @param teacherId 老师id
+     * @param teacherId      老师id
      * @param totalCourseNum 总课程数量
      * @param paramTimeList  当前课程的时间段
      * @return 自动排课后的全部课时

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

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.CoursePlanDao;
 import com.yonge.cooleshow.biz.dal.entity.CoursePlan;
 import com.yonge.cooleshow.biz.dal.service.CoursePlanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 课程计划表(CoursePlan)表服务实现类
@@ -26,5 +27,15 @@ public class CoursePlanServiceImpl extends ServiceImpl<CoursePlanDao, CoursePlan
         return this.baseMapper;
     }
 
+    /**
+     * 根据课程组id查询课程计划信息
+     *
+     * @param groupId 课程组id
+     */
+    @Override
+    public List<LiveCourseInfoVo.PlanVo> queryCoursePlanByGroupId(Long groupId) {
+        return baseMapper.queryCoursePlanByGroupId(groupId);
+    }
+
 }
 

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.yonge.cooleshow.biz.dal.entity.CourseScheduleStudentPayment;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleStudentPaymentService;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 课程学生缴费表(CourseScheduleStudentPayment)表服务实现类
  *
@@ -26,5 +29,16 @@ public class CourseScheduleStudentPaymentServiceImpl extends ServiceImpl<CourseS
         return this.baseMapper;
     }
 
+    /**
+     * 根据课程组id查询学员信息
+     *
+     * @param groupId 课程组id
+     */
+    @Override
+    public List<LiveCourseInfoVo.CourseBuyStudentVo> queryStudentInfoByGroupId(Long groupId) {
+        return baseMapper.queryStudentInfoByGroupId(groupId);
+    }
+
+
 }
 

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

@@ -233,6 +233,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         RoomInfoCache roomCache = new RoomInfoCache();
         roomCache.setSpeakerId(sysUser.getId());
         roomCache.setSpeakerName(sysUser.getRealName());
+        roomCache.setSpeakerPic(sysUser.getAvatar());
         roomCache.setSpeakerState(1);
         roomCache.setRoomUid(room.getRoomUid());
         roomCache.setLiveStartTime(room.getLiveStartTime());

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

@@ -2,15 +2,14 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
@@ -23,9 +22,8 @@ import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.string.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -72,10 +70,10 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         if (musicAlbum == null) {
             throw  new BizException("未找到专辑信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
-            musicAlbum.setAlbumStatus(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
+            musicAlbum.setAlbumStatus(YesOrNoEnum.YES);
         } else {
-            musicAlbum.setAlbumStatus(StateEnum.STOP);
+            musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         }
         return this.updateById(musicAlbum);
     }

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

@@ -33,7 +33,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         MusicSheetAuthRecord musicSheetAuthRecord = new MusicSheetAuthRecord();
         musicSheetAuthRecord.setMusicSheetId(param.getMusicSheetId());
         musicSheetAuthRecord.setCreateTime(new Date());
-        musicSheetAuthRecord.setAuditState(param.getAuditStatus());
+        musicSheetAuthRecord.setAuditState(param.getAuthStatus());
         musicSheetAuthRecord.setReason(param.getRemark());
         musicSheetAuthRecord.setVerifyUserId(userId);
         return this.save(musicSheetAuthRecord);

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

@@ -9,10 +9,7 @@ import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
@@ -73,7 +70,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         BeanUtils.copyProperties(musicSheetDto, musicSheet);
         //保存主表
         musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setState(StateEnum.STOP);
+        musicSheet.setState(YesOrNoEnum.NO);
         musicSheet.setCreateTime(new Date());
         int count = musicSheetDao.insert(musicSheet);
 
@@ -99,10 +96,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (musicSheet == null) {
             throw  new BizException("未找到曲目信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicSheet.getState().getCode())) {
-            musicSheet.setState(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicSheet.getState().getCode())) {
+            musicSheet.setState(YesOrNoEnum.YES);
         } else {
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicSheet);
 
@@ -118,8 +115,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         MusicSheetSearch query = new MusicSheetSearch();
         // 设置只查老师用户
         query.setCreateBy(sysUser.getId());
-        query.setAuditStatus(AuditEnum.OPEN);
-        query.setState(StateEnum.ENABLE);
+        query.setAuditStatus(AuthStatusEnum.PASS);
+        query.setState(YesOrNoEnum.YES);
         // 只查3条
         query.setRows(3);
         IPage<MusicSheetVo> musicSheetVoIPage = selectPage(PageUtil.getPage(query), query);
@@ -238,7 +235,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         }
 
         if (musicSheetAuthRecordService.audit(param,userId)) {
-            musicSheet.setAuditStatus(param.getAuditStatus());
+            musicSheet.setAuditStatus(param.getAuthStatus());
             return this.updateById(musicSheet);
         } else {
             return false;

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,8 +9,6 @@ import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.OpenEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
@@ -66,7 +63,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
                          musicTagVo.setChildren(childrenList);
                      } else {
                          // 如果名称查询中，父级不包含名称/编号，子集包含，只展示包含的子集，并且默认展开子集列表
-                         musicTagVo.setOpen(OpenEnum.OPEN);
+                         musicTagVo.setOpen(YesOrNoEnum.YES);
                          List<MusicTagVo> childrenNameList = childrenList.stream()
                                                                 .filter(vo -> vo.getName().contains(query.getIdAndName())
                                                                         ||vo.getId().toString().contains(query.getIdAndName()))
@@ -98,10 +95,10 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         }
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
-        if (tag.getState().getCode().equals(StateEnum.STOP.getCode())) {
-            musicTag.setState(StateEnum.ENABLE);
+        if (tag.getState().getCode().equals(YesOrNoEnum.NO.getCode())) {
+            musicTag.setState(YesOrNoEnum.YES);
         } else {
-            musicTag.setState(StateEnum.STOP);
+            musicTag.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicTag);
     }
@@ -117,7 +114,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicTag musicTag = new MusicTag();
         musicTag.setDelFlag(false);
-        musicTag.setState(StateEnum.STOP);
+        musicTag.setState(YesOrNoEnum.NO);
         if (musicTagSaveDto.getParentTagId() == null) {
             musicTag.setParentTagId(0L);
         } else {
@@ -173,7 +170,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     public List<MusicTagVo> selectMusicTagTree() {
         List<MusicTag> list = this.lambdaQuery()
                 .eq(MusicTag::getDelFlag,YesOrNoEnum.NO.getCode())
-                .eq(MusicTag::getState,StateEnum.ENABLE.getCode())
+                .eq(MusicTag::getState,YesOrNoEnum.YES.getCode())
                 .list();
         if (list == null) {
             return new ArrayList<>();

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.OpenEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -19,17 +19,17 @@ public class MusicTagVo extends MusicTag{
 	@ApiModelProperty("更新人")
 	private String updateName;
 
-	@ApiModelProperty("是否展开标签（0:展开，1：不展开）")
-	private OpenEnum open = OpenEnum.CLOSE;
+	@ApiModelProperty("是否展开标签（1:展开，0：不展开）")
+	private YesOrNoEnum open =YesOrNoEnum.YES;
 
 	@ApiModelProperty("二级标签")
 	private List<MusicTagVo> children = new ArrayList<>();
 
-	public OpenEnum getOpen() {
+	public YesOrNoEnum getOpen() {
 		return open;
 	}
 
-	public void setOpen(OpenEnum open) {
+	public void setOpen(YesOrNoEnum open) {
 		this.open = open;
 	}
 

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -48,8 +48,8 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;  //创建时间
 
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty("审批人姓名")
     private String auditName;
@@ -143,11 +143,11 @@ public class TeacherMusicSheetVo {
         this.createTime = createTime;
     }
 
-    public AuditEnum getAuditStatus() {
+    public AuthStatusEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
+    public void setAuditStatus(AuthStatusEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
 

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

@@ -21,24 +21,25 @@
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="updated_by_" jdbcType="INTEGER" property="updatedBy"/>
         <result column="updated_time_" jdbcType="TIMESTAMP" property="updatedTime"/>
+        <result column="pre_student_num_" jdbcType="INTEGER" property="preStudentNum"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id_
-        , type_, teacher_id_, name_, subject_id_, single_course_minutes_, course_num_, course_introduce_, course_price_, status_, sales_start_date_, sales_end_date_, background_pic_, mix_student_num_, course_start_time_, created_by_, created_time_, updated_by_, updated_time_
+        , type_, teacher_id_, name_, subject_id_, single_course_minutes_, course_num_, course_introduce_, course_price_, status_, sales_start_date_, sales_end_date_, background_pic_, mix_student_num_,pre_student_num_, course_start_time_, created_by_, created_time_, updated_by_, updated_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.CourseGroup">
         insert into course_group(type_, teacher_id_, name_, subject_id_, single_course_minutes_, course_num_,
         course_introduce_, course_price_, status_, sales_start_date_, sales_end_date_, background_pic_,
-        mix_student_num_, course_start_time_, created_by_, created_time_, updated_by_, updated_time_)
+        mix_student_num_,pre_student_num_, course_start_time_, created_by_, created_time_, updated_by_, updated_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.type}, #{entity.teacherId}, #{entity.name}, #{entity.subjectId}, #{entity.singleCourseMinutes},
             #{entity.courseNum}, #{entity.courseIntroduce}, #{entity.coursePrice}, #{entity.status},
             #{entity.salesStartDate}, #{entity.salesEndDate}, #{entity.backgroundPic}, #{entity.mixStudentNum},
-            #{entity.courseStartTime}, #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},
+            #{entity.preStudentNum},#{entity.courseStartTime}, #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},
             #{entity.updatedTime})
         </foreach>
     </insert>
@@ -53,7 +54,7 @@
         b.course_start_time_          as courseStartTime,
         b.single_course_minutes_      as singleCourseMinutes,
         a.status_                     as `status`,
-        ifnull(a.pre_student_num_, 0) as studentCount,
+        ifnull(b.pre_student_num_, 0) as studentCount,
         b.background_pic_             as backgroundPic,
         b.course_price_               as coursePrice,
         b.course_num_                 as courseNum

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

@@ -23,4 +23,15 @@
         </foreach>
     </insert>
 
+    <select id="queryCoursePlanByGroupId" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo$PlanVo">
+        select a.plan_,
+               a.class_num_,
+               b.start_time_,
+               b.end_time_
+        from course_plan as a
+                 left join course_schedule as b on a.course_group_id_ = b.course_group_id_
+        where a.course_group_id_ = #{groupId}
+        order by b.start_time_
+    </select>
+
 </mapper>

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

@@ -13,7 +13,6 @@
         <result column="end_time_" jdbcType="TIMESTAMP" property="endTime"/>
         <result column="lock_" jdbcType="INTEGER" property="lock"/>
         <result column="lock_time_" jdbcType="TIMESTAMP" property="lockTime"/>
-        <result column="pre_student_num_" jdbcType="INTEGER" property="preStudentNum"/>
         <result column="ex_student_num_" jdbcType="INTEGER" property="exStudentNum"/>
         <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
@@ -23,18 +22,18 @@
 
     <sql id="Base_Column_List">
         id_
-        , course_group_id_, type_, status_,class_num_, teacher_id_, class_date_, start_time_, end_time_, lock_, lock_time_, pre_student_num_, ex_student_num_, created_by_, created_time_, updated_by_, updated_time_
+        , course_group_id_, type_, status_,class_num_, teacher_id_, class_date_, start_time_, end_time_, lock_, lock_time_, ex_student_num_, created_by_, created_time_, updated_by_, updated_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.CourseSchedule">
         insert into course_schedule(course_group_id_, type_, status_,class_num_, teacher_id_, class_date_, start_time_,
-        end_time_, lock_, lock_time_, pre_student_num_, ex_student_num_, created_by_, created_time_, updated_by_,
+        end_time_, lock_, lock_time_, ex_student_num_, created_by_, created_time_, updated_by_,
         updated_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.courseGroupId}, #{entity.type}, #{entity.status},#{entity.classNum}, #{entity.teacherId}, #{entity.classDate},
-            #{entity.startTime}, #{entity.endTime}, #{entity.lock}, #{entity.lockTime}, #{entity.preStudentNum},
+            #{entity.startTime}, #{entity.endTime}, #{entity.lock}, #{entity.lockTime},
             #{entity.exStudentNum}, #{entity.createdBy}, #{entity.createdTime}, #{entity.updatedBy},
             #{entity.updatedTime})
         </foreach>
@@ -84,7 +83,6 @@
                b.end_time_,
                b.lock_,
                b.lock_time_,
-               b.pre_student_num_,
                b.ex_student_num_,
                b.status_,
                b.created_by_,
@@ -108,7 +106,7 @@
         a.start_time_ as startTime,
         a.end_time_ as endTime,
         a.status_ as `status`,
-        a.pre_student_num_ as studentCount,
+        b.pre_student_num_ as studentCount,
         b.background_pic_ as backgroundPic
         from course_schedule as a
         left join course_group as b on a.course_group_id_ = b.id_

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

@@ -31,6 +31,7 @@
             #{entity.courseType})
         </foreach>
     </insert>
+
     <select id="queryStudentIds" resultType="java.lang.Long">
         SELECT DISTINCT user_id_ FROM course_schedule_student_payment
         <where>
@@ -43,4 +44,13 @@
         </where>
     </select>
 
+    <select id="queryStudentInfoByGroupId" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo$CourseBuyStudentVo">
+        select a.user_id_      as studentId,
+               b.real_name_    as studentName,
+               a.created_time_ as createTime
+        from course_schedule_student_payment as a
+                 left join sys_user as b on a.user_id_ = b.id_
+        where a.course_group_id_ = #{groupId}
+    </select>
+
 </mapper>

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

@@ -390,8 +390,8 @@
             <if test="param.auditName != null and param.auditName != ''">
                 and su2.username_ like concat('%',#{param.auditName},'%')
             </if>
-            <if test="param.state != null">
-                and ms.audit_status_ = #{param.state}
+            <if test="param.authStatus != null">
+                and ms.audit_status_ = #{param.authStatus}
             </if>
             <if test="param.startTime != null">
                 and ms.create_time_ &gt; #{param.startTime}

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -6,16 +6,15 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,7 +47,7 @@ public class MusicAlbumController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        query.setAlbumStatus(StateEnum.ENABLE);
+        query.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
         return succeed(PageUtil.pageInfo(iPage));
     }
@@ -65,7 +64,7 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setType(2);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         YesOrNoEnum yesOrNoEnum = musicAlbumService.checkFavorite(sysUser.getId(),query.getId() );
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query);
         albumDetailVo.setFavorite(yesOrNoEnum);
@@ -99,7 +98,7 @@ public class MusicAlbumController extends BaseController {
         }
         StudentMusicAlbumSearch search = new StudentMusicAlbumSearch();
         search.setStudentId(sysUser.getId());
-        search.setAlbumStatus(StateEnum.ENABLE);
+        search.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search);
         return succeed(PageUtil.pageInfo(albumVoIPage));
     }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -5,16 +5,16 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -60,8 +60,8 @@ public class MusicSheetController extends BaseController {
         }
 
         // 学生 只能看通过审核 并且 启用的 曲目
-        query.setState(StateEnum.ENABLE);
-        query.setAuditStatus(AuditEnum.OPEN);
+        query.setState(YesOrNoEnum.YES);
+        query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
@@ -94,8 +94,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -113,8 +113,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }
@@ -132,8 +132,8 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
-        search.setAuditStatus(AuditEnum.OPEN);
+        search.setState(YesOrNoEnum.YES);
+        search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/CourseGroupController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dto.LiveCourseGroupDto;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
 import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
 import com.yonge.cooleshow.biz.dal.vo.CourseGroupVo;
+import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -35,6 +36,11 @@ public class CourseGroupController extends BaseController {
     @Resource
     private CourseGroupService courseGroupService;
 
+    @ApiOperation("直播课详情")
+    @GetMapping("/queryLiveCourseInfo")
+    public HttpResponseResult<LiveCourseInfoVo> queryLiveCourseInfo(@RequestParam(value = "groupId", name = "课程组id") Long groupId) {
+        return succeed(courseGroupService.queryLiveCourseInfo(groupId));
+    }
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "teacherId", dataType = "Long", value = "老师id"),

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -8,10 +8,7 @@ import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
@@ -76,7 +73,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheetDto.setUserId(sysUser.getId());
-        musicSheetDto.setAuditStatus(AuditEnum.AUDITING);
+        musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();
@@ -89,7 +86,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
         return succeed("新增曲谱成功");