退团兼容

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -144,7 +144,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param reason
 	 * @return
 	 */
-	boolean applyQuitMusicGroup(String musicGroupId, String reason);
+	boolean applyQuitMusicGroup(String musicGroupId, String reason,Integer studentId);
 
 	/**
 	 * 取消退团

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1900,8 +1900,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean applyQuitMusicGroup(String musicGroupId, String reason) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+    public boolean applyQuitMusicGroup(String musicGroupId, String reason,Integer studentId) {
+        SysUser sysUser = sysUserFeignService.queryUserById(studentId);
         if (sysUser == null) {
             throw new BizException("用户信息获取失败");
         }

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -293,7 +293,11 @@ public class MusicGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
             @ApiImplicitParam(name = "reason", value = "原因", required = true, dataType = "String")})
     public HttpResponseResult quitMusicGroup(String musicGroupId, String reason) throws Exception {
-        return succeed(musicGroupService.applyQuitMusicGroup(musicGroupId, reason));
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        return succeed(musicGroupService.applyQuitMusicGroup(musicGroupId, reason,sysUser.getId()));
     }
 
     @ApiOperation(value = "取消退团申请")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/MusicGroupController.java

@@ -0,0 +1,30 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("musicGroup")
+@Api(tags = "乐团服务")
+@RestController
+public class MusicGroupController extends BaseController {
+
+    @Autowired
+    private MusicGroupService musicGroupService;
+
+    @ApiOperation(value = "申请退团")
+    @PostMapping("/quitMusicGroup")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "studentId", value = "学员编号", required = true, dataType = "Integer")})
+    public HttpResponseResult quitMusicGroup(String musicGroupId, Integer studentId){
+        return succeed(musicGroupService.applyQuitMusicGroup(musicGroupId,null,studentId));
+    }
+}