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

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

@@ -49,6 +49,9 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
             item.setApplicationId(applicationId);
             item.setStatus(false);
         });
+        CbsMusicSheetWrapper.MusicSheetExtend musicSheetExtend = new CbsMusicSheetWrapper.MusicSheetExtend();
+        musicSheetExtend.setApplicationId(applicationId);
+        addMusicSheet.setMusicSheetExtend(musicSheetExtend);
         addMusicSheet.setDelFlag(true);
         addMusicSheet.setSendAppFlag(true);
         addMusicSheet.setStatus(true);

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

@@ -566,10 +566,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
         sheet.setTitleImg(musicSheetApplication.getMusicCover());
         sheet.setUserId(musicSheetApplication.getUserId());
-        if(musicSheetApplication.getSourceType() != null){
-            sheet.setSourceType(musicSheetApplication.getSourceType() == EMusicSourceType.PERSON ? SourceTypeEnum.TEACHER :
-                    musicSheetApplication.getSourceType() == EMusicSourceType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
-        }
+//        if(musicSheetApplication.getSourceType() != null){
+//            sheet.setSourceType(musicSheetApplication.getSourceType() == EMusicSourceType.PERSON ? SourceTypeEnum.TEACHER :
+//                    musicSheetApplication.getSourceType() == EMusicSourceType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+//        }
         sheet.setComposer(musicSheetApplication.getComposer());
         sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
         sheet.setMp3Type(AudioTypeEnum.valueOf(musicSheetApplication.getIsPlayBeat()&&musicSheetApplication.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
@@ -608,10 +608,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheetApplication.getAppAuditFlag() != null){
             sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
         }
-        if(musicSheetApplication.getAvailableType() != null){
-            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
-                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
-        }
         sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
         sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         sheet.setMusicJSON(musicSheetApplication.getMusicJson());

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -103,8 +103,7 @@
         values
         <foreach collection="vos" item="item" separator=",">
             (#{item.musicSheetId},CASE WHEN #{item.availableType} = 'PLATFORM' THEN 'PLATFORM'
-            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER'
-            ELSE 'TENANT' END,
+            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END,
              #{item.musicTagIds},#{item.paymentType},#{item.paymentType},
              #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},0
              ,CASE WHEN #{item.delFlag} THEN 'PASS' ELSE 'DOING' END