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/MusicSheetController.java

@@ -86,7 +86,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

@@ -1032,16 +1032,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