Merge remote-tracking branch 'origin/master'

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

@@ -90,6 +90,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         albumDetailVo.setAlbumName(musicAlbum.getAlbumName());
         albumDetailVo.setAlbumDesc(musicAlbum.getAlbumDesc());
         albumDetailVo.setAlbumTag(musicAlbum.getAlbumTag());
+        albumDetailVo.setAlbumStatue(musicAlbum.getAlbumStatus());
         albumDetailVo.setMusicTagNames(musicTagService.getMusicTagNames(StringUtil.toLongList(musicAlbum.getAlbumTag())));
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectAlbumDetailPage(page,query);

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

@@ -83,7 +83,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     public boolean del(Long musicTagId) {
 
         // 有关联的曲目或专辑不让删除
-        if (checkTagBeUserd(musicTagId)) {
+        if (checkTagBeUsed(musicTagId)) {
             throw  new BizException("当前标签或子集标签已被使用，不可删除");
         }
 
@@ -102,7 +102,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
      * @param musicTagId 标签id
      * @return
      */
-    private boolean checkTagBeUserd(Long musicTagId) {
+    private boolean checkTagBeUsed(Long musicTagId) {
 
         List<MusicTag> list = this.lambdaQuery()
                                   .eq(MusicTag::getParentTagId, musicTagId)

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

@@ -37,6 +37,17 @@ public class AlbumDetailVo {
     @ApiModelProperty("教材标签")
     private String musicTagNames;
 
+    public YesOrNoEnum getAlbumStatue() {
+        return albumStatue;
+    }
+
+    public void setAlbumStatue(YesOrNoEnum albumStatue) {
+        this.albumStatue = albumStatue;
+    }
+
+    @ApiModelProperty("专辑状态 0：停用1：启用")
+    private YesOrNoEnum albumStatue;
+
     public String getAlbumTag() {
         return albumTag;
     }

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

@@ -50,6 +50,7 @@
         t.audio_file_url_ as audioFileUrl,
         t.xml_file_url_ as xmlFileUrl,
         t.has_beat_ as hasBeat,
+        t.mp3_type_ as mp3Type,
         t.create_time_ as createTime,
         t.create_by_ as createBy,
         t.update_time_ as updateTime,