Merge branch 'dev_v1.3.6_20221011'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -283,6 +283,10 @@ public interface SysConfigConstant {
      */
     String MUSIC_SHARE_FEE = "music_share_fee";
     /**
+     * 乐谱推荐分润比例
+     */
+    String MUSIC_ALBUM_FEE = "music_album_fee";
+    /**
      * 商品推荐分润比例
      */
     String MALL_SHARE_FEE = "mall_share_fee";

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

@@ -13,7 +13,7 @@ public class ShareProfitParam {
     @ApiModelProperty("分享人id")
     private Long userId;
 
-    @ApiModelProperty("曲目/直播课/视频课 id")
+    @ApiModelProperty("曲目/专辑/直播课/视频课 id")
     private Long bizId;
 
     public Long getUserId() {

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

@@ -25,6 +25,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     LIVE_SHARE("直播课分润"),
     VIDEO_SHARE("视频课分润"),
     MUSIC_SHARE("乐谱分润"),
+    ALBUM_SHARE("专辑分润"),
     VIP_SHARE("会员分润"),
     MALL_SHARE("商品分润"),
     ACTI_REGIST_SHARE("活动报名分润"),

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

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 import java.util.List;
@@ -141,4 +142,9 @@ public interface MusicAlbumService extends IService<MusicAlbum> {
      * @return
      */
     Boolean updateMusicSheet(MusicAlbumSheetSortDto query);
+
+    /**
+     * 专辑分享分润
+     */
+    ShareProfitVo albumShareProfit(SysUser sysUser, Long albumId);
 }

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

@@ -9,6 +9,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
 import com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao;
@@ -373,6 +375,21 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
     }
 
+    @Override
+    public ShareProfitVo albumShareProfit(SysUser sysUser, Long albumId) {
+        MusicAlbumVo musicAlbum = baseMapper.selectMusicAlbumById(albumId);
+        if (musicAlbum == null) {
+            throw new BizException("未找到专辑信息");
+        }
+        ShareProfitVo shareProfitVo = new ShareProfitVo();
+        shareProfitVo.setTeacherId(sysUser.getId());
+        shareProfitVo.setName(sysUser.getUsername());
+        shareProfitVo.setAvatar(sysUser.getAvatar());
+        shareProfitVo.setType("ALBUM");
+        shareProfitVo.setMusicAlbum(musicAlbum);
+        return shareProfitVo;
+    }
+
     private boolean checkNameRepeat(String albumName, Long id) {
         LambdaQueryChainWrapper<MusicAlbum> eq = this.lambdaQuery()
                                                      .eq(MusicAlbum::getDelFlag,0)

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

@@ -1052,6 +1052,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         if (GoodTypeEnum.MUSIC.equals(goodType)) {
             return getShareFreeByConfigName(SysConfigConstant.MUSIC_SHARE_FEE);
         }
+        if (GoodTypeEnum.ALBUM.equals(goodType)) {
+            return getShareFreeByConfigName(SysConfigConstant.MUSIC_ALBUM_FEE);
+        }
         if (GoodTypeEnum.ACTI_REGIST.equals(goodType)) {
             //获取当前活动的分润比例
             ActivityPlan byId = activityPlanService.getById(bizId);

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

@@ -28,7 +28,7 @@ public class ShareProfitVo {
     @ApiModelProperty("二维码链接")
     private String url;
 
-    @ApiModelProperty("曲目： MUSIC,直播课 ：LIVE,视频课：VIDEO ,会员 ：VIP")
+    @ApiModelProperty("曲目： MUSIC,ALBUM:专辑 直播课 ：LIVE,视频课：VIDEO ,会员 ：VIP")
     private String type;
 
     @ApiModelProperty("专属优惠 0：否 1：是")
@@ -40,6 +40,9 @@ public class ShareProfitVo {
     @ApiModelProperty("乐谱信息")
     private MusicSheetDetailVo musicSheet;
 
+    @ApiModelProperty("专辑信息")
+    private MusicAlbumVo musicAlbum;
+
     @ApiModelProperty("直播课程组信息")
     private LiveCourseGroupShareVo liveCourseGroup;
 
@@ -49,6 +52,14 @@ public class ShareProfitVo {
     @ApiModelProperty("会员信息")
     private List<MemberPriceSettingsVo> vip;
 
+    public MusicAlbumVo getMusicAlbum() {
+        return musicAlbum;
+    }
+
+    public void setMusicAlbum(MusicAlbumVo musicAlbum) {
+        this.musicAlbum = musicAlbum;
+    }
+
     public Long getActivityId() {
         return activityId;
     }

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

@@ -53,6 +53,9 @@ public class OpenShareController extends BaseController {
     @Autowired
     private TeacherService teacherService;
 
+    @Autowired
+    private MusicAlbumService musicAlbumService;
+
     /**
      * 服务对象
      */
@@ -69,6 +72,15 @@ public class OpenShareController extends BaseController {
         return succeed(musicSheetService.shareMusicSheetProfit(sysUser,param.getBizId()));
     }
 
+    @ApiOperation(value = "老师专辑分享分润")
+    @PostMapping(value="/albumShareProfit")
+    public HttpResponseResult<ShareProfitVo> albumShareProfit(@RequestBody ShareProfitParam param) {
+        SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
+        if (sysUser == null  || sysUser.getId() == null) {
+            return failed("用户信息获取失败");
+        }
+        return succeed(musicAlbumService.albumShareProfit(sysUser,param.getBizId()));
+    }
 
     @ApiOperation(value = "老师直播课分享分润")
     @PostMapping(value= "/liveShareProfit")