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

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

@@ -75,14 +75,6 @@ public class MusicSheetController extends BaseController {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        MusicSheet musicSheet = musicSheetService.getById(id);
-        if (musicSheet == null) {
-            return failed("未找到曲目");
-        }
-        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
-                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
-            return failed("请填写下架原因");
-        }
         return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.SYSTEM));
     }
 

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

@@ -69,8 +69,8 @@ public class MusicSheetController extends BaseController {
     @Resource
     private TeacherService teacherService;
 
-    @Resource
-    private CbsMusicScoreService cbsMusicScoreService;
+//    @Resource
+//    private CbsMusicScoreService cbsMusicScoreService;
 
     /**
      * 查询单条
@@ -172,15 +172,7 @@ public class MusicSheetController extends BaseController {
         if (id == null) {
             return failed("参数不能为空");
         }
-        MusicSheet musicSheet = musicSheetService.getById(id);
-        if (musicSheet == null) {
-            return failed("未找到曲目");
-        }
-        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
-                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
-            return failed("请填写下架原因");
-        }
-        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.SYSTEM));
+        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.TEACHER));
     }
 
     /**

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

@@ -3,18 +3,14 @@ package com.yonge.cooleshow.website.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -25,22 +21,10 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.Date;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 import java.util.Optional;
 
 /**
@@ -53,14 +37,14 @@ import java.util.Optional;
 @RequestMapping("${app-config.url.website:}/music/sheet")
 @Api(tags = "曲谱接口")
 public class MusicSheetController extends BaseController {
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
-	@Autowired
+	@Resource
 	private MusicSheetService musicSheetService;
 
-    @Autowired
-    private TeacherService teacherService;
+//    @Autowired
+//    private TeacherService teacherService;
 
     /**
      * 曲目收藏
@@ -205,14 +189,6 @@ public class MusicSheetController extends BaseController {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        MusicSheet musicSheet = musicSheetService.getById(id);
-        if (musicSheet == null) {
-            return failed("未找到曲目");
-        }
-
-        if (musicSheet.getState().equals(YesOrNoEnum.NO)) {
-            return failed("曲目已被下架");
-        }
         return status(musicSheetService.state(id,"", ClientEnum.TEACHER));
     }
 

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

@@ -32,7 +32,7 @@ public interface MusicSheetAuthRecordService extends IService<MusicSheetAuthReco
      * @param originalMusicSheetId
      * @param lastMusicSheetId
      */
-    void setAuditDoing(Long musicSheetId, Long originalMusicSheetId, Long lastMusicSheetId);
+//    void setAuditDoing(Long musicSheetId, Long originalMusicSheetId, Long lastMusicSheetId);
 
     /**
      * 获取当前曲目审核理由

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

@@ -117,7 +117,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     }
 
 
-    @Override
+    /*@Override
     public void setAuditDoing(Long musicSheetId, Long originalMusicSheetId, Long lastMusicSheetId) {
         List<MusicSheetAuthRecord> list = this.lambdaQuery()
                                               .eq(MusicSheetAuthRecord::getMusicSheetId, musicSheetId)
@@ -138,7 +138,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setCreateTime(new Date());
         musicSheetAuthRecord.setOriginalMusicSheetId(originalMusicSheetId);
         this.saveOrUpdate(musicSheetAuthRecord);
-    }
+    }*/
 
     @Override
     public String selectAuditReason(Long musicSheetId) {

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -156,7 +157,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return musicSheetDao;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    /*@Transactional(rollbackFor = Exception.class)
     public boolean saveMp3AndAccompaniment(MusicSheetDto musicSheetDto, Long userId, Long originalMusicSheetId, Long lastMusicSheetId) {
         MusicSheet musicSheet = new MusicSheet();
         BeanUtils.copyProperties(musicSheetDto, musicSheet);
@@ -182,7 +183,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         list.forEach(musicSheetAccompaniment -> musicSheetAccompaniment.setMusicSheetId(sheetId).setCreateBy(userId).setCreateTime(new Date()));
         return musicSheetAccompanimentService.saveBatch(list);
 
-    }
+    }*/
 
     @Override
     public IPage<MusicSheetVo> selectPage(IPage<MusicSheetVo> page, MusicSheetSearch query) {
@@ -300,19 +301,33 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
-        if (YesOrNoEnum.NO.getCode().equals(Optional.ofNullable(musicSheet.getState()).orElse(YesOrNoEnum.NO).getCode())) {
-            musicSheet.setState(YesOrNoEnum.YES);
-        } else {
-            musicSheet.setState(YesOrNoEnum.NO);
-            musicSheet.setTopFlag(YesOrNoEnum.NO);
-            // 下架发送推送
-            if (client.equals(ClientEnum.SYSTEM)) {
-                sendOutSaleMessage(reason, musicSheet);
-            }
+        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
+                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reason)) {
+            throw new BizException("请填写下架原因");
         }
-        musicSheet.setReason(reason);
-        return this.updateById(musicSheet);
-
+        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("获取曲目信息失败");
+        }
+        CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = rows.get(0);
+        CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus extendStatus = new CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus();
+        extendStatus.setIds(musicSheetApplication.getApplicationExtendId().toString());
+        extendStatus.setStatus(musicSheet.getState()!=YesOrNoEnum.YES);
+        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendStatus(extendStatus);
+        if (jsonObjectR.getCode() != 200) {
+            throw new BizException("修改曲目状态失败,{}", jsonObjectR.getMessage());
+        }
+        return true;
     }
 
     private void sendOutSaleMessage(String reason, MusicSheet musicSheet) {