Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -377,8 +377,14 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
     @Override
     public ShareProfitVo albumShareProfit(SysUser sysUser, Long albumId) {
-        MusicAlbumVo musicAlbum = baseMapper.selectMusicAlbumById(albumId);
-        if (musicAlbum == null) {
+        MusicAlbumDetailSearch query = new MusicAlbumDetailSearch();
+
+        query.setId(albumId);
+        query.setType(2);
+        query.setRows(200);
+        query.setState(YesOrNoEnum.YES);
+        AlbumDetailVo detail = detail(PageUtil.getPage(query), query, null, null);
+        if (detail == null) {
             throw new BizException("未找到专辑信息");
         }
         ShareProfitVo shareProfitVo = new ShareProfitVo();
@@ -386,7 +392,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         shareProfitVo.setName(sysUser.getUsername());
         shareProfitVo.setAvatar(sysUser.getAvatar());
         shareProfitVo.setType("ALBUM");
-        shareProfitVo.setMusicAlbum(musicAlbum);
+        shareProfitVo.setMusicAlbum(detail);
         return shareProfitVo;
     }
 

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

@@ -41,7 +41,7 @@ public class ShareProfitVo {
     private MusicSheetDetailVo musicSheet;
 
     @ApiModelProperty("专辑信息")
-    private MusicAlbumVo musicAlbum;
+    private AlbumDetailVo musicAlbum;
 
     @ApiModelProperty("直播课程组信息")
     private LiveCourseGroupShareVo liveCourseGroup;
@@ -52,11 +52,11 @@ public class ShareProfitVo {
     @ApiModelProperty("会员信息")
     private List<MemberPriceSettingsVo> vip;
 
-    public MusicAlbumVo getMusicAlbum() {
+    public AlbumDetailVo getMusicAlbum() {
         return musicAlbum;
     }
 
-    public void setMusicAlbum(MusicAlbumVo musicAlbum) {
+    public void setMusicAlbum(AlbumDetailVo musicAlbum) {
         this.musicAlbum = musicAlbum;
     }