优化客户端曲目下架

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

@@ -194,7 +194,7 @@ public class MusicSheetController extends BaseController {
                 musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
             return failed("请填写下架原因");
         }
-        return status(musicSheetService.state(id,reasonDto.getReason()));
+        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.SYSTEM));
     }
 
 

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

@@ -41,9 +41,10 @@ public interface MusicSheetService extends IService<MusicSheet> {
      *
      * @param id 曲目id
      * @param reason
+     * @param client
      * @return boolean
      */
-    boolean state(Long id, String reason);
+    boolean state(Long id, String reason, ClientEnum client);
 
     /**
      * 获取专辑详情曲目信息

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

@@ -139,7 +139,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean state(Long id, String reason) {
+    public boolean state(Long id, String reason, ClientEnum client) {
         MusicSheet musicSheet = this.getById(id);
         if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
@@ -151,7 +151,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             musicSheet.setTopFlag(YesOrNoEnum.NO);
 
             // 下架发送推送
-            sendOutSaleMessage(reason, musicSheet);
+            if (client.equals(ClientEnum.SYSTEM)) {
+                sendOutSaleMessage(reason, musicSheet);
+            }
 
         }
         musicSheet.setReason(reason);

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

@@ -20,14 +20,12 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 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.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -160,7 +158,7 @@ public class MusicSheetController extends BaseController {
      */
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
@@ -168,7 +166,11 @@ public class MusicSheetController extends BaseController {
         if (musicSheet == null) {
             return failed("未找到曲目");
         }
-        return status(musicSheetService.state(id,reasonDto.getReason()));
+
+        if (musicSheet.getState().equals(YesOrNoEnum.NO)) {
+            return failed("曲目已被下架");
+        }
+        return status(musicSheetService.state(id, "", ClientEnum.TEACHER));
     }
 
     /**

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

@@ -10,6 +10,7 @@ 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.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuditMusicSheetVo;
@@ -155,7 +156,7 @@ public class MusicSheetController extends BaseController {
      */
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
@@ -163,7 +164,11 @@ public class MusicSheetController extends BaseController {
         if (musicSheet == null) {
             return failed("未找到曲目");
         }
-        return status(musicSheetService.state(id,reasonDto.getReason()));
+
+        if (musicSheet.getState().equals(YesOrNoEnum.NO)) {
+            return failed("曲目已被下架");
+        }
+        return status(musicSheetService.state(id,"", ClientEnum.TEACHER));
     }