Merge remote-tracking branch 'origin/master'

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

@@ -158,4 +158,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
     List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
+
+	/**
+	 * 开启缴费
+	 * @param musicGroupId
+	 * @return
+	 */
+	MusicGroup openPay(String musicGroupId);
 }

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

@@ -609,4 +609,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     public List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId) {
         return courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId);
     }
+
+    @Override
+    public MusicGroup openPay(String musicGroupId) {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        musicGroup.setStatus(MusicGroupStatusEnum.PAY);
+        musicGroupDao.update(musicGroup);
+
+        return musicGroup;
+    }
 }

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

@@ -7,6 +7,8 @@ import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,4 +80,12 @@ public class MusicGroupController extends BaseController {
         return succeed(musicGroupService.queryListByIds(musicGroupIds));
     }
 
+    @ApiOperation(value = "开启乐团缴费功能")
+    @PostMapping("/openPay")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
+    public Object openPay(String musicGroupId) {
+        return succeed(musicGroupService.openPay(musicGroupId));
+    }
+
 }