Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupSubjectGoodsGroup.java

@@ -54,7 +54,7 @@ public class MusicGroupSubjectGoodsGroup {
 	
 	/** 打包价格 */
 	@ApiModelProperty(value = "打包价格",required = false)
-	private BigDecimal price;
+	private BigDecimal price = new BigDecimal(0);
 
 	public List<String> getGoodsName() {
 		return goodsName;

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

@@ -1,112 +1,150 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
-import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
-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 java.util.Date;
+import java.util.Set;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RestController;
 
-import java.time.LocalDate;
-import java.util.Set;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
+import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
 @RestController
 public class MusicGroupController extends BaseController {
 
-    @Autowired
-    private MusicGroupService musicGroupService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @ApiOperation(value = "修改乐团基本信息")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/update')")
-    public Object update(@RequestBody SubFeeSettingDto subFeeSettingDto) throws Exception {
-        musicGroupService.updateBaseInfo(subFeeSettingDto);
-        return succeed();
-    }
-
-    @ApiOperation(value = "获取乐团调整--基本信息数据")
-    @PostMapping("/findMusicGroupBasicInfo")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/findMusicGroupBasicInfo')")
-    public Object findMusicGroupBasicInfo(String musicGroupId){
-        if(StringUtils.isEmpty(musicGroupId)){
-            return failed("参数校验失败");
-        }
-        return succeed(musicGroupService.findMusicGroupBasicInfo(musicGroupId));
-    }
-
-    @ApiOperation(value = "根据乐团编号查询乐团详情")
-    @GetMapping("/get")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/get')")
-    public Object get(String musicGroupId){
-        return succeed(musicGroupService.getMusicGroupDetail(musicGroupId));
-    }
-
-    @ApiOperation(value = "分页查询乐团列表")
-    @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
-    public Object queryPage(MusicGroupQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null){
-            return failed("用户信息获取失败");
-        }
-        queryInfo.setOrganId(sysUser.getOrganId());
-        return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
-    }
-
-    @ApiOperation(value = "新增乐团  建团申请数据提交")
-    @PostMapping("/createGroup")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/createGroup')")
-    public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser == null || sysUser.getId() == null){
-            return failed("获取用户信息失败");
-        }
-        return succeed(musicGroupService.createGroup(subFeeSettingDto,sysUser.getId()));
-    }
-
-    @ApiOperation(value = "根据乐团ids获取乐团列表")
-    @PostMapping("/queryListByIds")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/queryListByIds')")
-    public Object queryListByIds(@RequestBody Set<String> musicGroupIds){
-        if(musicGroupIds.isEmpty()){
-            return failed("参数校验失败");
-        }
-        return succeed(musicGroupService.queryListByIds(musicGroupIds));
-    }
-
-    @ApiOperation(value = "开启乐团缴费功能")
-    @PostMapping("/openPay")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String")
-    })
-    public Object openPay(String musicGroupId, String expireDate) {
-        return succeed(musicGroupService.openPay(musicGroupId,expireDate));
-    }
-
-    @ApiOperation(value = "乐团确认成立")
-    @PostMapping("/found")
-    @PreAuthorize("@pcs.hasPermissions('musicGroup/found')")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")
-    })
-    public Object found(String musicGroupId) {
-        musicGroupService.musicGroupFound(musicGroupId);
-        return succeed();
-    }
+	@Autowired
+	private MusicGroupService musicGroupService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation(value = "修改乐团基本信息")
+	@PostMapping("/update")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/update')")
+	public Object update(@RequestBody SubFeeSettingDto subFeeSettingDto) throws Exception {
+		musicGroupService.updateBaseInfo(subFeeSettingDto);
+		return succeed();
+	}
+
+	@ApiOperation(value = "获取乐团调整--基本信息数据")
+	@PostMapping("/findMusicGroupBasicInfo")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/findMusicGroupBasicInfo')")
+	public Object findMusicGroupBasicInfo(String musicGroupId) {
+		if (StringUtils.isEmpty(musicGroupId)) {
+			return failed("参数校验失败");
+		}
+		return succeed(musicGroupService.findMusicGroupBasicInfo(musicGroupId));
+	}
+
+	@ApiOperation(value = "根据乐团编号查询乐团详情")
+	@GetMapping("/get")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/get')")
+	public Object get(String musicGroupId) {
+		return succeed(musicGroupService.getMusicGroupDetail(musicGroupId));
+	}
+
+	@ApiOperation(value = "分页查询乐团列表")
+	@GetMapping("/queryPage")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
+	public Object queryPage(MusicGroupQueryInfo queryInfo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("用户信息获取失败");
+		}
+		queryInfo.setOrganId(sysUser.getOrganId());
+		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
+	}
+
+	@ApiOperation(value = "新增乐团  建团申请数据提交")
+	@PostMapping("/createGroup")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/createGroup')")
+	public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(musicGroupService.createGroup(subFeeSettingDto, sysUser.getId()));
+	}
+
+	@ApiOperation(value = "根据乐团ids获取乐团列表")
+	@PostMapping("/queryListByIds")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryListByIds')")
+	public Object queryListByIds(@RequestBody Set<String> musicGroupIds) {
+		if (musicGroupIds.isEmpty()) {
+			return failed("参数校验失败");
+		}
+		return succeed(musicGroupService.queryListByIds(musicGroupIds));
+	}
+
+	@ApiOperation(value = "开启乐团缴费功能")
+	@PostMapping("/openPay")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String") })
+	public Object openPay(String musicGroupId, String expireDate) {
+		return succeed(musicGroupService.openPay(musicGroupId, expireDate));
+	}
+
+	@ApiOperation(value = "乐团确认成立")
+	@PostMapping("/found")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/found')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object found(String musicGroupId) {
+		musicGroupService.musicGroupFound(musicGroupId);
+		return succeed();
+	}
+
+	@ApiOperation(value = "取消乐团")
+	@PostMapping("/cancelMusicGroup")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/cancelMusicGroup')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object cancelMusicGroup(String musicGroupId) {
+		musicGroupService.cancelMusicGroup(musicGroupId);
+		return succeed();
+	}
+
+	@ApiOperation(value = "暂停乐团")
+	@PostMapping("/pauseMusicGroup")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/pauseMusicGroup')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object pauseMusicGroup(String musicGroupId) {
+		musicGroupService.pauseMusicGroup(musicGroupId);
+		return succeed();
+	}
+
+	@ApiOperation(value = "恢复乐团")
+	@PostMapping("/resumeMusicGroup")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/resumeMusicGroup')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String") })
+	public Object resumeMusicGroup(String musicGroupId) {
+		musicGroupService.resumeMusicGroup(musicGroupId);
+		return succeed();
+	}
+
+	@ApiOperation(value = "延长缴费")
+	@PostMapping("/extensionPayment")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/extensionPayment')")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
+			@ApiImplicitParam(name = "expireDate", value = "延长缴费的截止日期", required = true, dataType = "Date") })
+	public Object extensionPayment(String musicGroupId, Date expireDate) {
+		musicGroupService.extensionPayment(musicGroupId, expireDate);
+		return succeed();
+	}
 
 }