yonge 5 лет назад
Родитель
Сommit
0c27d7f003

+ 0 - 3
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -67,7 +67,6 @@ public class MenuController extends BaseController {
 
     @ApiOperation("查询用户可访问菜单树状结构")
     @GetMapping(value = "/findByUser")
-    @PreAuthorize("@pcs.hasPermissions('menu/findByUser')")
     public Object findByUser(@RequestBody(required = false) MenuQueryInfo menuQueryInfo) {
         AuthUser user = SecurityUtils.getUser();
         if(user != null){
@@ -80,6 +79,4 @@ public class MenuController extends BaseController {
         return failed();
     }
 
-
-
 }

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

@@ -1,20 +1,21 @@
 package com.ym.mec.biz.service;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	/**
 	 * 建团申请数据提交
@@ -93,6 +94,13 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	Map renew(String musicGroupId, Integer userId);
+	
+	/**
+	 * 学生支付订单
+	 * @param studentPaymentOrder
+	 * @return
+	 */
+	boolean renewForCallback(StudentPaymentOrder studentPaymentOrder);
 
 	/**
 	 * 课酬调整

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

@@ -412,6 +412,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+	public boolean renewForCallback(StudentPaymentOrder studentPaymentOrder) {
+		
+		return false;
+	}
+
+	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean updateTeacherCoursesSalary(Long courseScheduleId, Integer teacherId, BigDecimal salary, BigDecimal subsidy, String scope) {
 
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);