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

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

@@ -126,8 +126,8 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             addMusicSheet.setSendAppFlag(true);
             addMusicSheet.setMusicSheetExtend(musicSheetExtend);
             addMusicSheet.setMusicImg(param.getMusicImg());
-            addMusicSheet.setMusicFirstImg(param.getMusicFirstImg());
-            addMusicSheet.setMusicJianImg(param.getMusicJianImg());
+            addMusicSheet.setMusicFirstImg(Optional.ofNullable(param.getFirstTone()).orElse(musicSheet.getFirstTone()));
+            addMusicSheet.setMusicJianImg(Optional.ofNullable(param.getFixedTone()).orElse(musicSheet.getFixedTone()));
             addMusicSheet.setExtConfigJson(param.getExtConfigJson());
             addMusicSheet.setIsEvaluated(param.getCanEvaluate()==YesOrNoEnum.YES);
             addMusicSheet.setIsPlayBeat(true);

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

@@ -2468,8 +2468,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         addMusicSheet.setMusicJianSvg(from.getMusicJianSvg());
         addMusicSheet.setMusicFirstSvg(from.getMusicFirstSvg());
 
-        addMusicSheet.setMusicJianImg(from.getMusicJianSvg());
-        addMusicSheet.setMusicFirstImg(from.getMusicFirstSvg());
+        addMusicSheet.setMusicFirstImg(Optional.ofNullable(from.getFirstTone()).orElse(from.getFirstTone()));
+        addMusicSheet.setMusicJianImg(Optional.ofNullable(from.getFixedTone()).orElse(from.getFixedTone()));
         addMusicSheet.setMusicImg(from.getMusicImg());
         addMusicSheet.setExtConfigJson(from.getExtConfigJson());
         addMusicSheet.setCreateTime(from.getCreateTime());