Merge branch 'zx_online_scoretype' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.controller;
 
 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.properties.OpenFeignClientConfigProperties;
 import com.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
@@ -171,6 +172,9 @@ public class MusicSheetApplicationExtendController {
         }
         for (CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend : list) {
             addMusicSheetApplicationExtend.setApplicationId(Long.parseLong(openFeignClientConfigProperties.getAppId()));
+            if(addMusicSheetApplicationExtend.getAvailableType() == null){
+                addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.ORG);
+            }
         }
         // 更新数据
         try {

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

@@ -544,10 +544,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         sheet.setTitleImg(musicSheetApplication.getMusicCover());
         sheet.setMusicImg(musicSheetApplication.getMusicImg());
         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.getAvailableType() != null){
+            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
         sheet.setMusicPrice(musicSheetApplication.getMusicPrice());
         sheet.setComposer(musicSheetApplication.getComposer());
         sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));