活动排课

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ActivityUserMapperController.java

@@ -1,10 +1,10 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.dal.page.ActivityUserQueryInfo;
 import com.ym.mec.biz.service.ActivityUserMapperService;
@@ -76,6 +76,8 @@ public class ActivityUserMapperController extends BaseController {
     public HttpResponseResult createVipGroup(@RequestBody VipGroupApplyDto vipGroupApplyDto){
         VipGroupApplyBaseInfoDto applyBaseInfo = vipGroupApplyDto.getVipGroupApplyBaseInfo();
         applyBaseInfo.setUserId(sysUserService.getUserId());
+        Teacher teacher = teacherDao.get(applyBaseInfo.getUserId());
+        applyBaseInfo.setOrganId(teacher.getTeacherOrganId());
         for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
             courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
         }
@@ -92,11 +94,8 @@ public class ActivityUserMapperController extends BaseController {
     public Object createPracticeGroup(@RequestBody PracticeGroupApplyDto practiceGroupApplyDto){
         PracticeGroupApplyBaseInfoDto applyBaseInfo = practiceGroupApplyDto.getPracticeGroupApplyBaseInfoDto();
         applyBaseInfo.setUserId(sysUserService.getUserId());
-        SysUser student = teacherDao.getUser(applyBaseInfo.getStudentId());
-        if(Objects.isNull(student)||Objects.isNull(student.getOrganId())){
-            return failed("学员信息异常");
-        }
-        applyBaseInfo.setOrganId(student.getOrganId());
+        Teacher teacher = teacherDao.get(applyBaseInfo.getUserId());
+        applyBaseInfo.setOrganId(teacher.getTeacherOrganId());
         for (CourseSchedule courseSchedule : practiceGroupApplyDto.getCourseSchedules()) {
             courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
         }