酷乐秀曲目来源改为内容平台

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

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetApplicationExtendWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -60,7 +61,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "修改应用扩展信息")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/update', {'BACKEND'})")
     @PostMapping("/update")
-    public R<JSONObject> update(@RequestBody CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend) {
+    public R<JSONObject> update(@RequestBody MusicSheetApplicationExtendWrapper addMusicSheetApplicationExtend) {
         cbsMusicScoreService.update(addMusicSheetApplicationExtend);
         return R.defaultR();
     }

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

@@ -4,6 +4,7 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendCli
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetApplicationExtendWrapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -12,7 +13,7 @@ public interface CbsMusicScoreService {
 
 //    Long musicSheetAdd(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet);
 
-    void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend);
+    void update(MusicSheetApplicationExtendWrapper addMusicSheetApplicationExtend);
 
     void updateStatus(CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status);
 

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

@@ -1,14 +1,17 @@
 package com.yonge.cooleshow.biz.dal.service.cbs.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
+import com.yonge.cooleshow.biz.dal.wrapper.MusicSheetApplicationExtendWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -30,9 +33,14 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
     }
 
     @Override
-    public void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend) {
-        addMusicSheetApplicationExtend.setApplicationId(applicationId);
-        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendUpdate(addMusicSheetApplicationExtend);
+    public void update(MusicSheetApplicationExtendWrapper addMusicSheetApplicationExtend) {
+        CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend extend =
+                JSONObject.parseObject(JSONObject.toJSONString(addMusicSheetApplicationExtend), CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend.class);
+        extend.setApplicationId(applicationId);
+        if(StringUtils.isNotEmpty(addMusicSheetApplicationExtend.getProviderType())){
+            extend.setAvailableType(StringUtils.equals(addMusicSheetApplicationExtend.getProviderType(),"PLATFORM") ? EMusicAvailableType.PLATFORM : EMusicAvailableType.ORG);
+        }
+        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendUpdate(extend);
         if (jsonObjectR.getCode() != 200) {
             throw new BizException("修改失败,{}",jsonObjectR.getMessage());
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicSheetApplicationExtendWrapper.java

@@ -0,0 +1,36 @@
+package com.yonge.cooleshow.biz.dal.wrapper;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "MusicSheetWrapper对象", description = "曲谱表查询对象")
+public class MusicSheetApplicationExtendWrapper {
+    @ApiModelProperty("曲目ID")
+    private @NotNull(
+            message = "曲目ID不能为空"
+    ) Long musicSheetId;
+    @ApiModelProperty("分类ID")
+    private Long musicSheetCategoryId;
+    @ApiModelProperty("启用状态")
+    private Boolean status;
+    @ApiModelProperty("排序")
+    private Integer sortNo;
+    @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
+    private String paymentType;
+    @ApiModelProperty("是否置顶(0:否;1:是)")
+    private Boolean topFlag;
+    @ApiModelProperty("精品标志")
+    private Boolean exquisiteFlag;
+    @ApiModelProperty("可用途径 TENANT 机构 PLATFORM 平台")
+    private String providerType;
+    @ApiModelProperty("曲目标签(多个标签用逗号分隔)")
+    private String musicTagIds;
+    @ApiModelProperty("曲目价格")
+    private BigDecimal musicPrice;
+
+}