Merge branch 'online1'

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

@@ -48,6 +48,9 @@ public class ChildrenDayController extends BaseController {
         if (Objects.isNull(user)) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        if (user.getOrganId().equals(43)) {
+            return failed("您不可参与该活动，请联系乐团主管");
+        }
         return succeed(childrenDayReserveService.addReserve(user, YesOrNoEnum.YES));
     }
 
@@ -79,6 +82,11 @@ public class ChildrenDayController extends BaseController {
         if (sysUser == null) {
             throw new BizException("用户信息获取失败，请重新登陆");
         }
+        if (sysUser.getOrganId().equals(43) &&
+                (degreePayDto.getVip1v1() || degreePayDto.getVip1v2() || degreePayDto.getTheoryCourse())
+        ) {
+            return failed("您不可参与该活动，请联系乐团主管");
+        }
         Date nowTime = new Date();
         String endTimeStr = sysConfigDao.findConfigValue("children_day_end_time");
         Date endTime = DateUtil.stringToDate(endTimeStr);