fix 群成员人数限制

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -215,8 +215,8 @@ public class TeacherCourseScheduleController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        courseScheduleService.arrangeCourse(arrangeCourseVo, user.getId());
-        return succeed();
+        String message = courseScheduleService.arrangeCourse(arrangeCourseVo, user.getId());
+        return succeed(message);
     }
 
     @ApiOperation("根据月份查询消耗时长")

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/WebCourseScheduleController.java

@@ -211,8 +211,8 @@ public class WebCourseScheduleController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        courseScheduleService.arrangeCourse(arrangeCourseVo, user.getId());
-        return succeed();
+        String message = courseScheduleService.arrangeCourse(arrangeCourseVo, user.getId());
+        return succeed(message);
     }
 
     @ApiOperation("根据月份查询消耗时长")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CourseScheduleStudentPayment.java

@@ -69,5 +69,6 @@ public class CourseScheduleStudentPayment implements Serializable {
     @ApiModelProperty("入群标记")
     private Boolean groupJoin;
 
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseScheduleService.java

@@ -257,7 +257,7 @@ public interface CourseScheduleService extends IService<CourseSchedule> {
 
     PageInfo<CourseStudentVo> selectStudent(Map<String, Object> param);
 
-    void arrangeCourse(ArrangeCourseVo arrangeCourseVo, Long teacherId);
+    String arrangeCourse(ArrangeCourseVo arrangeCourseVo, Long teacherId);
 
     /**
      * 校验排课

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.microsvc.toolkit.common.spring.SpringContextHolder;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.*;
@@ -57,7 +56,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -1957,13 +1955,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Author: cy
      * @Date: 2022/5/27
      */
-    public void arrangeCourse(ArrangeCourseVo arrangeCourseVo, Long teacherId) {
+    public String arrangeCourse(ArrangeCourseVo arrangeCourseVo, Long teacherId) {
 
         // 返回未加入群用户消息
-        String message = DistributedLock.of(redissonClient)
+        return DistributedLock.of(redissonClient)
             .runIfLockCanGet(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey("teacherId:" + teacherId)
-                , () -> SpringContextHolder.getBean(CourseScheduleServiceImpl.class).checkArrangeCourse(arrangeCourseVo, teacherId),
-                60L, TimeUnit.SECONDS);
+                , () -> this.checkArrangeCourse(arrangeCourseVo, teacherId), 60L, TimeUnit.SECONDS);
     }
 
     /**