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

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

@@ -48,6 +48,16 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
         if(CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
             throw new BizException("曲目应用不能为空");
         }
+        Long addMusicSheetId = addMusicSheet.getId();
+        MusicSheet musicSheet = null;
+        Long cbsMusicSheetId = null;
+        if(addMusicSheetId != null){
+            musicSheet = musicSheetService.lambdaQuery().eq(MusicSheet::getId, addMusicSheetId).one();
+            if(musicSheet == null){
+                throw new BizException("曲目不存在");
+            }
+            cbsMusicSheetId = musicSheet.getCbsMusicSheetId();
+        }
         addMusicSheetApplicationExtend.forEach(item->{
             item.setApplicationId(applicationId);
             item.setStatus(false);
@@ -59,20 +69,23 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
         addMusicSheet.setDelFlag(true);
         addMusicSheet.setSendAppFlag(true);
         addMusicSheet.setStatus(true);
+        addMusicSheet.setId(cbsMusicSheetId);
         R<Long> longR = musicFeignClientService.musicSheetAdd(addMusicSheet);
         if (longR.getCode() != 200) {
             throw new BizException("添加失败,{}",longR.getMessage());
         }
-        Long cbsMusicSheetId = longR.getData();
-        //获取本地曲目修改审核状态
-        MusicSheet musicSheet = musicSheetService.lambdaQuery().eq(MusicSheet::getCbsMusicSheetId, cbsMusicSheetId).one();
-        if(musicSheet == null){
-            throw new BizException("曲目上传失败，请联系管理员");
+        if(addMusicSheetId == null){
+            cbsMusicSheetId = longR.getData();
+            //获取本地曲目修改审核状态
+            musicSheet = musicSheetService.lambdaQuery().eq(MusicSheet::getCbsMusicSheetId, cbsMusicSheetId).one();
+            if(musicSheet == null){
+                throw new BizException("曲目上传失败，请联系管理员");
+            }
         }
         musicSheet.setState(YesOrNoEnum.NO);
         musicSheet.setAuditStatus(AuthStatusEnum.DOING);
         musicSheetService.updateById(musicSheet);
-        musicSheetAuthRecordService.setAuditDoing(musicSheet.getId(),addMusicSheet.getId(),null);
+        musicSheetAuthRecordService.setAuditDoing(musicSheet.getId(),addMusicSheetId,null);
         return musicSheet.getId();
     }