Merge remote-tracking branch 'origin/master'

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

@@ -112,6 +112,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 
 		String batchNo = idGeneratorService.generatorId("payment") + "";
 		goodsProcurement.setBatchNo(batchNo);
+		goodsProcurement.setGoodsCategoryId(existsGood.getGoodsCategoryId());
 		goodsProcurementDao.insert(goodsProcurement);
 
 		sellOrderBatchNoAllot();

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

@@ -1306,7 +1306,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
-            throw new BizException("乐团当前状态是{}，延长缴费", musicGroup.getStatus().getMsg());
+            throw new BizException("乐团当前状态是{}，不能延长缴费", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();
@@ -1340,8 +1340,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团找不到");
         }
 
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
-            throw new BizException("乐团当前状态是{}，延长缴费", musicGroup.getStatus().getMsg());
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY && musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
+            throw new BizException("乐团当前状态是{}，不能延长报名", musicGroup.getStatus().getMsg());
         }
 
         Date date = new Date();

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

@@ -17,8 +17,11 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+
 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.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -136,6 +139,12 @@ public class RepairController extends BaseController {
         return succeed(goodsService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
+        return succeed(goodsService.get(id));
+    }
+
     @ApiOperation(value = "分页查询商品分类列表")
     @GetMapping("/queryGoodsCategoryPage")
     public Object queryGoodsCategoryPage(GoodsCategoryQueryInfo queryInfo) {

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

@@ -89,7 +89,6 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
     @GetMapping("/get/{id}")
-    @PreAuthorize("@pcs.hasPermissions('goods/get')")
     public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         return succeed(goodsService.get(id));
     }