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

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -154,32 +154,6 @@ public class MusicSheetController extends BaseController {
         teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetVoIPage));
         return succeed(teacherAuditMusicSheetVo);
     }
-
-    /*@ApiOperation(value = "老师新增曲目", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/create", consumes="application/json", produces="application/json")
-    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-
-        if (ChargeTypeEnum.CHARGE.getCode().equals(musicSheetDto.getChargeType().getCode())
-                && musicSheetDto.getMusicPrice()==null){
-            return failed("此曲谱为收费曲谱，需要提供价格");
-        }
-
-        musicSheetDto.setUserId(sysUser.getId());
-        musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
-        musicSheetDto.setSubmitAuditTime(new Date());
-        musicSheetDto.setSourceType(SourceTypeEnum.TEACHER);
-
-        musicSheetDto.setFavoriteCount(0);
-        musicSheetDto.setCreateBy(sysUser.getId());
-        musicSheetDto.setCreateTime(new Date());
-        musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
-        return succeed("新增曲谱成功");
-    }*/
-
     /**
      * 启用/停用
      */
@@ -192,33 +166,6 @@ public class MusicSheetController extends BaseController {
         return status(musicSheetService.state(id,"", ClientEnum.TEACHER));
     }
 
-
-    /*@ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/update", consumes="application/json", produces="application/json")
-    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheetDto musicSheet) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        if (musicSheet.getId()==null){
-            return failed("缺少ID");
-        }
-
-        musicSheet.setUserId(sysUser.getId());
-        musicSheet.setSubmitAuditTime(new Date());
-        musicSheet.setCreateTime(new Date());
-        musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setUpdateBy(sysUser.getId());
-        musicSheet.setUpdateTime(new Date());
-        musicSheet.setSubmitAuditTime(new Date());
-        musicSheet.setAuditStatus(AuthStatusEnum.DOING);
-        if ( musicSheetService.saveMusicSheet(musicSheet,sysUser.getId())){
-            return succeed("修改成功");
-        } else {
-            return failed("修改失败");
-        }
-    }*/
-
     @ApiOperation(value = "关联的曲目列表")
     @GetMapping(value="/queryRelatedList")
     public HttpResponseResult<PageInfo<MusicSheetVo>> queryRelatedList(MusicSheetRelatedQueryInfo queryInfo) {

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

@@ -285,10 +285,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
-        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
-                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
-            throw new BizException("请填写下架原因");
-        }
+//        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
+//                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
+//            throw new BizException("请填写下架原因");
+//        }
         CbsMusicSheetWrapper.MusicSheetApplicationQuery query = new CbsMusicSheetWrapper.MusicSheetApplicationQuery();
         query.setApplicationId(applicationId);
         query.setMusicSheetIds(Collections.singletonList(musicSheet.getCbsMusicSheetId()));