diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/enums/BusinessTableEnums.java b/ruoyi-admin/src/main/java/cn/xluobo/business/enums/BusinessTableEnums.java
index 1addd20..044f07d 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/enums/BusinessTableEnums.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/enums/BusinessTableEnums.java
@@ -18,12 +18,12 @@ public enum BusinessTableEnums {
     SC_TEACHER("sc_teacher","教师",true),
     SC_COURSE("sc_course","课程",true),
     SC_COURSE_CLA("sc_course_cla","课程班级",true),
-    SC_STUDENT("sc_student","学生",true),
+    SC_STUDENT("sc_student","会员",true),
     SC_COURSE_TYPE("sc_course_type","课程类型",true),
     SC_ORDER("sc_order","订单",true),
-    SC_STUDENT_ACCOUNT("sc_student_account","学生余额账户",true),
-    SC_STUDENT_COURSE("sc_student_course","学生报读课程",true),
-    SC_STUDENT_COURSE_LOG("sc_student_course_log","学生日志",true),
+    SC_STUDENT_ACCOUNT("sc_student_account","会员余额账户",true),
+    SC_STUDENT_COURSE("sc_student_course","会员报读课程",true),
+    SC_STUDENT_COURSE_LOG("sc_student_course_log","会员日志",true),
 
     STOCK_GOODS("stock_goods","商品信息",true),
     STOCK_INFO("stock_info","库存信息",true),
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddClaStu.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddClaStu.java
index 76b4528..afb2558 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddClaStu.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddClaStu.java
@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 班级新增学生
+ * 班级新增会员
  * @author ：zhangbaoyu
  * @date ：Created in 2020-04-28 19:08
  */
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddStuCla.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddStuCla.java
index 0645fd8..ce06d1f 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddStuCla.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/req/ReqBusinessAddStuCla.java
@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 学生新学课程
+ * 会员新学课程
  * @author ：zhangbaoyu
  * @date ：Created in 2020-06-21 10:08
  */
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessClaStudent.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessClaStudent.java
index 83c3f51..997890a 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessClaStudent.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessClaStudent.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- * 班级学生
+ * 班级会员
  * </p>
  *
  * @author zhangby
@@ -17,12 +17,12 @@ import java.util.List;
 public class RespBusinessClaStudent implements Serializable {
 
     /**
-     * 全部可选学生
+     * 全部可选会员
      */
     private List<RespBusinessStudent> students;
 
     /**
-     * 已有学生
+     * 已有会员
      */
     private List<Long> claStudentIds;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudent.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudent.java
index aebce5c..95dd681 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudent.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudent.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 班级学生
+ * 班级会员
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudentCla.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudentCla.java
index c0460ed..c207e19 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudentCla.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/RespBusinessStudentCla.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 学生班级
+ * 会员班级
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/enums/LogTypeEnum.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/enums/LogTypeEnum.java
index 1a59d7d..1d81dde 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/enums/LogTypeEnum.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/enums/LogTypeEnum.java
@@ -1,7 +1,7 @@
 package cn.xluobo.business.sc.log.enums;
 
 /**
- * 学生日志类型
+ * 会员日志类型
  * @author ：zhangbaoyu
  * @date ：Created in 2020/12/19 10:15
  */
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/repo/model/ScStudentCourseLog.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/repo/model/ScStudentCourseLog.java
index 78d8c16..f512672 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/repo/model/ScStudentCourseLog.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/log/repo/model/ScStudentCourseLog.java
@@ -37,7 +37,7 @@ public class ScStudentCourseLog implements Serializable {
     private Long logId;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_id")
     private Long studentId;
@@ -120,7 +120,7 @@ public class ScStudentCourseLog implements Serializable {
     @TableField("create_time")
     private Date createTime;
 
-    // 学生姓名
+    // 会员姓名
     @TableField(exist = false)
     private String studentName;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java
index 1d14a44..56f6182 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/domain/req/ReqBusinessSignUp.java
@@ -58,7 +58,7 @@ public class ReqBusinessSignUp {
         if (null == signUpItemList || signUpItemList.size() == 0) {
             return APIResponse.toExceptionResponse("请选择报读课程");
         } else if (null == studentId) {
-            return APIResponse.toExceptionResponse("请选择学生");
+            return APIResponse.toExceptionResponse("请选择会员");
         } else if (null == handleDepartId) {
             return APIResponse.toExceptionResponse("请选择经办校区");
         } else if (useBalancePay && null == balancePayValue) {
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/service/BusinessScOrderService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/service/BusinessScOrderService.java
index f037fab..9c077bd 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/service/BusinessScOrderService.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/order/service/BusinessScOrderService.java
@@ -1,21 +1,13 @@
 package cn.xluobo.business.sc.order.service;
 
-import cn.xluobo.business.sc.log.service.IScStudentCourseLogService;
-import cn.xluobo.business.sys.admin.service.ISysDeptService;
-import cn.xluobo.business.sys.admin.service.ISysUserService;
 import cn.xluobo.business.sys.receipt.repo.model.SysReceiptAccount;
 import cn.xluobo.business.sys.receipt.service.ISysReceiptAccountService;
-import cn.xluobo.business.sys.tag.service.ISysTagService;
 import cn.xluobo.core.page.RespPage;
 import com.google.common.collect.Maps;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.core.api.APIResponse;
 import com.ruoyi.core.api.ApiResEnums;
-import com.ruoyi.school.course.service.IScClaTimeAttendService;
-import com.ruoyi.school.course.service.IScCourseChargeService;
-import com.ruoyi.school.course.service.IScCourseClaService;
-import com.ruoyi.school.course.service.IScCourseService;
 import com.ruoyi.school.member.domain.resp.MemberCardVO;
 import com.ruoyi.school.member.service.IScMemberCardService;
 import com.ruoyi.school.order.domain.ScOrder;
@@ -24,9 +16,6 @@ import com.ruoyi.school.order.domain.resp.RespOrder;
 import com.ruoyi.school.order.enums.OrderStatusEnum;
 import com.ruoyi.school.order.mapper.ScOrderMapper;
 import com.ruoyi.school.order.service.IScOrderService;
-import com.ruoyi.school.salary.service.ScCommissionPlansService;
-import com.ruoyi.school.student.service.IScStudentAccountService;
-import com.ruoyi.school.student.service.IScStudentService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,38 +35,11 @@ public class BusinessScOrderService {
 
     @Autowired
     private IScOrderService scOrderService;
-    @Autowired
-    private IScOrderDetailService orderDetailService;
-    @Autowired
-    private ISysReceiptAccountService receiptAccountService;
-    @Autowired
-    private IScOrderAccountService orderAccountService;
 
-    @Autowired
-    private IScCourseService scCourseService;
-    @Autowired
-    private IScCourseClaService courseClaService;
-    @Autowired
-    private IScCourseChargeService courseChargeService;
-    @Autowired
-    private IScStudentService studentService;
-    @Autowired
-    private ScCommissionPlansService commissionPlansService;
-    @Autowired
-    private ISysDeptService deptService;
-    @Autowired
-    private IScStudentAccountService studentAccountService;
-    @Autowired
-    private ISysTagService tagService;
     @Autowired
     private ScOrderMapper orderMapper;
 
-    @Autowired
-    private ISysUserService userService;
-    @Autowired
-    private IScClaTimeAttendService claTimeAttendService;
-    @Autowired
-    private IScStudentCourseLogService scStudentCourseLogService;
+
 
     @Autowired
     private IScMemberCardService memberCardService;
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java
index 25ac343..818cc0d 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockInfoChange.java
@@ -106,13 +106,13 @@ public class StockInfoChange implements Serializable {
     private BigDecimal salePrice;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_id")
     private Long studentId;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_name")
     private String studentName;
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/staff/controller/SysStaffController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/staff/controller/SysStaffController.java
deleted file mode 100644
index fd34644..0000000
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/staff/controller/SysStaffController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.xluobo.business.sys.staff.controller;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.service.columns.ISysTeacherService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 教师信息 Controller
- * </p>
- *
- * @author zhangby
- * @since 2020-03-17 11:27:37
- */
-@RestController
-@RequestMapping("/api/sys/staff")
-public class SysStaffController {
-
-
-
-    @Autowired
-    private ISysTeacherService teacherService;
-
-    /**
-     * 前端select
-     *
-     * @return
-     */
-    @GetMapping("/list/teacherSelect")
-    public AjaxResult teacherSelect() {
-//        SysUser sysUser = new SysUser();
-//        sysUser.setTeacher(1);
-//        List<SysUser> sysUsers = teacherService.(sysUser);
-        return AjaxResult.success();
-    }
-
-
-}
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportCourseCla.java b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportCourseCla.java
index 6247f82..623aa31 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportCourseCla.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportCourseCla.java
@@ -27,7 +27,7 @@ public class ImportCourseCla extends ImportBase{
     @ExcelProperty(index = 2)
     private String deptName;
 
-    // D列 任课教师
+    // D列 任课教练
     @ExcelProperty(index = 3)
     private String teacherName;
 
@@ -39,7 +39,7 @@ public class ImportCourseCla extends ImportBase{
     @ExcelProperty(index = 5)
     private String recruitStatus;
 
-    // G列 每次上课学员扣除课时
+    // G列 每次上课会员扣除课时
     @ExcelProperty(index = 6)
     private String everyStuLoseHour;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportStudentOrder.java b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportStudentOrder.java
index 7959867..14ed708 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportStudentOrder.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/domain/ImportStudentOrder.java
@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
- * 学生订单导入
+ * 会员订单导入
  * @author ：zhangbaoyu
  * @date ：Created in 2020/10/12 16:08
  */
@@ -13,7 +13,7 @@ import lombok.Data;
 @ExcelIgnoreUnannotated
 public class ImportStudentOrder extends ImportBase{
 
-    // A列 学生姓名
+    // A列 会员姓名
     @ExcelProperty(index = 0)
     private String studentName;
 
diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/listener/ImportCourseClaListener.java b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/listener/ImportCourseClaListener.java
index b4f9dc8..04967d9 100644
--- a/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/listener/ImportCourseClaListener.java
+++ b/ruoyi-admin/src/main/java/cn/xluobo/business/tool/impt/listener/ImportCourseClaListener.java
@@ -173,9 +173,9 @@ public class ImportCourseClaListener extends AnalysisEventListener<ImportCourseC
     public APIBaseResponse checkParam(ImportCourseCla data) {
         if (StringUtils.isAnyEmpty(data.getClaName(), data.getCourseName(),
                 data.getDeptName(), data.getTeacherName(), data.getOpenDate())) {
-            return APIBaseResponse.fail("请填写班级名称、课程名称、校区、任课教师、开班日期");
+            return APIBaseResponse.fail("请填写班级名称、课程名称、校区、任课教练、开班日期");
         } else if (StringUtils.isEmpty(data.getEveryStuLoseHour())) {
-            return APIBaseResponse.fail("请填写每次上课学员扣除课时数");
+            return APIBaseResponse.fail("请填写每次上课会员扣除课时数");
         } else if (data.getClaName().length() > 30) {
             return APIBaseResponse.fail("班级名称过长,最长30!");
         } else if (StringUtils.isNotEmpty(data.getMemo()) && data.getMemo().length() > 200) {
@@ -184,7 +184,7 @@ public class ImportCourseClaListener extends AnalysisEventListener<ImportCourseC
         try {
             new BigDecimal(data.getEveryStuLoseHour());
         }catch (NumberFormatException numberFormatException) {
-            return APIBaseResponse.fail("每次上课学员扣除课时数 需填写两位小数");
+            return APIBaseResponse.fail("每次上课会员扣除课时数 需填写两位小数");
         }
         if(StringUtils.isNotEmpty(data.getCapacity())){
             try {
@@ -199,7 +199,7 @@ public class ImportCourseClaListener extends AnalysisEventListener<ImportCourseC
         String recruitStatus = recruitStatusMap.get(data.getRecruitStatus());
 
         if (null == courseId || null == teacherId) {
-            return APIBaseResponse.fail("根据课程名称、任课教师名称无法获取对应信息,请核对填写信息或重新下载导入模板进行导入");
+            return APIBaseResponse.fail("根据课程名称、任课教练名称无法获取对应信息,请核对填写信息或重新下载导入模板进行导入");
         } else if (ObjectUtil.isEmpty(deptId)) {
             return APIBaseResponse.fail("根据校区名称无法获取对应信息,请核对填写信息或重新下载导入模板进行导入");
         } else if (StringUtils.isEmpty(recruitStatus)) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/columns/SysTeacherController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/columns/SysTeacherController.java
index c93667d..664a379 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/columns/SysTeacherController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/columns/SysTeacherController.java
@@ -31,6 +31,7 @@ public class SysTeacherController extends BaseController
     @Autowired
     private ISysTeacherService sysTeacherService;
 
+
     /**
      * 查询员工信息列表
      */
@@ -91,13 +92,13 @@ public class SysTeacherController extends BaseController
     /**
      * 新增教练信息
      */
-    @PreAuthorize("@ss.hasPermi('system:teacher:add')")
-    @Log(title = "教练信息", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SysTeacher sysTeacher)
-    {
-        return toAjax(sysTeacherService.insertSysTeacher(sysTeacher));
-    }
+//    @PreAuthorize("@ss.hasPermi('system:teacher:add')")
+//    @Log(title = "教练信息", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody SysTeacher sysTeacher)
+//    {
+//        return toAjax(sysTeacherService.insertSysTeacher(sysTeacher));
+//    }
 
     /**
      * 修改教练信息
@@ -110,13 +111,11 @@ public class SysTeacherController extends BaseController
         return toAjax(sysTeacherService.updateSysTeacher(sysTeacher));
     }
 
-    /**
-     * 删除教练信息
-     */
-    @PostMapping("/remove")
-    public AjaxResult remove( @RequestBody Long[] ids) {
-        {
-            return toAjax(sysTeacherService.deleteSysTeacherByUserIds(ids));
-        }
-    }
+//    /**
+//     * 删除教练信息
+//     */
+//    @PostMapping("/remove")
+//    public AjaxResult remove( @RequestBody List<Long> ids) {
+//       return sysTeacherService.deleteSysTeacherByUserIds(ids);
+//    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseClaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseClaController.java
index ce3e66a..0ff334d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseClaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseClaController.java
@@ -36,7 +36,7 @@ public class ScCourseClaController {
     }
 
     /**
-     * 查询已经预约签到的学员
+     * 查询已经预约签到的会员
      * @param
      * @return
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseController.java
index 61bf3f1..14d385a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseController.java
@@ -40,7 +40,7 @@ public class ScCourseController {
 
     /**
      * 查询课程列表
-     * 含有学生报读状态
+     * 含有会员报读状态
      *
      * @param reqSearchScCourse
      * @return
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseTypeController.java
index 6536e24..f80bf00 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/course/ScCourseTypeController.java
@@ -139,12 +139,12 @@ public class ScCourseTypeController {
     }
 
     /**
-     * 变更是否开售
+     * 变更是否开售 （暂未使用）
      *
      * @param
      * @return
      */
-    @PutMapping("/changeCourseTypeSale")
+//    @PutMapping("/changeCourseTypeSale")
     public APIResponse changeCourseTypeSale(@RequestBody ScCourseType scCourseType) {
         return scCourseTypeService.changeCourseTypeSale(scCourseType);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScStudentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScStudentController.java
index 65af1aa..e1a44cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScStudentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/school/member/ScStudentController.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
- * 学生基本信息 Controller
+ * 会员基本信息 Controller
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 09aff01..0119eaf 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -84,7 +84,7 @@ public class SysUser extends BaseEntity
     })
     private SysDept dept;
 
-    private Integer teacher;//是否为任课教师 1是 0否
+    private Integer teacher;//是否为任课教练 1是 0否
 
     /** 角色对象 */
     private List<SysRole> roles;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourse.java
index 17ad310..aeb662e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourse.java
@@ -45,7 +45,7 @@ public class ScBookCourse implements Serializable {
     private int bookStatus;
 
     /**
-     * 学员id
+     * 会员id
      */
     @TableField("student_id")
     private Long studentId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourseLog.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourseLog.java
index 029764b..85fa8fb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourseLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScBookCourseLog.java
@@ -41,7 +41,7 @@ public class ScBookCourseLog implements Serializable {
     private Date updateTime;
 
     /**
-     * 学员id
+     * 会员id
      */
     @TableField("update_user_id")
     private Long updateUser;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java
index 245f10a..f809067 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTime.java
@@ -48,7 +48,7 @@ public class ScClaTime implements Serializable {
     private Long claId;
 
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
@@ -147,7 +147,7 @@ public class ScClaTime implements Serializable {
     @TableField("real_end_time")
     private String realEndTime;
     /**
-     * 老师获取的课时费
+     * 教练获取的课时费
      */
     @TableField("teacher_fee")
     private BigDecimal teacherFee;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java
index e1be015..821868b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeAttend.java
@@ -45,7 +45,7 @@ public class ScClaTimeAttend implements Serializable {
     private Long bookId;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_id")
     private Long studentId;
@@ -63,13 +63,13 @@ public class ScClaTimeAttend implements Serializable {
     private Long courseId;
 
     /**
-     * 上课教师
+     * 上课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
 
     /**
-     * 教师名
+     * 教练名
      */
     @TableField("teacher_name")
     private String teacherName;
@@ -87,7 +87,7 @@ public class ScClaTimeAttend implements Serializable {
     private String attendStatus;
 
     /**
-     * 教师获取课时费（未使用）
+     * 教练获取课时费（未使用）
      */
     @TableField("teacher_get_cla_fee")
     private BigDecimal teacherGetClaFee;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRule.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRule.java
index 6825f90..77f8f70 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRule.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRule.java
@@ -115,7 +115,7 @@ public class ScClaTimeRule implements Serializable {
     private Integer lessCnt;
 
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRuleVo.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRuleVo.java
index 90f3a09..26b31d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRuleVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeRuleVo.java
@@ -103,7 +103,7 @@ public class ScClaTimeRuleVo implements Serializable {
     @TableField("cla_duration")
     private Integer claDuration;
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeVo.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeVo.java
index 95aea71..c48cff6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScClaTimeVo.java
@@ -47,7 +47,7 @@ public class ScClaTimeVo implements Serializable {
     private String claId;
 
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java
index c255607..cb7dcd5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourse.java
@@ -114,6 +114,9 @@ public class ScCourse implements Serializable {
     @TableField("cla_fee")
     private BigDecimal claFee;
 
+    @TableField("tuition_fee")
+    private BigDecimal tuitionFee;
+
     @TableField(value = "depart_id", typeHandler = LongArrayTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
     private Long[]  departId;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseClaVo.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseClaVo.java
index 168d5dd..e5dace6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseClaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/ScCourseClaVo.java
@@ -85,13 +85,13 @@ public class ScCourseClaVo implements Serializable {
     private String recruitStatus;
 
     /**
-     * 每次上课学生扣除课时
+     * 每次上课会员扣除课时
      */
     @TableField("every_stu_lose_hour")
     private BigDecimal everyStuLoseHour;
 
     /**
-     * 每次上课教师获得课时
+     * 每次上课教练获得课时
      */
     @TableField("every_tea_get_hour")
     private BigDecimal everyTeaGetHour;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/course/ReqSearchScCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/course/ReqSearchScCourse.java
index 547ae4a..fdbd88a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/course/ReqSearchScCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/course/ReqSearchScCourse.java
@@ -42,7 +42,7 @@ public class ReqSearchScCourse extends ReqPageBase implements Serializable {
     private String chargeType;
 
     /**
-     * 学生 区分结果是否为续费
+     * 会员 区分结果是否为续费
      */
     private Long studentId;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/time/ReqSearchClaTime.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/time/ReqSearchClaTime.java
index 0d77c21..4ad060c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/time/ReqSearchClaTime.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/req/time/ReqSearchClaTime.java
@@ -29,7 +29,7 @@ public class ReqSearchClaTime implements Serializable {
     // 班级
     private String claId;
 
-    // 学生
+    // 会员
     private Long studentId;
 
     private Long teacherId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/course/RespSearchCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/course/RespSearchCourse.java
index 0d95bd0..747e493 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/course/RespSearchCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/course/RespSearchCourse.java
@@ -60,10 +60,11 @@ public class RespSearchCourse implements Serializable {
     private String courseIntro;
 
     /**
-     * 学生课程
+     * 会员课程
      */
     private Long studentCourseId;
 
     private BigDecimal claFee;//教练课时费
+    private BigDecimal tuitionFee;//课程价值
     private String storeNames;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeBookItem.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeBookItem.java
index cae7f76..9b44c48 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeBookItem.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeBookItem.java
@@ -52,7 +52,7 @@ public class ClaTimeBookItem {
 
     private String courseName;
 
-    //老师信息
+    //教练信息
     private Long teacherId;
     private String teacherName;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java
index b2b3593..3185ab3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/ClaTimeCalendarItem.java
@@ -33,6 +33,19 @@ public class ClaTimeCalendarItem {
 
     private int studentCount;
 
+    /**
+     * 最多预约人数
+     */
+
+    private Integer atClassCnt;
+
+
+    /**
+     * 最少开课人数
+     */
+
+    private Integer lessCnt;
+
     // 教室
     private String roomName;
 
@@ -54,6 +67,9 @@ public class ClaTimeCalendarItem {
         this.roomName = respClaTime.getRoomName();
         this.claColor = respClaTime.getClaColor();
         this.claTimeStatus = respClaTime.getStatus();
+        this.atClassCnt=respClaTime.getAtClassCnt();
+        this.lessCnt=respClaTime.getLessCnt();
+        this.studentCount=respClaTime.getStudentCount();
         return this;
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeAttend.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeAttend.java
index f3b0a2e..47aada7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeAttend.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeAttend.java
@@ -18,6 +18,8 @@ public class RespClaTimeAttend {
 
     private Long studentId;
 
+    private String cardNo;
+
     private String studentName;
 
     private String claName;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeCalendar.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeCalendar.java
index db47745..57be5af 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeCalendar.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeCalendar.java
@@ -46,7 +46,7 @@ public class RespClaTimeCalendar {
     private String claId;
 
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
@@ -131,51 +131,58 @@ public class RespClaTimeCalendar {
     @TableField("real_attend_cnt")
     private Integer realAttendCnt;
 
+
+
     /**
-     * 到课人数
+     * 最多预约人数
      */
     @TableField("at_class_cnt")
     private Integer atClassCnt;
 
 
+    /**
+     * 最少开课人数
+     */
+    @TableField("less_cnt")
+    private Integer lessCnt;
 
     /**
      * 备注
      */
-    @TableField("memo")
+
     private String memo;
 
     /**
      * 创建者
      */
-    @TableField("create_user")
+
     private Long createUser;
 
     /**
      * 创建时间
      */
-    @TableField("create_time")
+
     private Date createTime;
 
     /**
      * 更新者
      */
-    @TableField("last_update_user")
+
     private Long lastUpdateUser;
 
     /**
      * 更新时间
      */
-    @TableField("last_update_time")
+
     private Date lastUpdateTime;
 
-    @TableField(exist = false)
+
     private Long deptId;
-    @TableField(exist = false)
+
     private String courseName;
-    @TableField(exist = false)
+
     private String claName;
-    @TableField(exist = false)
+
     private String deptName;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeRule.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeRule.java
index ef32508..dfca153 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeRule.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/domain/resp/time/RespClaTimeRule.java
@@ -97,7 +97,7 @@ public class RespClaTimeRule {
     private String endTime;
 
     /**
-     * 任课教师
+     * 任课教练
      */
     @TableField("teacher_id")
     private Long teacherId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java
index 3825688..03c1431 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScClaTimeAttendMapper.java
@@ -30,9 +30,9 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map
     List<RespClaTimeAttend> selectTimeAttendList(@Param("reqSearchScClaTimeAttend") ReqSearchScClaTimeAttend reqSearchScClaTimeAttend, @Param("page") Page page);
 
     /**
-     * 学生出席记录数量
+     * 会员出席记录数量
      *
-     * @param studentCourseId 学生报读课程id
+     * @param studentCourseId 会员报读课程id
      * @param beginDate       开始时间
      * @param endDate         结束时间
      * @return
@@ -51,7 +51,7 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map
             , @Param("tenantId") String tenantId);
 
     /**
-     * 学生上课出席数量
+     * 会员上课出席数量
      *
      * @param beginDate
      * @param endDate
@@ -64,7 +64,7 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map
             , @Param("tenantId") String tenantId);
 
     /**
-     * 实消 学生消耗课时数量
+     * 实消 会员消耗课时数量
      *
      * @param beginDate
      * @param endDate
@@ -76,7 +76,7 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map
     BigDecimal selectMemberByDay( @Param("tenantId") String tenantId);
 
     /**
-     * 应消 学生消耗课时数量
+     * 应消 会员消耗课时数量
      *
      * @param beginDate
      * @param endDate
@@ -87,7 +87,7 @@ public interface ScClaTimeAttendMapper extends com.baomidou.mybatisplus.core.map
             , @Param("tenantId") String tenantId);
 
     /**
-     * 教师 指定日期范围内 累计获得课时
+     * 教练 指定日期范围内 累计获得课时
      * 只统计 课时，不统计按时间缴费的
      *
      * @param reqClaTimeCount
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseClaMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseClaMapper.java
index 91fcf94..4a58004 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseClaMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseClaMapper.java
@@ -55,7 +55,7 @@ public interface ScCourseClaMapper extends com.baomidou.mybatisplus.core.mapper.
     Integer selectTenantClaCount(String tenantId);
 
     /**
-     * 班级在读学员数量
+     * 班级在读会员数量
      * @param claId
      * @return
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseMapper.java
index d0a3656..08fd373 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/mapper/ScCourseMapper.java
@@ -31,7 +31,7 @@ public interface ScCourseMapper extends BaseMapper<ScCourse> {
 
     /**
      * 获取课程列表
-     * 包含学生当前课程状态
+     * 包含会员当前课程状态
      * @param reqSearchScCourse
      * @param page
      * @return
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java
index 345740a..cba96e6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeRuleService.java
@@ -116,7 +116,7 @@ public class BusinessClaTimeRuleService {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Integer bookCount= claTimeService.selectBookCount(claTimeRule.getRuleId(), claTimeRule.getClaId(),null);
         if(bookCount.intValue()>0){
-            return APIResponse.toExceptionResponse("无法修改：相关课表中有学员预约！");
+            return APIResponse.toExceptionResponse("无法修改：相关课表中有会员预约！");
         }
         // 教室
         if(null != claTimeRule.getRoomId()) {
@@ -147,11 +147,11 @@ public class BusinessClaTimeRuleService {
         }
         ScClaTimeRule claTimeRule = claTimeRuleService.getById(ruleId);
 
-        //是否有学员预约
+        //是否有会员预约
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Integer bookCount= claTimeService.selectBookCount(claTimeRule.getRuleId(), claTimeRule.getClaId(),null);
         if(bookCount.intValue()>0){
-            return APIResponse.toExceptionResponse("无法删除：相关课表中有学员预约！");
+            return APIResponse.toExceptionResponse("无法删除：相关课表中有会员预约！");
 
         }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java
index 8a71cc0..2cb822d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessClaTimeService.java
@@ -209,7 +209,7 @@ public class BusinessClaTimeService {
                 }
         }
         if (courseIds.isEmpty()){
-            return APIResponse.toExceptionResponse("学员名下无课程");
+            return APIResponse.toExceptionResponse("会员名下无课程");
         }
        reqSearchClaTime.setCourseIds(courseIds);
        return searchListForCalendar(reqSearchClaTime);
@@ -297,10 +297,10 @@ public class BusinessClaTimeService {
         ScCourseCla courseCla = claService.getById(claTime.getClaId());
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        //是否有学员预约
+        //是否有会员预约
         Integer bookCount= claTimeService.selectBookCount(null, null,claTime.getCourseTimeId());
         if(bookCount.intValue()>0){
-            return APIResponse.toExceptionResponse("无法修改：有学员预约，请联系学员取消预约后再作修改！");
+            return APIResponse.toExceptionResponse("无法修改：有会员预约，请联系会员取消预约后再作修改！");
 
         }
         UpdateWrapper uw = new UpdateWrapper();
@@ -343,10 +343,10 @@ public class BusinessClaTimeService {
         if ("2".equals(status)) {
             return APIResponse.toExceptionResponse("已上课,无法删除");
         }
-        //是否有学员预约
+        //是否有会员预约
         Integer bookCount= claTimeService.selectBookCount(null, null,claTime.getCourseTimeId().toString());
         if(bookCount.intValue()>0){
-            return APIResponse.toExceptionResponse("无法删除：相关课表中有学员预约，请联系学员取消预约后再进行操作！");
+            return APIResponse.toExceptionResponse("无法删除：相关课表中有会员预约，请联系会员取消预约后再进行操作！");
 
         }
         claTimeService.removeById(courseTimeId);
@@ -362,26 +362,26 @@ public class BusinessClaTimeService {
                 .in("book_status",0,1,2)
                 .eq("course_time_id",reqClaTimeAttend.getCourseTimeId())
         );
-        if (bookCourses.size()<1)throw new RuntimeException("无学员预约！");
+        if (bookCourses.size()<1)throw new RuntimeException("无会员预约！");
         //判断预约状态（未确认）
 //        Long needCheck= bookCourses.stream()
 //                .filter(l-> StrUtil.containsAny("0,1",l.getBookStatus()+"")).count();
 //        if (needCheck>0){
-//            return new RestResponse().setSuccess(false).setMessage("请检查学员预约状态！");
+//            return new RestResponse().setSuccess(false).setMessage("请检查会员预约状态！");
 //        }
 
-        //判断是否有学员未签到
+        //判断是否有会员未签到
         Long notCheckIn=bookCourses.stream().filter(l->l.getCheckIn()==0).count();
         if (notCheckIn>0){
-            return APIResponse.toExceptionResponse("请确认学员签到情况，如无法到课请联系学员取消预约！");
+            return APIResponse.toExceptionResponse("请确认会员签到情况，如无法到课请联系会员取消预约！");
         }
-        //签到学员
+        //签到会员
         List<ScBookCourse> checkIn=bookCourses.stream().filter(l->l.getCheckIn()==1).collect(Collectors.toList());
 
         ScClaTime claTime=claTimeMapper.selectById(reqClaTimeAttend.getCourseTimeId());
         //签到数量是否少于开课人数
         if (claTime.getLessCnt()>checkIn.size()){
-            return APIResponse.toExceptionResponse("学员数量到不到开课标准！");
+            return APIResponse.toExceptionResponse("会员数量到不到开课标准！");
         }
 
         //教室使用时间及费用
@@ -418,10 +418,10 @@ public class BusinessClaTimeService {
         claTime.setRealClaDate(reqClaTimeAttend.getRealClaDate());
         claTime.setRealStartTime(reqClaTimeAttend.getRealStartTime());
         claTime.setRealEndTime(reqClaTimeAttend.getRealEndTime());
-        claTime.setTeacherId(reqClaTimeAttend.getTeacherId());
-        claTime.setRoomId(reqClaTimeAttend.getRoomId());
+//        claTime.setTeacherId(reqClaTimeAttend.getTeacherId());
+//        claTime.setRoomId(reqClaTimeAttend.getRoomId());
         claTime.setMemo(reqClaTimeAttend.getMemo());
-        claTime.setClassTheme(reqClaTimeAttend.getClassTheme());
+//        claTime.setClassTheme(reqClaTimeAttend.getClassTheme());
         claTime.setVenueFee(venueFee);
         claTime.setRoomUsageTime(roomUsageTime);
         claTime.setStatus("2");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScClaTimeAttendService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScClaTimeAttendService.java
index 5dea06b..7fd20f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScClaTimeAttendService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScClaTimeAttendService.java
@@ -39,7 +39,7 @@ public class BusinessScClaTimeAttendService {
      */
     public RespPage<RespClaTimeAttend> searchList(ReqSearchScClaTimeAttend reqSearchScClaTimeAttend) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        //reqSearchScClaTimeAttend.setTenantId(loginUser.getNowTenantId());
+        reqSearchScClaTimeAttend.setTenantId(loginUser.getNowTenantId());
         RespPage<RespClaTimeAttend> page = new RespPage(reqSearchScClaTimeAttend.getPageNum(), reqSearchScClaTimeAttend.getPageSize());
         List<RespClaTimeAttend> attendList = attendMapper.selectTimeAttendList(reqSearchScClaTimeAttend, page);
         page.setRows(attendList);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java
index f5be613..be6d435 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseService.java
@@ -21,6 +21,8 @@ import com.ruoyi.school.course.domain.req.course.ReqSelect;
 import com.ruoyi.school.course.domain.resp.course.RespScCourseDetail;
 import com.ruoyi.school.course.domain.resp.course.RespSearchCourse;
 import com.ruoyi.school.course.mapper.ScCourseMapper;
+import com.ruoyi.school.member.domain.ScMemberCardCourses;
+import com.ruoyi.school.member.service.ScMemberCardCourseService;
 import com.ruoyi.system.service.impl.BusinessSysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * @author ：zhangbaoyu
@@ -64,7 +67,7 @@ public class BusinessScCourseService {
 
     /**
      * 查询课程列表
-     * 含有学生报读状态
+     * 含有会员报读状态
      *
      * @param reqSearchScCourse
      * @return
@@ -154,7 +157,7 @@ public class BusinessScCourseService {
         scCourse.setTenantId(loginUser.getNowTenantId());
         scCourse.setClaFee(reqAddScCourse.getClaFee());
         scCourse.setDepartId(reqAddScCourse.getPartCampus());
-
+        scCourse.setTuitionFee(reqAddScCourse.getTuitionFee());
         boolean addScCourse = scCourseService.save(scCourse);
 
         //默认班级
@@ -180,15 +183,16 @@ public class BusinessScCourseService {
         ScCourse updateCourse = new ScCourse();
         updateCourse.setCourseId(reqChangeScCourse.getCourseId());
         updateCourse.setCourseName(reqChangeScCourse.getCourseName());
-        updateCourse.setCourseTypeId(reqChangeScCourse.getCourseTypeId());
+//        updateCourse.setCourseTypeId(reqChangeScCourse.getCourseTypeId());
         updateCourse.setTeachingMode(reqChangeScCourse.getTeachingMode());
         updateCourse.setCourseIntro(reqChangeScCourse.getCourseIntro());
         updateCourse.setClaFee(reqChangeScCourse.getClaFee());
+        updateCourse.setTuitionFee(reqChangeScCourse.getTuitionFee());
         updateCourse.setLastUpdateUser(loginUser.getUserId());
         updateCourse.setLastUpdateTime(new Date());
         updateCourse.setTenantId(loginUser.getNowTenantId());
         updateCourse.setSale("1");
-        updateCourse.setDepartId(reqChangeScCourse.getPartCampus());
+//        updateCourse.setDepartId(reqChangeScCourse.getPartCampus());
         updateCourse.setImportId(-1L);
         boolean updateScCourse = scCourseService.updateById(updateCourse);
 
@@ -197,6 +201,8 @@ public class BusinessScCourseService {
 
     @Autowired
     private IScCourseClaService courseClaService;
+    @Autowired
+    private ScMemberCardCourseService cardCourseService;
     /**
      * 删除
      *
@@ -207,8 +213,8 @@ public class BusinessScCourseService {
         if (null == courseIds || courseIds.isEmpty()) {
             return APIResponse.toExceptionResponse(ApiResEnums.FAIL_WAIT_A_MINUTE);
         }
-//
-//        // 如课程对应在用班级，不允许删除
+
+        // 如课程对应在用班级，不允许删除
         QueryWrapper<ScCourseCla> qw = new QueryWrapper<>();
         qw.in("course_id", courseIds);
         int courseClaCount = courseClaService.count(qw);
@@ -216,7 +222,17 @@ public class BusinessScCourseService {
             return APIResponse.toExceptionResponse("该课程下存在在用班级,无法删除课程");
         }
 
-//
+        String arrayAsString = courseIds.stream()
+                .map(Object::toString) // 将Long转换为String
+                .collect(Collectors.joining(",")); // 使用逗号和空格连接字符串
+
+        //有对应的单独定义的会员卡项
+        int cardCourses= cardCourseService.count(new QueryWrapper<ScMemberCardCourses>()
+                .last(" where  JSON_CONTAINS(courses, CAST("+arrayAsString+" AS JSON))"));
+        if (cardCourses != 0) {
+            return APIResponse.toExceptionResponse("已有会员卡项使用,无法删除");
+        }
+
         boolean deleteScCourse = scCourseService.removeByIds(courseIds);
         if (deleteScCourse) {
             return APIResponse.toOkResponse();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseTypeService.java
index dc7da55..1c5e064 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/BusinessScCourseTypeService.java
@@ -116,6 +116,8 @@ public class BusinessScCourseTypeService {
         if (null == scCourseType.getCourseTypeId()) {
             return APIResponse.toExceptionResponse(ApiResEnums.FAIL_WAIT_A_MINUTE);
         }
+        //校区是否变更 对应班级的校区修改
+
         boolean updateScCourseType = scCourseTypeService.updateById(scCourseType);
         if (updateScCourseType) {
             return APIResponse.toOkResponse();
@@ -167,7 +169,7 @@ public class BusinessScCourseTypeService {
     /**
      * 变更是否开售
      *
-     * @param scCourse
+     * @param ScCourseType
      * @return
      */
     public APIResponse changeCourseTypeSale(ScCourseType scCourseType) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java
index f39b741..6662bb9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScClaTimeAttendService.java
@@ -17,7 +17,7 @@ import java.util.List;
 public interface IScClaTimeAttendService extends com.baomidou.mybatisplus.extension.service.IService<ScClaTimeAttend> {
 
     /**
-     * 学生报的的课程，指定日期 上课记录 数量
+     * 会员报的的课程，指定日期 上课记录 数量
      * @param studentCourseId
      * @param beginDate
      * @param endDate
@@ -52,7 +52,7 @@ public interface IScClaTimeAttendService extends com.baomidou.mybatisplus.extens
     BigDecimal getAttendCostHour(String beginDate, String endDate, boolean needAttend);
 
     /**
-     * 教师获得课时数量
+     * 教练获得课时数量
      * 只统计按课时收费
      *
      * @param reqClaTimeCount
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java
index 915cb31..4fb75d9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/IScCourseClaService.java
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IScCourseClaService extends IService<ScCourseCla> {
 
     /**
-     * 班级在读学员数量
+     * 班级在读会员数量
      * @param claId
      * @return
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java
index b2f4634..a8a4325 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/BusinessScCourseClaService.java
@@ -67,7 +67,7 @@ public class BusinessScCourseClaService {
     //
     public APIResponse searchCourseClaStudent(ReqSearchClaTime reqSearchClaTime){
         String courseTimeId=reqSearchClaTime.getCourseTimeId();
-        //预约的学员
+        //预约的会员
        List<RespCourseClaStudent> scStudentList= scCourseClaMapper.selectStudenForClaTime(courseTimeId);
         return APIResponse.toAPIResponse(scStudentList);
     }
@@ -166,7 +166,7 @@ public class BusinessScCourseClaService {
             scCourseClaVo.setDeptName(sysDept.getDeptName());
         }
 
-        // 教师
+        // 教练
         if (null != courseCla.getStaffId()) {
             SysUser staff = userService.selectUserById(courseCla.getStaffId());
             scCourseClaVo.setTeacherName(staff.getNickName());
@@ -201,13 +201,13 @@ public class BusinessScCourseClaService {
         ScCourseCla cla = scCourseCla.getScCourseCla(loginUser);
 
 
-        // 教师是否存在
+        // 教练是否存在
         SysUser teacher = userService.selectUserById(scCourseCla.getStaffId());
-        if (ObjectUtil.isNotEmpty(teacher)) {
-//            return APIResponse.toExceptionResponse("教师不存在,请重新选择后提交。");
-            cla.setTeacherName(teacher.getNickName());
-        }
+        if (ObjectUtil.isEmpty(teacher)) {
+            return APIResponse.toExceptionResponse("教练不存在,请重新选择后提交。");
 
+        }
+        cla.setTeacherName(teacher.getNickName());
 
         APIBaseResponse checkParam = cla.checkParam();
         if (!checkParam.isSuccess()) {
@@ -241,10 +241,10 @@ public class BusinessScCourseClaService {
             return APIResponse.toExceptionResponse("课程不存在,请重新选择后提交。");
         }
 
-        // 教师是否存在
+        // 教练是否存在
         SysUser teacher = userService.selectUserById(scCourseCla.getStaffId());
         if (null == teacher) {
-            return APIResponse.toExceptionResponse("教师不存在,请重新选择后提交。");
+            return APIResponse.toExceptionResponse("教练不存在,请重新选择后提交。");
         }
 
         // 修改课程，校验是否允许修改所属课程
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScCourseClaServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScCourseClaServiceImpl.java
index 367a668..5113743 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScCourseClaServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/course/service/impl/ScCourseClaServiceImpl.java
@@ -35,7 +35,7 @@ public class ScCourseClaServiceImpl extends ServiceImpl<ScCourseClaMapper, ScCou
 //        qw.eq("cla_id", claId);
 //        int count = studentCourseService.count(qw);
 //        if (count != 0) {
-//            return APIBaseResponse.fail("当前班级有报读学员,无法变更所属课程.");
+//            return APIBaseResponse.fail("当前班级有报读会员,无法变更所属课程.");
 //        }
 //
 //        QueryWrapper<ScClaTime> qwClaTime = new QueryWrapper<>();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/domain/resp/DashboardData.java b/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/domain/resp/DashboardData.java
index c878bcf..1168321 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/domain/resp/DashboardData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/dashboard/domain/resp/DashboardData.java
@@ -37,7 +37,7 @@ public class DashboardData {
     // 今日实消课时
     private BigDecimal todayRealCostHour;
 
-    // 学员数量
+    // 会员数量
     private Integer studentCnt;
 
     // 班级数量
@@ -46,7 +46,7 @@ public class DashboardData {
     // 课程数量
     private Integer courseCnt;
 
-    // 余额小于200元学员数量
+    // 余额小于200元会员数量
     private Integer feeWillExpireCnt;
 
     // 按期缴费 即将过期人数
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScStudent.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScStudent.java
index 423a819..b2ddb91 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScStudent.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/ScStudent.java
@@ -14,7 +14,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 学生基本信息
+ * 会员基本信息
  * </p>
  *
  * @author zhangby
@@ -28,7 +28,7 @@ public class ScStudent implements Serializable {
 
 
     /**
-     * 学生id
+     * 会员id
      */
     @TableId(value = "student_id", type = IdType.ASSIGN_ID)
     @JsonSerialize(using = ToStringSerializer.class)
@@ -48,7 +48,7 @@ public class ScStudent implements Serializable {
     private Long schoolId;
 
     /**
-     * 学生姓名
+     * 会员姓名
      */
     @TableField("student_name")
     private String studentName;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/req/ReqStudentSelect.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/req/ReqStudentSelect.java
index baf9186..9671b1f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/req/ReqStudentSelect.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/req/ReqStudentSelect.java
@@ -4,7 +4,7 @@ import com.ruoyi.common.page.ReqPageBase;
 import lombok.Data;
 
 /**
- * 学生 select
+ * 会员 select
  *
  * @author ：zhangbaoyu
  * @date ：Created in 2020-06-19 08:41
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/RespSearchStudent.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/RespSearchStudent.java
index 138ccd0..2cb915b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/RespSearchStudent.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/domain/resp/RespSearchStudent.java
@@ -10,7 +10,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 学生基本信息
+ * 会员基本信息
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScStudentMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScStudentMapper.java
index 3fed154..8167a8c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScStudentMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/mapper/ScStudentMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 学生基本信息 Mapper 接口
+ * 会员基本信息 Mapper 接口
  * </p>
  *
  * @author zhangby
@@ -25,21 +25,21 @@ public interface ScStudentMapper extends com.baomidou.mybatisplus.core.mapper.Ba
     List<RespSearchStudent> selectForSelect(@Param("studentSelect") ReqStudentSelect studentSelect, @Param("page") Page page);
 
     /**
-     * 全部学生
+     * 全部会员
      * @param reqSearchScStudent
      * @return
      */
     List<RespSearchStudent> selectAllStudent(ReqSearchScStudent reqSearchScStudent);
 
     /**
-     * 学员数量
+     * 会员数量
      * @param reqDeptCondition
      * @return
      */
 //    Integer selectStudentCount(ReqDeptCondition reqDeptCondition);
 
     /**
-     * 租户下学生数量
+     * 租户下会员数量
      * @param tenantId
      * @return
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java
index 9d00629..a8ec38f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardServiceImpl.java
@@ -147,17 +147,26 @@ public class ScMemberCardServiceImpl extends ServiceImpl<ScMemberCardMapper, ScM
 
         if (dto.getChargeType().equals("count")){
             card.setRemainingCount(card.getTotalCount());
-            card.setCountFee(card.getPrice().divide(card.getTotalCount()));
+            if (BigDecimal.ZERO.equals(card.getPrice())||BigDecimal.ZERO.equals(card.getTotalCount())){
+                card.setCountFee(new BigDecimal(0));
+            }else {
+                card.setCountFee(card.getPrice().divide(card.getTotalCount(),2, RoundingMode.HALF_UP));
+            }
+
         }
 
         if (dto.getChargeType().equals("total_fee")){
             card.setRemainingTotalFee(card.getTotalFee());
-            card.setDayFee(card.getPrice().divide(new BigDecimal(card.getTotalDays())));
+
         }
 
-//        if (dto.getChargeType().equals("days")){
-//            card.setRemainingDays(card.getTotalDays());
-//        }
+        if (dto.getChargeType().equals("days")){
+            if (BigDecimal.ZERO.equals(card.getPrice()) || BigDecimal.ZERO.equals(card.getTotalDays())) {
+                card.setDayFee(new BigDecimal(0));
+            }else {
+                card.setDayFee(card.getPrice().divide(new BigDecimal(card.getTotalDays()),2, RoundingMode.HALF_UP));
+            }
+        }
         // 设置默认到期日期（根据卡类型）
 //        if (card.getExpiryDate() == null && cardType.getValidDays() != null) {
 //            LocalDate activationDate = card.getActivationDate() != null ?
@@ -268,7 +277,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl<ScMemberCardMapper, ScM
             //判断预约状态
             //预约状态:0->预约中；1->教练确认；2->店长确认/预约成功/待上课 3->已取消;4- >已完成/待评价;5- >预约失败；
             if (StrUtil.containsAny("3,4,5",bookCourse.getBookStatus()+"")){
-                return APIResponse.toExceptionResponse("请检查学员预约状态！");
+                return APIResponse.toExceptionResponse("请检查会员预约状态！");
             }
 
             ScMemberCard memberCard=memberCardService.getOne(new QueryWrapper<ScMemberCard>()
@@ -291,7 +300,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl<ScMemberCardMapper, ScM
                 if (memberCard.getRemainingCount().compareTo(bookCourse.getDeductCnt())>-1){
                     addClaTimeAttend.setPayHour(bookCourse.getDeductCnt());
                     addClaTimeAttend.setCountBefore(memberCard.getRemainingCount());
-                    addClaTimeAttend.setPayFee(memberCard.getPrice().divide(memberCard.getTotalCount(),2, RoundingMode.HALF_UP));
+                    addClaTimeAttend.setPayFee(memberCard.getCountFee().multiply(bookCourse.getDeductCnt()));
                     BigDecimal  countAfter= memberCard.getRemainingCount().subtract(bookCourse.getDeductCnt());
                     addClaTimeAttend.setCountAfter(countAfter);
                     memberCard.setRemainingCount(countAfter);
@@ -312,6 +321,11 @@ public class ScMemberCardServiceImpl extends ServiceImpl<ScMemberCardMapper, ScM
                     return APIResponse.toExceptionResponse("会员卡剩余金额不足，请充值后重新预约！");
                 }
             }
+//            if (chargeType.equals("days")){
+//                addClaTimeAttend.setPayFee(memberCard.getDayFee());
+//
+//            }
+
             bookCourse.setUserId(SecurityUtils.getUserId());
             bookCourse.setCheckIn(1);
             bookCourse.setCheckInTime(new Date());
@@ -321,7 +335,7 @@ public class ScMemberCardServiceImpl extends ServiceImpl<ScMemberCardMapper, ScM
             claTime.setRealAttendCnt(claTime.getRealAttendCnt()+1);
             //上课记录
             addClaTimeAttend.setBookId(bookCourse.getId());
-            addClaTimeAttend.setMemberCardId(memberCard.getMemberId());
+            addClaTimeAttend.setMemberCardId(memberCard.getId());
             addClaTimeAttend.setCourseTimeId(courseTimeId);
             addClaTimeAttend.setStudentId(bookCourse.getStudentId());
             addClaTimeAttend.setClaId(claTime.getClaId());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java
index 695f67d..ebbab7f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/member/service/impl/ScMemberCardTypesServiceImpl.java
@@ -60,7 +60,7 @@ public class ScMemberCardTypesServiceImpl extends ServiceImpl<ScMemberCardTypesM
             List<ReqAddMemberChargeItem> list=cardChargeService.getByMemberId(l.getCardTypeId());
             l.setFeeModeHourList(list);
         }
-        //限制教师
+        //限制教练
         if (l.getRestrictedTeacher().equals("2") ){
             List<SysUser> users= userService.selectUserByIds(l.getTeacherList());
             String userNames= users.stream().map(SysUser::getNickName).collect(Collectors.joining(","));
@@ -84,7 +84,7 @@ public class ScMemberCardTypesServiceImpl extends ServiceImpl<ScMemberCardTypesM
         }
 
         if (null == studentId) {
-            return APIResponse.toExceptionResponse("请选择学员");
+            return APIResponse.toExceptionResponse("请选择会员");
         }
         ScMemberCardTypes memberCardType=this.getById(cardTypeId);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/ScOrder.java b/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/ScOrder.java
index 1d1d6b5..e74e1d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/ScOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/ScOrder.java
@@ -45,13 +45,13 @@ public class ScOrder implements Serializable {
     private String tenantId;
 
     /**
-     * 学员编号
+     * 会员编号
      */
     @TableField("student_id")
     private Long studentId;
 
     /**
-     * 学员名称
+     * 会员名称
      */
     @TableField("student_name")
     private String studentName;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/req/ReqSearchScOrder.java b/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/req/ReqSearchScOrder.java
index 8d1d836..f634272 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/req/ReqSearchScOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/order/domain/req/ReqSearchScOrder.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 public class ReqSearchScOrder extends ReqPageBase implements Serializable {
 
-    // 学员
+    // 会员
     private Long studentId;
 
     // 经办日期
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/controller/ScStudentAccountController.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/controller/ScStudentAccountController.java
index c98bd33..e634671 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/controller/ScStudentAccountController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/controller/ScStudentAccountController.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 学生账户
+ * 会员账户
  *
  * @author ：zhangbaoyu
  * @date ：Created in 2020/9/2 14:03
@@ -19,7 +19,7 @@ public class ScStudentAccountController {
     private BusinessScStudentAccountService accountService;
 
     /**
-     * 学生账户余额
+     * 会员账户余额
      *
      * @param studentId
      * @return
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqClaTimeAttendItem.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqClaTimeAttendItem.java
index 5d2609d..2f6491f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqClaTimeAttendItem.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqClaTimeAttendItem.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 @Data
 public class ReqClaTimeAttendItem {
 
-    // 学生
+    // 会员
     private Long studentCourseId;
 
     // 1：到课 2：请假 3：缺勤
@@ -20,7 +20,7 @@ public class ReqClaTimeAttendItem {
     // 备注
     private String memo;
 
-    // 学生消耗课时
+    // 会员消耗课时
     private BigDecimal stuLoseHour;
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourse.java
index 0d09326..06db2cf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourse.java
@@ -4,7 +4,7 @@ import com.ruoyi.common.page.ReqDeptCondition;
 import lombok.Data;
 
 /**
- * 查询学生报读的课程信息
+ * 查询会员报读的课程信息
  * @author ：zhangbaoyu
  * @date ：Created in 2020/10/8 22:03
  */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourseCla.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourseCla.java
index a530776..ad027e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourseCla.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqSearchStudentCourseCla.java
@@ -6,7 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 查询学生课程、班级
+ * 查询会员课程、班级
  * @author ：zhangbaoyu
  * @date ：Created in 2020-06-20 12:30
  */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqStudentCourseChooseCla.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqStudentCourseChooseCla.java
index a7af910..dcf7c6b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqStudentCourseChooseCla.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/req/ReqStudentCourseChooseCla.java
@@ -3,7 +3,7 @@ package com.ruoyi.school.student.domain.req;
 import lombok.Data;
 
 /**
- * 学生选择班级
+ * 会员选择班级
  * 报读课程未选择班级 选择班级
  *
  * @author ：zhangbaoyu
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespBusinessStudentMemberCardInfo.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespBusinessStudentMemberCardInfo.java
index bc49b12..091b39a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespBusinessStudentMemberCardInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespBusinessStudentMemberCardInfo.java
@@ -4,7 +4,7 @@ import lombok.Builder;
 import lombok.Data;
 
 /**
- * 学生报读课程信息
+ * 会员报读课程信息
  * @author ：zhangbaoyu
  * @date ：Created in 2020/9/2 15:48
  */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespCourseClaStudent.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespCourseClaStudent.java
index 377ed22..fb1256b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespCourseClaStudent.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespCourseClaStudent.java
@@ -8,8 +8,8 @@ import java.time.LocalDate;
 import java.util.Date;
 
 /**
- * 班级学员
- * 用于 班级下学生列表
+ * 班级会员
+ * 用于 班级下会员列表
  * @author ：zhangbaoyu
  * @date ：Created in 2020/9/28 16:51
  */
@@ -18,7 +18,7 @@ public class RespCourseClaStudent {
 
     private Long courseTimeId;
 
-    //学员信息
+    //会员信息
     private Long studentId;
 
     private String studentName;
@@ -72,7 +72,7 @@ public class RespCourseClaStudent {
 
 
 
-    //---------------- 签到成功的学员
+    //---------------- 签到成功的会员
 
     /**
      * 划扣前次数
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStuCourseSignUpStudent.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStuCourseSignUpStudent.java
index 083c44e..1684c65 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStuCourseSignUpStudent.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStuCourseSignUpStudent.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 学员报读列表
+ * 会员报读列表
  * @author ：zhangbaoyu
  * @date ：Created in 2020/12/21 20:28
  */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStudentCourse.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStudentCourse.java
index 981957d..df7a18a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStudentCourse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/domain/resp/RespStudentCourse.java
@@ -6,7 +6,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * 学生 报读 课程列表
+ * 会员 报读 课程列表
  * @author ：zhangbaoyu
  * @date ：Created in 2020/10/8 22:02
  */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/mapper/ScStudentAccountMapper.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/mapper/ScStudentAccountMapper.java
index dabed97..5c8fed0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/mapper/ScStudentAccountMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/mapper/ScStudentAccountMapper.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 学生余额账户 Mapper 接口
+ * 会员余额账户 Mapper 接口
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccount.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccount.java
index 3e4e004..08b67cb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccount.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccount.java
@@ -14,7 +14,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 学生余额账户
+ * 会员余额账户
  * </p>
  *
  * @author zhangby
@@ -35,7 +35,7 @@ public class ScStudentAccount implements Serializable {
     private Long accountId;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_id")
     private Long studentId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccountLog.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccountLog.java
index 76f01e1..8ff0ee2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccountLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/repo/model/ScStudentAccountLog.java
@@ -38,7 +38,7 @@ public class ScStudentAccountLog implements Serializable {
     private String accountId;
 
     /**
-     * 学生
+     * 会员
      */
     @TableField("student_id")
     private Long studentId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentAccountService.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentAccountService.java
index d568d8e..64bcf66 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentAccountService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentAccountService.java
@@ -19,7 +19,7 @@ public class BusinessScStudentAccountService {
     private IScStudentAccountService accountService;
 
     /**
-     * 学生账户信息
+     * 会员账户信息
      *
      * @param studentId
      * @return
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentService.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentService.java
index 4820f77..5b3a558 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/BusinessScStudentService.java
@@ -91,7 +91,7 @@ public class BusinessScStudentService {
     public APIResponse addScStudent(ScStudent scStudent) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
 
-        // 保存学生信息
+        // 保存会员信息
 
         insertAppUser(scStudent);
 
@@ -101,7 +101,7 @@ public class BusinessScStudentService {
         );
 
         if(i>0){
-            throw new RuntimeException("使用该手机号注册的学员已经存在，请勿重复添加！");
+            throw new RuntimeException("使用该手机号注册的会员已经存在，请勿重复添加！");
         }
 
         scStudent.setTenantId(SecurityUtils.getLoginUser().getNowTenantId());
@@ -147,12 +147,12 @@ public class BusinessScStudentService {
             );
 
             if(i>0){
-                throw new RuntimeException("使用该手机号注册的学员已经存在，请勿重复添加！");
+                throw new RuntimeException("使用该手机号注册的会员已经存在，请勿重复添加！");
             }
         }
 
 
-        // 更新学生信息
+        // 更新会员信息
         scStudent.setLastUpdateUser(loginUser.getUserId());
         scStudent.setLastUpdateTime(new Date());
         boolean updateScStudent = scStudentService.updateById(scStudent);
@@ -177,7 +177,7 @@ public class BusinessScStudentService {
         int studentCourseCount = memberCardService.count(new QueryWrapper<ScMemberCard>()
                 .in("member_id",  Arrays.asList(studentIds)));
         if (studentCourseCount != 0) {
-            return APIResponse.toExceptionResponse("学生已办理会员卡,无法删除");
+            return APIResponse.toExceptionResponse("会员已办理会员卡,无法删除");
         }
 
         boolean deleteScStudent = scStudentService.removeByIds(Arrays.asList(studentIds));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentAccountService.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentAccountService.java
index 5a3123e..c1f5e03 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentAccountService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentAccountService.java
@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 学生余额账户 服务类
+ * 会员余额账户 服务类
  * </p>
  *
  * @author zhangby
@@ -16,14 +16,14 @@ import java.math.BigDecimal;
 public interface IScStudentAccountService extends IService<ScStudentAccount> {
 
     /**
-     * 学生账户余额
+     * 会员账户余额
      * @param studentId
      * @return
      */
     BigDecimal selectStudentAccountBalance(Long studentId);
 
     /**
-     * 增加学生账户余额
+     * 增加会员账户余额
      * @param studentId
      * @param addBalance
      * @param userId
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentService.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentService.java
index f2c9658..8ad0578 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/IScStudentService.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * <p>
- * 学生基本信息 服务类
+ * 会员基本信息 服务类
  * </p>
  *
  * @author zhangby
@@ -23,9 +23,9 @@ public interface IScStudentService extends com.baomidou.mybatisplus.extension.se
     Long selectIdByName(String studentName);
 
     /**
-     * 学生列表
+     * 会员列表
      * @param max 最大数量
-     * @return 学生姓名、学生ID
+     * @return 会员姓名、会员ID
      */
     RespPage<ScStudent> selectStudentList(Integer max);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentAccountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentAccountServiceImpl.java
index 7543921..440fe4f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentAccountServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentAccountServiceImpl.java
@@ -13,7 +13,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 学生余额账户 服务实现类
+ * 会员余额账户 服务实现类
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentServiceImpl.java
index d64da0f..7441ef1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/school/student/service/impl/ScStudentServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * <p>
- * 学生基本信息 服务实现类
+ * 会员基本信息 服务实现类
  * </p>
  *
  * @author zhangby
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/columns/SysTeacher.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/columns/SysTeacher.java
index abbd56a..6454b88 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/columns/SysTeacher.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/columns/SysTeacher.java
@@ -19,8 +19,8 @@ public class SysTeacher extends BaseEntity
     /** 员工id */
     private Long userId;
 
-    /** 老师名称 */
-    @Excel(name = "老师名称")
+    /** 教练名称 */
+    @Excel(name = "教练名称")
     private String teacherName;
 
     /** 头像 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/colums/SysTeacherMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/colums/SysTeacherMapper.java
index 8dc219e..27eca16 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/colums/SysTeacherMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/colums/SysTeacherMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper.colums;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.columns.SysTeacher;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,5 +61,5 @@ public interface SysTeacherMapper
      * @param userIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSysTeacherByUserIds(Long[] userIds);
+    public int deleteSysTeacherByUserIds(@Param("userIds") List<Long> userIds);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/ISysTeacherService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/ISysTeacherService.java
index 831867c..56c5b9f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/ISysTeacherService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/ISysTeacherService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.columns;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.columns.SysTeacher;
 
@@ -51,7 +52,7 @@ public interface ISysTeacherService
      * @param userIds 需要删除的员工信息主键集合
      * @return 结果
      */
-    public int deleteSysTeacherByUserIds(Long[] userIds);
+    public AjaxResult deleteSysTeacherByUserIds(List<Long> userIds);
 
     /**
      * 删除员工信息信息
@@ -60,4 +61,6 @@ public interface ISysTeacherService
      * @return 结果
      */
     public int deleteSysTeacherByUserId(Long userId);
+
+    boolean isUsed(List<Long> userIds);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/impl/SysTeacherServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/impl/SysTeacherServiceImpl.java
index f0c3d60..d286d28 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/impl/SysTeacherServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/columns/impl/SysTeacherServiceImpl.java
@@ -1,6 +1,16 @@
 package com.ruoyi.system.service.columns.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.school.course.domain.ScClaTime;
+import com.ruoyi.school.course.domain.ScClaTimeRule;
+import com.ruoyi.school.course.domain.ScCourseCla;
+import com.ruoyi.school.course.service.IScClaTimeRuleService;
+import com.ruoyi.school.course.service.IScClaTimeService;
+import com.ruoyi.school.course.service.IScCourseClaService;
+import com.ruoyi.school.member.domain.ScMemberCardTypes;
+import com.ruoyi.school.member.service.ScMemberCardTypesService;
 import com.ruoyi.system.domain.columns.SysTeacher;
 import com.ruoyi.system.mapper.colums.SysTeacherMapper;
 import com.ruoyi.system.service.columns.ISysTeacherService;
@@ -9,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 员工信息Service业务层处理
@@ -22,6 +33,17 @@ public class SysTeacherServiceImpl implements ISysTeacherService
     @Autowired
     private SysTeacherMapper sysTeacherMapper;
 
+    @Autowired
+    private IScCourseClaService claService;
+    @Autowired
+    private IScClaTimeRuleService claTimeRuleService;
+    @Autowired
+    private ScMemberCardTypesService cardTypesService;
+
+    @Autowired
+    private IScClaTimeService claTimeService;
+
+
     /**
      * 查询员工信息
      *
@@ -47,7 +69,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService
     }
 
     /**
-     * 未生成教师简介的，教师员工
+     * 未生成教练简介的，教练员工
      * @param sysTeacher
      * @return
      */
@@ -90,9 +112,14 @@ public class SysTeacherServiceImpl implements ISysTeacherService
      * @return 结果
      */
     @Override
-    public int deleteSysTeacherByUserIds(Long[] userIds)
+    public AjaxResult deleteSysTeacherByUserIds(List<Long> userIds)
     {
-        return sysTeacherMapper.deleteSysTeacherByUserIds(userIds);
+
+        if (isUsed(userIds)){
+            return AjaxResult.error("该教练已经排课，或在会员卡项中被单独定义，无法删除！");
+        }
+        sysTeacherMapper.deleteSysTeacherByUserIds(userIds);
+        return AjaxResult.success();
     }
 
     /**
@@ -104,6 +131,35 @@ public class SysTeacherServiceImpl implements ISysTeacherService
     @Override
     public int deleteSysTeacherByUserId(Long userId)
     {
+
         return sysTeacherMapper.deleteSysTeacherByUserId(userId);
     }
+
+
+
+    public boolean isUsed(List<Long> userIds){
+        int claCount=claService.count(new QueryWrapper<ScCourseCla>().in("staff_id", userIds));
+        if (claCount>0 ){
+            return true;
+        }
+        int timeRuleCount=claTimeRuleService.count(new QueryWrapper<ScClaTimeRule>().in("teacher_id",userIds));
+        if (timeRuleCount>0 ){
+            return true;
+        }
+        String arrayAsString = userIds.stream()
+                .map(Object::toString) // 将Long转换为String
+                .collect(Collectors.joining(",")); // 使用逗号和空格连接字符串
+        int cardTypesCount=cardTypesService.count(new QueryWrapper<ScMemberCardTypes>()
+                .last(" and JSON_CONTAINS(teacher_list, CAST("+arrayAsString+" AS JSON))")
+        );
+        if (cardTypesCount>0 ){
+            return true;
+        }
+        int claTimeCount=claTimeService.count(new QueryWrapper<ScClaTime>().in("teacher_id",userIds));
+        if (claTimeCount>0 ){
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
index 3cc9e22..e47f551 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
@@ -242,10 +242,10 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
                 return RestResponse.failure(dbTenant.getTenantName() + ",此租户信息不允许删除");
             }
 
-            // 是否有学生/课程/班级
+            // 是否有会员/课程/班级
            int contentCount = baseMapper.tenantHaveContent(tenantId);
             if (contentCount > 0) {
-                return RestResponse.failure("租户下有学员,无法删除");
+                return RestResponse.failure("租户下有会员,无法删除");
             }
         }
         String joinedString = String.join(",", tenantIds);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 9ffc8eb..4ce2efb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -13,12 +13,14 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.AppUser;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.domain.columns.SysTeacher;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.YjAppUserService;
+import com.ruoyi.system.service.columns.ISysTeacherService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -56,6 +59,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private YjAppUserService appUserService;
 
+    @Autowired
+    private ISysTeacherService teacherService;
+
     /**
      * 根据条件分页查询用户列表
      *
@@ -229,9 +235,20 @@ public class SysUserServiceImpl implements ISysUserService
         insertUserRole(user);
         //新增app用户
         insertAppUser(user);
+        //关联teacher表
+        Long[] roles = user.getRoleIds();
+        if (Arrays.stream(roles)
+                .anyMatch(new Long(104)::equals)){
+            SysTeacher teacher=new SysTeacher();
+            teacher.setUserId(user.getUserId());
+            teacher.setTeacherName(user.getNickName());
+            teacherService.insertSysTeacher(teacher);
+        }
         return rows;
     }
 
+
+
     //关联app账号
     public void insertAppUser(SysUser user){
         AppUser appUser=appUserService.getOne(new QueryWrapper<AppUser>().eq("phone_number",user.getPhonenumber()));
@@ -287,7 +304,32 @@ public class SysUserServiceImpl implements ISysUserService
     public int updateUser(SysUser user)
     {
         Long userId = user.getUserId();
-        // 删除用户与角色关联
+        // 修改用户与教练表关联
+        // 1.是否原为教练
+        int dbHasTeacherRole= userRoleMapper.countRoleAndUserId(new Long(104),userId);
+        Long[] roles = user.getRoleIds();
+        //2.新权限中是否含有教练角色
+        if (Arrays.stream(roles)
+            .anyMatch(new Long(104)::equals)){
+            //3.新增有教练角色，判断原有角色是否包含教练
+            if (dbHasTeacherRole<1){
+                //3.1.原来没有，则新增教练表数据
+                SysTeacher teacher=new SysTeacher();
+                teacher.setUserId(userId);
+                teacher.setTeacherName(user.getNickName());
+                teacherService.insertSysTeacher(teacher);
+            }
+        }else {
+            //4.新增无教练角色，判断原有角色是否包含教练
+            if (dbHasTeacherRole>0 ){
+                //4.1原来有，则判断教练表数据是否被使用
+                if (teacherService.isUsed(Arrays.asList(userId))){
+                    throw new RuntimeException("该员工作为教练已经排课，或在会员卡项中被单独定义，无法删除教练角色！");
+                }else {
+                    teacherService.deleteSysTeacherByUserId(userId);
+                }
+            }
+        }
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
         insertUserRole(user);
@@ -308,6 +350,28 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public void insertUserAuth(Long userId, Long[] roleIds)
     {
+        // 1.是否原为教练  2.是 校验是否被使用
+        int dbHasTeacherRole= userRoleMapper.countRoleAndUserId(new Long(104),userId);
+        if (Arrays.stream(roleIds)
+                .anyMatch(new Long(104)::equals)){
+            //关联teacher表 新增的教练权限
+            if (dbHasTeacherRole<1){
+                SysTeacher teacher=new SysTeacher();
+                teacher.setUserId(userId);
+                teacher.setTeacherName(this.selectUserById(userId).getNickName());
+                teacherService.insertSysTeacher(teacher);
+            }
+        }else {
+            if (dbHasTeacherRole>0 ){
+                if (teacherService.isUsed(Arrays.asList(userId))){
+                    throw new RuntimeException("该员工作为教练已经排课，或在会员卡项中被单独定义，无法删除教练角色！");
+                }else{
+                    teacherService.deleteSysTeacherByUserId(userId);
+                }
+            }
+
+
+        }
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
@@ -405,6 +469,7 @@ public class SysUserServiceImpl implements ISysUserService
 
 
 
+
     /**
      * 新增用户角色信息
      *
@@ -452,10 +517,23 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int deleteUserByIds(Long[] userIds)
     {
-        //取消与app登录用户的关联
+
         for (Long userId : userIds)
         {
+            // 1.是否原为教练  2.是 校验是否被使用
+            int dbHasTeacherRole= userRoleMapper.countRoleAndUserId(new Long(104),userId);
+            if (dbHasTeacherRole>0 ){
+                if (teacherService.isUsed(Arrays.asList(userId))){
+                    throw new RuntimeException("该员工作为教练已经排课，或在会员卡项中被单独定义，无法删除！");
+                }
+                //关联teacher 表
+                if (ObjectUtil.isNotEmpty(teacherService.selectSysTeacherByUserId(userId))){
+                    teacherService.deleteSysTeacherByUserId(userId);
+                }
+            }
+
             checkUserAllowed(new SysUser(userId));
+            //取消与app登录用户的关联
             removeAppUserManager(userId);
         }
         // 删除用户与角色关联
diff --git a/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml b/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml
index 102394a..4f4a4e3 100644
--- a/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/colums/SysTeacherMapper.xml
@@ -119,9 +119,9 @@ introduce},</if>
         delete from sys_teacher where user_id = #{userId}
     </delete>
 
-    <delete id="deleteSysTeacherByUserIds" parameterType="String">
+    <delete id="deleteSysTeacherByUserIds" parameterType="arraylist">
         delete from sys_teacher where user_id in
-        <foreach item="userId" collection="array" open="(" separator="," close=")">
+        <foreach item="userId" collection="userIds" open="(" separator="," close=")">
             #{userId}
         </foreach>
     </delete>
diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml
index b7ab702..adf25bc 100644
--- a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeAttendMapper.xml
@@ -3,8 +3,14 @@
 <mapper namespace="com.ruoyi.school.course.mapper.ScClaTimeAttendMapper">
 
     <select id="selectTimeAttendList" resultType="com.ruoyi.school.course.domain.resp.time.RespClaTimeAttend">
-        select cta.attend_id,s.student_id,s.student_name,cta.charge_type,
-               cta.teacher_id,cta.teacher_name,cta.attend_status,cta.pay_hour,cta.pay_fee,
+        select cta.attend_id,s.student_id,s.student_name,
+               (select card_no from sc_member_cards where sc_member_cards.id=cta.member_card_id) as card_no,
+               cta.charge_type,
+               cta.teacher_id,
+               cta.teacher_name,
+               cta.attend_status,
+               cta.pay_hour,
+               cta.pay_fee,
                cta.memo,
                ct.real_cla_date,ct.real_start_time,ct.real_end_time,cta.create_time,
                scc.cla_name
@@ -31,11 +37,6 @@
         <if test="reqSearchScClaTimeAttend.deptId != null">
             and scc.depart_id=#{reqSearchScClaTimeAttend.deptId}
         </if>
-        <if test="reqSearchScClaTimeAttend.deptId == null and reqSearchScClaTimeAttend.userId != null and reqSearchScClaTimeAttend.userId != ''">
-            and exists(select 1 from sys_user_dept ud
-            where ud.user_id=#{reqSearchScClaTimeAttend.userId}
-            and (ud.dept_id=scc.depart_id or ud.dept_id=-1))
-        </if>
         order by cta.attend_id desc
     </select>
     <select id="selectStudentAttendCount" resultType="int">
diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeMapper.xml
index 09fafe9..90886c7 100644
--- a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeMapper.xml
@@ -7,8 +7,9 @@
                b.cla_id,
                b.cla_date,
                WEEKDAY(b.cla_date) + 1 as week_day,
-               hour(b.start_time) as start_hour,b.start_time,
-               b.end_time,
+               hour(b.start_time) as start_hour,
+                b.start_time,
+                b.end_time,
                 b.source,
                 b.status,
                 b.memo,
@@ -16,13 +17,17 @@
                 a.cla_name,
                 a.cla_color,
                 course.course_name,
-               s.user_id as teacher_id,
+                s.user_id as teacher_id,
                 s.nick_name as staff_name,
-               r.room_id,r.room_name
+                r.room_id,
+                r.room_name,
+                b.book_attend_cnt as student_count,
+                b.less_cnt,
+                b.at_class_cnt
 
         from sc_course_cla a
                 left join sc_course course on a.course_id=course.course_id
-           ,sc_cla_time b
+             ,sc_cla_time b
                left join sys_user s on b.teacher_id = s.user_id
                left join sc_room r on b.room_id = r.room_id
         where a.cla_id=b.cla_id and course.tenant_id=#{tenantId}
diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeRuleMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeRuleMapper.xml
index df4deef..0ca6bd3 100644
--- a/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeRuleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/school/course/ScClaTimeRuleMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.ruoyi.school.course.mapper.ScClaTimeRuleMapper">
 
     <select id="selectByCondition" resultType="com.ruoyi.school.course.domain.resp.time.RespClaTimeRule">
-        select b.*,fcn_dict_name_list(b.week_day,'week_day') as week_day_name,
+        select b.*,
+               fcn_dict_name_list(b.week_day,'week_day') as week_day_name,
                a.cla_name,c.course_name,d.nick_name staff_name
         from sc_course_cla a, sc_cla_time_rule b, sc_course c, sys_user d
         where a.cla_id = b.cla_id and a.course_id=c.course_id and b.teacher_id=d.user_id and a.tenant_id=#{reqSearchScClaTimeRule.tenantId}
diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScCourseClaMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScCourseClaMapper.xml
index a3fe788..ebe607c 100644
--- a/ruoyi-system/src/main/resources/mapper/school/course/ScCourseClaMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/school/course/ScCourseClaMapper.xml
@@ -11,9 +11,9 @@
             sd.dept_name,
             (select group_concat(fcn_dict_name_list(r.week_day,'week_day'),' ',substr(r.start_time,1,5),'~',substr(r.end_time,1,5),' (',r.begin_date,'~',r.end_date,')' SEPARATOR ';')
                 from sc_cla_time_rule r
-                where a.cla_id=r.cla_id
+                where r.cla_id=a.cla_id
                   and r.rule_type='1'
-                  and repeat_type in ('1','3')
+                  and r.repeat_type in ('1','3')
                   and (date_format(now(),'%Y-%m-%d') between r.begin_date and r.end_date or date_format(now(),'%Y-%m-%d') <![CDATA[ < ]]> r.begin_date)) as week_day
         from sc_course_cla a
             left join sc_course b on a.course_id=b.course_id
@@ -31,11 +31,6 @@
         <if test="reqSearchScCourseCla.departId != null">
             and a.depart_id=#{reqSearchScCourseCla.departId}
         </if>
-        <if test="reqSearchScCourseCla.deptId == null and reqSearchScCourseCla.userId != null and reqSearchScCourseCla.userId != ''">
-            and exists(select 1 from sys_user_dept ud
-            where ud.user_id=#{reqSearchScCourseCla.userId}
-            and (ud.dept_id=a.depart_id or ud.dept_id=-1))
-        </if>
         and a.delete_flag='0'
         order by a.create_time desc
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/school/course/ScCourseMapper.xml b/ruoyi-system/src/main/resources/mapper/school/course/ScCourseMapper.xml
index a97dce4..183b47b 100644
--- a/ruoyi-system/src/main/resources/mapper/school/course/ScCourseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/school/course/ScCourseMapper.xml
@@ -16,7 +16,8 @@
                 a.create_time,
                a.sale,
                a.course_intro,
-               a.cla_fee
+               a.cla_fee,
+               a.tuition_fee
         from sc_course a
                  left join sc_course_type b on a.course_type_id = b.course_type_id and b.in_use='1'
         where a.delete_flag='0' and a.tenant_id=#{reqSearchScCourse.tenantId}
@@ -37,6 +38,7 @@
         </if>
         order by a.sale desc,a.create_time desc
     </select>
+
     <select id="selectCourseListWithStudentCourse" resultType="com.ruoyi.school.course.domain.resp.course.RespSearchCourse">
         select a.course_id,
                a.course_name,