增加乐团报名获取userId的方式

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

@@ -1595,8 +1595,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         for (HighClassGroupDto highClassGroup : highClassGroupList) {
             List<String> subjects = subjectService.findBySubIds(highClassGroup.getSubjectIdList());
             highClassGroup.setSubjectName(subjects.stream().collect(Collectors.joining(",")));
+
             ClassGroupTeacherMapper bishopTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(highClassGroup.getId().longValue(), TeachTypeEnum.BISHOP);
             highClassGroup.setTeacherName(bishopTeacher.getUserName());
+            highClassGroup.setUserId(bishopTeacher.getUserId());
             CourseSchedule courseSchedule = courseScheduleDao.findOneCourseScheduleByClassGroupId(highClassGroup.getId());
             highClassGroup.setStartClassTime(DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm:ss"));
             highClassGroup.setEndClassTime(DateUtil.format(courseSchedule.getEndClassTime(), "HH:mm:ss"));

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

@@ -105,11 +105,17 @@ public class MusicGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
             @ApiImplicitParam(name = "userId", value = "用户id", required = true, dataType = "int")
     })
-    public HttpResponseResult getMusicGroupStatus(String musicGroupId,Integer userId) throws Exception {
+    public HttpResponseResult getMusicGroupStatus(String musicGroupId, Integer userId) throws Exception {
         MusicGroup musicGroup = musicGroupService.get(musicGroupId);
         if (musicGroup == null) {
             return failed("乐团不存在");
         }
+
+        if (userId == null) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            userId = sysUser.getId();
+        }
+
         StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         if (studentRegistration == null) {
             return failed(HttpStatus.CONTINUE, "乐团报名信息不存在");
@@ -370,9 +376,9 @@ public class MusicGroupController extends BaseController {
         MusicGroup musicGroup = musicGroupService.get(orderByOrderNo.getMusicGroupId());
         List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());
         HashMap<String, Object> orderDetail = new HashMap<>();
-        orderDetail.put("order",orderByOrderNo);
-        orderDetail.put("goods",goodsList);
-        orderDetail.put("course",musicGroup.getCourseForm());
+        orderDetail.put("order", orderByOrderNo);
+        orderDetail.put("goods", goodsList);
+        orderDetail.put("course", musicGroup.getCourseForm());
 
         return succeed(orderDetail);
     }

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

@@ -216,7 +216,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "小班报名详情")
     @GetMapping("/highClassGroups")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")
+    //@PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public HttpResponseResult highClassGroups(String musicGroupId) throws Exception {
         return succeed(classGroupService.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId,null));