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

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

@@ -21,6 +21,7 @@ import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
+import com.yonge.cooleshow.biz.dal.wrapper.AddMusicSheetWrapper;
 import com.yonge.cooleshow.common.service.IdGeneratorService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
@@ -33,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -170,20 +172,21 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if(StringUtils.isEmpty(musicSheetAuthRecord.getMusicSheetJson())){
             throw new BizException("曲目信息不能为空");
         }
-        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetAuthRecord.getMusicSheetJson(), CbsMusicSheetWrapper.AddMusicSheet.class);
-        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> addMusicSheetApplicationExtend = addMusicSheet.getAddMusicSheetApplicationExtend();
-        if(org.apache.commons.collections.CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
-            throw new BizException("曲目应用不能为空");
-        }
-        for (CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend applicationExtend : addMusicSheetApplicationExtend) {
-            if(applicationExtend.getExquisiteFlag() == null){
-                applicationExtend.setExquisiteFlag(false);
-            }
-            if(applicationExtend.getStatus() == null){
-                applicationExtend.setStatus(true);
-            }
-            applicationExtend.setApplicationId(applicationId);
-        }
+        AddMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetAuthRecord.getMusicSheetJson(), AddMusicSheetWrapper.AddMusicSheet.class);
+        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> extendList = new ArrayList<>();
+        CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend extend = new CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend();
+        extend.setApplicationId(applicationId);
+        extend.setMusicSheetCategoryId(addMusicSheet.getMusicSheetCategoryId());
+        extend.setStatus(addMusicSheet.getStatus());
+        extend.setSortNo(addMusicSheet.getSortNo());
+        extend.setPaymentType(addMusicSheet.getPaymentType());
+        extend.setTopFlag(addMusicSheet.getTopFlag());
+        extend.setExquisiteFlag(addMusicSheet.getExquisiteFlag());
+        extend.setAvailableType(addMusicSheet.getAvailableType());
+        extend.setMusicTagIds(addMusicSheet.getMusicTagIds());
+        extend.setMusicPrice(addMusicSheet.getMusicPrice());
+        extendList.add(extend);
+        addMusicSheet.setAddMusicSheetApplicationExtend(extendList);
         return addMusicSheet;
     }
 

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

@@ -0,0 +1,64 @@
+package com.yonge.cooleshow.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.dayaedu.cbs.common.enums.EClientType;
+import com.dayaedu.cbs.common.enums.music.*;
+import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 曲谱表
+ * 2022-12-07 10:16:58
+ */
+@ApiModel(value = "MusicSheetWrapper对象", description = "曲谱表查询对象")
+public class AddMusicSheetWrapper {
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+	@ApiModel(" MusicSheet-曲谱表")
+    public static class AddMusicSheet extends CbsMusicSheetWrapper.AddMusicSheet{
+        @ApiModelProperty("分类ID")
+        private Long musicSheetCategoryId = -2L;
+
+        @ApiModelProperty("启用状态")
+        private Boolean status = true;
+
+        @ApiModelProperty("排序")
+        private Integer sortNo;
+
+        @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
+        private String paymentType;
+
+        @ApiModelProperty("是否置顶(0:否;1:是)")
+        private Boolean topFlag = false;
+
+        @ApiModelProperty("精品标志")
+        private Boolean exquisiteFlag = false;
+
+        @ApiModelProperty("可用途径 ORG 机构 PLATFORM 平台")
+        private EMusicAvailableType availableType;
+
+        @ApiModelProperty("曲目标签(多个标签用逗号分隔)")
+        private String musicTagIds;
+
+        @ApiModelProperty("曲目价格")
+        private BigDecimal musicPrice = BigDecimal.ZERO;
+	}
+
+}