Merge branch 'zx_online_scoretype' of http://git.dayaedu.com/yonge/cooleshow into test

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-app/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -1,9 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
-import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
 import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
@@ -30,8 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
@@ -44,8 +39,6 @@ public class MusicSheetController extends BaseController {
 	private MusicSheetService musicSheetService;
 	@Resource
 	private CbsMusicScoreService cbsMusicScoreService;
-	@Resource
-	private MusicFeignClientService musicFeignClientService;
 
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
@@ -86,7 +79,7 @@ public class MusicSheetController extends BaseController {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        musicFeignClientService.musicSheetApplicationExtendDel(id);
+        musicSheetService.del(id);
         return status(true);
     }
 

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

@@ -539,9 +539,9 @@ 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());
@@ -1027,16 +1027,30 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean del(Long id) {
-
-        MusicSheet musicSheet = super.getById(id);
+        MusicSheet musicSheet = this.lambdaQuery().eq(MusicSheet::getCbsMusicSheetId, id).last("limit 1").one();
         if (musicSheet == null) {
             throw new BizException("曲目不存在");
         }
-        if (YesOrNoEnum.YES.getCode().equals(musicSheet.getState().getCode())) {
-            throw new BizException("启用状态下，不可删除");
+        CbsMusicSheetWrapper.MusicSheetApplicationQuery query = new CbsMusicSheetWrapper.MusicSheetApplicationQuery();
+        query.setApplicationId(applicationId);
+        query.setMusicSheetIds(Collections.singletonList(musicSheet.getCbsMusicSheetId()));
+        query.setDelFlag(true);
+        query.setPage(1);
+        query.setRows(1);
+        R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = musicFeignClientService.musicSheetPageByApplication(query);
+        if (pageInfoR.getCode() != 200) {
+            throw new BizException("获取曲目信息异常,{}", pageInfoR.getMessage());
+        }
+        List<CbsMusicSheetWrapper.MusicSheetApplication> rows = pageInfoR.feignData().getRows();
+        if (CollectionUtils.isEmpty(rows)) {
+            throw new BizException("获取曲目信息失败");
         }
-        musicSheet.setDelFlag(true);
-        return this.updateById(musicSheet);
+        CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = rows.get(0);
+        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendDel(musicSheetApplication.getApplicationExtendId());
+        if (jsonObjectR.getCode() != 200) {
+            throw new BizException("曲目删除失败,{}", jsonObjectR.getMessage());
+        }
+        return true;
     }
 
     @Override