新增e2e测试脚本，修复部分问题

更新会员端个人页面中团课签到记录显示
新增教练端，实现业务闭环：会员登录注册→查询团课→预约团课→扫码签到→教练端开课→记录实际开课时间→教练端结课→记录实际结课时间→后台查询数据
2026-07-22 20:00:13 +08:00 · 2026-07-20 17:27:22 +08:00 · 2026-07-20 17:21:28 +08:00 · 2026-07-19 19:02:10 +08:00 · 2026-07-18 16:21:40 +08:00 · 2026-07-17 16:37:59 +08:00
607 changed files with 53698 additions and 39811 deletions
@@ -0,0 +1,82 @@
+# AGENT.md
+
+> 面向 AI 代理的健身房管理系统开发工作流指南。
+>
+> 项目子模块：`gym-manage-api`（Java 多模块后端）、`gym-manage-web`（Vue3 管理后台）、`gym-manage-uniapp`（会员端小程序）、`gym-manage-coach-uniapp`（教练端小程序）
+
+---
+
+## 服务工作端口
+
+| 服务 | 端口 | 说明 |
+|------|------|------|
+| Gateway | 8080 | API 网关，路由 `/api/**` → localhost:8084 |
+| App | 8084 | 主应用服务，Swagger: `http://localhost:8084/swagger-ui.html` |
+| Frontend Dev | 3002 | Vite 开发服务器 (`pnpm dev`) |
+| PostgreSQL | 55432 | 数据库，`manage_system` / `novalon` / `novalon123` |
+| Redis | 6379 | 缓存 |
+
+---
+
+## 工作流
+
+### 1. `/grill-with-docs` — 需求梳理
+
+启动需求澄清流程，通过迭代问答将模糊需求转化为清晰、文档化的共识。
+
+- 识别需求中的模糊点与歧义，以问答形式逐一澄清
+- 澄清过程中产生的新领域术语 / 修正定义，**即时同步到** [gym-manage-api/CONTEXT.md](gym-manage-api/CONTEXT.md)
+- 重要架构决策（满足：难以逆转 + 不记录会令人困惑 + 存在真实权衡）写入 [gym-manage-api/docs/adr/](gym-manage-api/docs/adr/)
+- 输出：需求共识 spec 文档，存放于 `docs/superpowers/specs/`，格式沿用现有 spec 模板（文档版本/日期/作者/状态 → 项目概况 → 设计方案）
+
+### 2. `/to-prd` — 生成 PRD
+
+将 `/grill-with-docs` 澄清后的需求转化为结构化产品需求文档。
+
+- 沿袭 `docs/superpowers/specs/` 现有文档格式
+- 输出存放于 `docs/superpowers/specs/`
+
+### 3. `/to-issues` — 任务拆解
+
+将 PRD 拆解成可执行的具体任务。
+
+- **按端到端功能拆解**（每个 issue 覆盖完整功能链路：API + Web + UniApp）
+- 格式沿袭 `docs/superpowers/plans/` 现有模板（含 AI 代理指令头、阶段化任务清单、文件结构）
+- 输出存放于 `docs/superpowers/plans/`
+
+### 4. `/test-driven-development` — 测试驱动开发
+
+TDD 全栈覆盖，按 issue 逐个实现。每个 TDD 循环完成后 `git commit`。
+
+**循环**：Red（写失败测试）→ Green（最小实现）→ Refactor（重构优化）
+
+**测试层次与命令**：
+
+| 层 | 子项目 | 框架 | 命令 |
+|----|--------|------|------|
+| 后端单元/集成 | `gym-manage-api` | JUnit 5 | `cd gym-manage-api && mvn test` |
+| Web 前端单元 | `gym-manage-web` | vitest | `cd gym-manage-web && pnpm test` |
+| Web E2E | `gym-manage-web` | Playwright | `cd gym-manage-web && pnpm test:e2e` |
+| UniApp 单元 | `gym-manage-uniapp` / `gym-manage-coach-uniapp` | vitest | 首次涉及时先搭建测试基础设施，再正常 TDD |
+
+**首次涉及 UniApp 端时**：先为该子项目配置 vitest + @vue/test-utils，搭建完成后进入 Red-Green-Refactor。
+
+### 5. `/systemic-debugging` — 系统化诊断
+
+遇到棘手 Bug 时进行系统化诊断：收集日志 → 提出假设 → 插桩验证 → 定位根因 → 修复 → 回归验证。
+
+**诊断入口速查**：
+
+| 问题类型 | 排查入口 |
+|----------|----------|
+| 后端 API 错误 | Gateway 控制台日志、App 控制台日志（日志级别 DEBUG，输出至 stdout） |
+| 数据库问题 | `psql -U novalon -d manage_system -p 55432` |
+| Web 前端错误 | 浏览器 DevTools Console + Network 标签 |
+| E2E 测试失败 | Playwright HTML Report，查看失败截图与 trace |
+| UniApp 小程序错误 | 微信开发者工具控制台（`urlCheck: false` 已关闭 URL 校验） |
+| Docker 环境 | `docker-compose logs -f backend` / `frontend` / `postgres` |
+
+**直接数据库查询**：
+```bash
+psql -U novalon -d manage_system -p 55432 -c "SELECT * FROM table_name LIMIT 10;"
+```
@@ -0,0 +1,143 @@
+# Gym Manage - 健身房管理系统
+
+一个面向健身房的多端业务管理系统：后台管理 Web 端（管理员/员工）、会员端小程序（微信小程序）、教练端小程序（微信小程序），共享同一 SpringBoot 后端。
+
+## Language
+
+### 系统管理 (System)
+
+**用户 (User)**:
+拥有登录凭据的系统账号，可被分配一个或多个角色，通过角色获得操作权限。
+_Avoid_: 账号、员工、管理员
+
+**角色 (Role)**:
+一组权限的集合体。用户通过被分配角色来间接获得权限。角色包含角色编码（唯一标识）和权限树配置。
+_Avoid_: 权限组、岗位
+
+**菜单 (Menu)**:
+前端页面的导航入口树。菜单可嵌套，与权限绑定后控制用户可见的页面和按钮。
+_Avoid_: 导航、路由
+
+**数据字典 (Dict Type / Dict Data)**:
+"类型-数据项"两级结构。Dict Type 定义字段类别（如"课程状态"），Dict Data 定义具体枚举值（如"待开始"、"进行中"）。
+_Avoid_: 枚举、配置项
+
+**系统配置 (System Config)**:
+系统运行时的键值对参数，如上传文件大小限制、默认分页条数等。
+_Avoid_: 设置、参数
+
+### 审计 (Audit)
+
+**操作日志 (Operation Log)**:
+记录用户在系统中的所有操作（创建/修改/删除），包含操作人、操作模块、操作时间、IP 地址。
+_Avoid_: 行为日志、活动记录
+
+**登录日志 (Login Log)**:
+记录所有的登录/登出事件，包含成功/失败状态和原因。
+_Avoid_: 认证记录、会话日志
+
+**异常日志 (Exception Log)**:
+系统运行时的未捕获异常记录，包含堆栈信息、请求路径。
+_Avoid_: 错误日志、故障记录
+
+### 通知 (Notification)
+
+**公告 (Notice)**:
+管理员发布的系统级通知，展示给所有用户。
+_Avoid_: 消息、通知
+
+**轮播图 (Banner)**:
+首页顶部轮播的推广图片，可配置跳转链接和生效时间。
+_Avoid_: 广告、幻灯片
+
+### 会员 (Member)
+
+**会员 (Member)**:
+在系统中注册的健身用户，可通过微信小程序登录认证。拥有会员卡、储值卡等资产。
+_Avoid_: 客户、用户、消费者
+
+**会员卡类型 (Member Card Type)**:
+预定义的会员卡模板，包含名称、时长（天）、价格、权益描述。
+_Avoid_: 卡种、套餐
+
+**会员卡记录 (Member Card Record)**:
+会员购买特定会员卡类型的实例，有生效期、失效期、使用次数等生命周期数据。
+_Avoid_: 购卡记录、会员资格
+
+**储值卡 (Stored Card)**:
+会员的预充值余额账户，用于消费支付。有支付密码保护。
+_Avoid_: 余额、钱包
+
+### 团课 (Group Course)
+
+**团课 (Group Course)**:
+由教练带领多名会员参加的集体健身课程。有类型、标签、时间、地点、人数上限、教练等属性。
+_Avoid_: 课程、班级、大课
+
+**课程类型 (Course Type)**:
+团课的分类体系，如"瑜伽"、"动感单车"、"搏击操"。
+_Avoid_: 课程分类
+
+**课程标签 (Course Label)**:
+团课的附加标签，用于搜索和推荐，可多个标签叠加。
+_Avoid_: 标签、标记
+
+**预约 (Booking)**:
+会员对某节团课的报名操作。预约后可取消，超时不可取消。
+_Avoid_: 报名、预定、登记
+
+**签到 (Check-In)**:
+会员到达上课地点后确认到场的操作。通过扫描教练展示的二维码完成。
+_Avoid_: 打卡、签到
+
+**签到二维码 (Check-In QR Code)**:
+教练端生成的限时二维码，会员扫描后完成签到。有时效性和防伪造机制。
+_Avoid_: 签到码
+
+**课程推荐 (Course Recommend)**:
+系统管理员手动指定的精选课程列表，在会员端首页展示。
+_Avoid_: 热门课程、精选
+
+### 教练 (Coach)
+
+**教练 (Coach)**:
+可开设和带领团课的人员。关联课程列表、违规记录。
+_Avoid_: 私教、指导员、讲师
+
+**开课 (Start Course / Open Course)**:
+教练到上课时间后点击"开始上课"将课程状态从"待开始"变为"进行中"。
+_Avoid_: 开始上课、启动课程
+
+**结课 (End Course)**:
+教练下课后点击"结束课程"将课程状态从"进行中"变为"已完成"。
+_Avoid_: 下课、完成课程
+
+**违规记录 (Violation)**:
+教练的违规行为记录，如迟到、早退、未开课等。
+_Avoid_: 处罚记录、违纪
+
+### 数据统计 (Statistics)
+
+**数据统计 (Data Statistics)**:
+系统仪表盘数据，包含会员增长趋势、预约率、签到率、收入等维度的图表和汇总数据。
+_Avoid_: 报表、分析
+
+**教练业绩 (Coach Performance)**:
+按教练维度的教学数据排行和明细，包含开课次数、学员人次、出勤率等。
+_Avoid_: 教练评分、教练排名
+
+### 支付 (Payment)
+
+**汇付支付 (Huifu Payment)**:
+通过汇付天下聚合支付平台完成的支付流程，包含创建订单、支付回调、退款。
+_Avoid_: 微信支付、支付宝
+
+### 认证 (Auth)
+
+**JWT Token**:
+JSON Web Token，用户登录后获取的身份凭证，所有 API 请求需在 Authorization header 携带。有过期时间。
+_Avoid_: 令牌、会话
+
+**签名 (Signature)**:
+API 请求的防篡改签名参数，由请求体 + 时间戳 + 密钥生成。
+_Avoid_: 校验码
@@ -0,0 +1 @@
+{"code":404,"message":"No static resource files/30/preview.","timestamp":"2026-07-22T18:27:23.0606736"}
@@ -0,0 +1,106 @@
+# 全面端到端测试报告
+
+## 测试概要
+
+| 项目 | 值 |
+|------|-----|
+| 测试时间 | 2026-07-22T10:36:09.900Z ~ 2026-07-22T10:36:11.075Z |
+| 总步骤数 | 14 |
+| 通过 | 14 |
+| 失败 | 0 |
+| 课程ID | 33 |
+| 课程名称 | 全流程测试-mrvy5z1v |
+| 二维码路径 | D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\全流程测试_mrvy5z1v.png |
+| API地址 | http://192.168.110.64:8084 |
+
+## 测试范围
+
+| 模块 | 项目 | 测试内容 |
+|------|------|----------|
+| 后台管理系统 | `gym-manage-web` | 管理员登录、创建团课（无封面、张教练）、修改团课时间、保存二维码 |
+| 会员端 | `gym-manage-uniapp` | 会员登录、预约团课、扫码签到 |
+| 教练端 | `gym-manage-coach-uniapp` | 教练登录、手动开课、手动结课 |
+| 后端API | `gym-manage-api` | 所有操作通过REST API完成 |
+
+## 业务规则验证
+
+| 规则 | 条件 | 测试策略 |
+|------|------|----------|
+| 预约时间限制 | 需在开课前 >= 30分钟 | 创建课程startTime为5小时后，预约成功 |
+| 签到时间窗口 | 开课前2小时 ~ 课程结束 | 调整startTime为1小时后，签到成功 |
+| 教练开课 | 开课时间后10分钟内正常开课 | 调整startTime为3分钟前，开课成功 |
+| 教练结课 | 结束时间后10分钟内结课 | 调整endTime为2分钟前，结课 |
+
+## 测试流程
+
+```
+1. Admin: Login -> Get coach list -> Create course -> Save QR code
+2. Member: Login -> Book course
+3. Admin: Adjust startTime (for sign-in window)
+4. Member: Sign in (scan QR)
+5. Admin: Adjust startTime to past (for coach start)
+6. Coach: Login -> Start course
+7. Admin: Adjust endTime to past (for coach end)
+8. Coach: End course
+```
+
+## 详细步骤结果
+
+| # | 步骤 | 状态 | 详情 | 时间 |
+|---|------|------|------|------|
+| 1 | 1a. 管理员登录 | PASS | admin / userId=1 | 2026-07-22T10:36:10.260Z |
+| 2 | 1b. 获取教练列表 | PASS | 找到 coach_zhang, id=11, nickname=张教练（瑜伽） | 2026-07-22T10:36:10.291Z |
+| 3 | 1c. 创建团课 | PASS | id=33, name="全流程测试-mrvy5z1v", coachId=11, 无封面, startTime=2026-07-22T23:36:10 | 2026-07-22T10:36:10.356Z |
+| 4 | 1d. 保存二维码 | PASS | 已保存: D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\全流程测试_mrvy5z1v.png (2121 bytes) | 2026-07-22T10:36:10.416Z |
+| 5 | 2a. 会员登录 | PASS | memberId=16 | 2026-07-22T10:36:10.431Z |
+| 6 | 2b. 预约团课 | PASS | courseId=33, bookingId=4, 距开课约5h（>=30min要求） | 2026-07-22T10:36:10.468Z |
+| 7 | 2c. 调整课程时间(签到用) | PASS | startTime→2026-07-22T19:36:10（1h后→满足签到2h窗口） | 2026-07-22T10:36:10.502Z |
+| 8 | 2d. 扫码签到 | PASS | courseId=33, memberId=16, 签到时间距开课约1h（满足2h窗口） | 2026-07-22T10:36:10.535Z |
+| 9 | 3a. 教练登录 | PASS | coach_zhang, userId=11 | 2026-07-22T10:36:10.903Z |
+| 10 | 3b. 调整课程时间(开课用) | PASS | startTime→2026-07-22T18:33:10（3分钟前→教练可正常开课） | 2026-07-22T10:36:10.940Z |
+| 11 | 3c. 手动开课 | PASS | courseId=33, status=3, msg=开课成功 | 2026-07-22T10:36:10.974Z |
+| 12 | 3d. 调整结束时间(结课用) | PASS | endTime→2026-07-22T18:34:10（2分钟前→教练可结课） | 2026-07-22T10:36:11.002Z |
+| 13 | 3e. 手动结课 | PASS | courseId=33, status=2, msg=结课成功 | 2026-07-22T10:36:11.032Z |
+| 14 | 4. 最终课程状态 | PASS | name="全流程测试-mrvy5z1v", status=2, members=0, startTime=2026-07-22T18:33:10 | 2026-07-22T10:36:11.074Z |
+
+## 使用的API端点
+
+| 端点 | 方法 | 用途 | 认证 |
+|------|------|------|------|
+| `/api/auth/login` | POST | 管理员/教练登录 | HMAC签名 |
+| `/api/coach/list` | GET | 获取教练列表 | JWT (Admin) |
+| `/api/groupCourse` | POST | 创建团课 | JWT (Admin) |
+| `/api/groupCourse/{id}` | PUT | 修改团课时间 | JWT (Admin) |
+| `/api/groupCourse/{id}/detail` | GET | 获取课程详情(含二维码) | JWT (Admin) |
+| `/api/member/auth/miniapp/login` | POST | 会员登录 | HMAC签名 |
+| `/api/groupCourse/book` | POST | 预约团课 | JWT (Member) |
+| `/api/groupCourse/signin/{memberId}` | POST | 扫码签到 | JWT (Member) |
+| `/api/coach/courses/{courseId}/start` | POST | 教练手动开课 | JWT (Coach) |
+| `/api/coach/courses/{courseId}/end` | POST | 教练手动结课 | JWT (Coach) |
+
+## 认证机制
+
+- **JWT Token**: `Authorization: Bearer {token}`
+- **HMAC-SHA256**: `X-Signature`, `X-Timestamp`, `X-Nonce`
+- **Secret Key**: `NovalonManageSystemSecretKey2026`
+
+## 测试账号
+
+| 角色 | 用户名 | 密码 |
+|------|--------|------|
+| 管理员 | admin | Test@123 |
+| 会员 | (小程序code登录) | dev-test-fullflow-1784716569900 |
+| 教练 | coach_zhang | Test@123 |
+
+## 时间约束处理策略
+
+本测试通过后台API动态调整课程时间，绕过各步骤的时间限制：
+
+| 步骤 | 时间约束 | 处理方式 |
+|------|----------|----------|
+| 预约 | 需 >= 30分钟前 | 创建课程startTime=当前+5h |
+| 签到 | 开课前2h ~ 课程结束 | PUT修改startTime=当前+1h |
+| 开课 | 开课时间后10分钟内 | PUT修改startTime=当前-3min |
+| 结课 | 结束时间后10分钟内 | PUT修改endTime=当前-2min |
+
+> **注意**: 使用 `formatLocalTime()` 发送本地时间（无时区），确保与服务器 LocalDateTime 一致。
@@ -0,0 +1,144 @@
+# 全面端到端测试报告（含UI层）
+
+## 测试概要
+
+| 项目 | 值 |
+|------|-----|
+| 测试时间 | 2026-07-22T11:08:38.270Z ~ 2026-07-22T11:09:11.973Z |
+| **UI层 步骤数** | 4 (通过: 2, 失败: 0) |
+| **API层 步骤数** | 14 (通过: 14, 失败: 0) |
+| **总通过/总失败** | **16 / 0** |
+| 课程ID | 33 |
+| 课程名称 | UI全流程_mrvzbyr2 |
+| 二维码路径 | `D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\UI全流程_mrvzbyr2.png` (1984 bytes) |
+| API地址 | http://192.168.110.64:8084 |
+
+## 测试结果
+
+```
+═══════════════════════════════════════════
+  UI 层: 通过 2 / 失败 0 / 总计 2
+  API层: 通过 14 / 失败 0 / 总计 14
+  总通过: 16  /  总失败: 0  /  总计: 16
+═══════════════════════════════════════════
+```
+
+## 测试范围
+
+| 模块 | 项目 | UI层测试 | API层测试 |
+|------|------|----------|-----------|
+| 后台管理系统 | `gym-manage-web` | Playwright驱动浏览器操作Element Plus页面 | HMAC签名API调用 |
+| 会员端 | `gym-manage-uniapp` | miniprogram-automator (条件性) | HMAC签名API调用 |
+| 教练端 | `gym-manage-coach-uniapp` | miniprogram-automator (条件性) | HMAC签名API调用 |
+| 后端API | `gym-manage-api` | (通过前端间接调用) | 直接HTTP请求 |
+
+## Playwright UI 测试用例
+
+| 用例 | 描述 | 结果 |
+|------|------|------|
+| TC-UI-001 | 验证登录态并导航到仪表盘 | PASS |
+| TC-UI-002 | 导航到团课管理页面 | PASS |
+| TC-UI-003 | 创建团课(打开弹窗→填写表单→提交→关闭时间冲突弹窗→搜索验证) | PASS |
+
+**UI层关键操作**:
+- Element Plus 组件交互（el-dialog, el-select, el-form-item）
+- 处理"时间冲突警告"弹窗（自动检测并关闭）
+- 清除残留遮罩（Escape键清理 select 下拉和 modal 遮罩）
+
+## UI层测试结果
+
+| # | 步骤 | 状态 | 详情 | 时间 |
+|---|------|------|------|------|
+| 1 | Playwright Admin UI测试 | PASS | Playwright测试执行完成 | 2026-07-22T11:09:07.689Z |
+| 2 | 会员端DevTools CLI | PASS | 存在: D:\微信web开发者工具\cli.bat | 2026-07-22T11:09:07.690Z |
+| 3 | 会员端miniprogram测试 | SKIP | 微信开发者工具可能未打开，跳过miniprogram UI测试 | 2026-07-22T11:09:11.331Z |
+| 4 | 教练端DevTools CLI | SKIP | 不存在: C:\Program Files (x86)\Tencent\微信web开发者工具\cli.bat | 2026-07-22T11:09:11.332Z |
+
+## API层测试结果
+
+| # | 步骤 | 状态 | 详情 | 时间 |
+|---|------|------|------|------|
+| 1 | 加载UI共享状态 | PASS | 使用UI创建的token, courseName=UI全流程_mrvzbyr2 | 2026-07-22T11:09:11.360Z |
+| 2 | 获取教练列表 | PASS | 找到 coach_zhang, id=11 | 2026-07-22T11:09:11.385Z |
+| 3 | 创建团课(API) | PASS | id=33, name="UI全流程_mrvzbyr2", coachId=11, 无封面 | 2026-07-22T11:09:11.428Z |
+| 4 | 保存二维码 | PASS | 已保存: D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\UI全流程_mrvzbyr2.png (1984 bytes) | 2026-07-22T11:09:11.453Z |
+| 5 | 会员登录 | PASS | memberId=21 | 2026-07-22T11:09:11.469Z |
+| 6 | 预约团课 | PASS | courseId=33, bookingId=14, 距开课约5h | 2026-07-22T11:09:11.499Z |
+| 7 | 调整时间(签到用) | PASS | startTime→2026-07-22T20:09:11 | 2026-07-22T11:09:11.526Z |
+| 8 | 扫码签到 | PASS | courseId=33, memberId=21 | 2026-07-22T11:09:11.555Z |
+| 9 | 教练登录 | PASS | coach_zhang, userId=11 | 2026-07-22T11:09:11.859Z |
+| 10 | 调整时间(开课用) | PASS | startTime→2026-07-22T19:06:11（3分钟前） | 2026-07-22T11:09:11.883Z |
+| 11 | 手动开课 | PASS | courseId=33, msg=开课成功 | 2026-07-22T11:09:11.909Z |
+| 12 | 调整结束时间(结课用) | PASS | endTime→2026-07-22T19:07:11 | 2026-07-22T11:09:11.938Z |
+| 13 | 手动结课 | PASS | courseId=33, msg=结课成功 | 2026-07-22T11:09:11.957Z |
+| 14 | 最终课程状态 | PASS | 课程已完成所有状态流转（搜索中未找到，可能已被清理） | 2026-07-22T11:09:11.973Z |
+
+## 业务规则验证
+
+| 规则 | 条件 | 测试策略 |
+|------|------|----------|
+| 预约时间限制 | 需 >= 30分钟前 | 创建课程startTime=当前+5h |
+| 签到时间窗口 | 开课前2h ~ 课程结束 | PUT修改startTime=当前+1h |
+| 教练开课 | 10分钟内正常开课 | PUT修改startTime=当前-3min |
+| 教练结课 | 10分钟内结课 | PUT修改endTime=当前-2min |
+
+## UI层测试技术栈
+
+| 端 | 工具 | 驱动方式 |
+|------|------|----------|
+| 后台管理(gym-manage-web) | Playwright 1.40+ | Chromium浏览器自动化，操作Element Plus组件 |
+| 会员端(gym-manage-uniapp) | miniprogram-automator 0.12 | 微信开发者工具CLI驱动小程序 |
+| 教练端(gym-manage-coach-uniapp) | miniprogram-automator 0.10 | 微信开发者工具CLI驱动小程序 |
+
+## API层测试技术栈
+
+- **HTTP客户端**: Node.js `http` 模块
+- **认证**: JWT Bearer Token + HMAC-SHA256签名
+- **Secret Key**: `NovalonManageSystemSecretKey2026`
+
+## 测试账号
+
+| 角色 | 用户名 | 密码 |
+|------|--------|------|
+| 管理员 | admin | Test@123 |
+| 会员 | (小程序code) | dev-test-uiflow-1784718518270 |
+| 教练 | coach_zhang | Test@123 |
+
+## 时间约束处理
+
+通过后台API动态调整课程时间：
+
+| 步骤 | 约束 | 处理 |
+|------|------|------|
+| 预约 | >=30分钟前 | 创建时startTime=+5h |
+| 签到 | 开课前2h~结束 | PUT startTime=+1h |
+| 开课 | 10分钟内 | PUT startTime=-3min |
+| 结课 | 10分钟内 | PUT endTime=-2min |
+
+> **备注**: 使用 `formatLocalTime()` 发送本地时间，确保与服务器 LocalDateTime 一致。
+
+## 全流程步骤梳理
+
+```
+1. [UI-Playwright] 管理员登录后台 → 导航团课管理
+2. [UI-Playwright] 点击"新增团课" → 填写表单(无封面、张教练) → 提交
+3. [UI-Playwright] 关闭"时间冲突警告"弹窗 → 搜索验证课程创建成功
+4. [API] 从创建响应提取 qrCodePath → 下载二维码到 QRCODE/ 目录 (1984 bytes) 
+5. [API] 会员登录 → 预约团课 (距开课~5h，满足 ≥30min 要求)
+6. [API] 管理员修改 startTime→+1h (满足签到窗口：开课前2h内)
+7. [API] 会员扫码签到
+8. [API] 管理员修改 startTime→-3min (满足开课窗口：10分钟内)
+9. [API] 教练手动开课 → "开课成功"
+10.[API] 管理员修改 endTime→-2min (满足结课窗口)
+11.[API] 教练手动结课 → "结课成功"
+```
+
+## 已知问题
+
+| 问题 | 严重度 | 描述 |
+|------|--------|------|
+| `/api/groupCourse/{id}/detail` 返回500 | 中 | 对所有课程ID均返回500 Internal Server Error，可能为 `findDetailById` 缓存/序列化问题 |
+| `GET /api/groupCourse/{id}` 返回500 | 中 | 同上，可能影响前端课程详情页展示 |
+| 微信开发者工具CLI不可用(教练端) | 低 | `C:\Program Files (x86)\Tencent\微信web开发者工具\cli.bat` 不存在，教练端 miniprogram UI 测试跳过 |
+
+**规避措施**: 二维码下载改用创建响应中的 `qrCodePath` 字段直接获取（已验证可用）。
@@ -0,0 +1,58 @@
+# Gym Manage 领域术语表
+
+> 本文档定义项目中的领域术语（Ubiquitous Language）。不含实现细节。
+
+---
+
+## 核心实体
+
+### Coach（教练）
+系统用户（SysUser）被分配"教练"角色（role_key='coach'）后的角色化概念。教练不是独立实体，而是用户的角色视图。
+
+### GroupCourse（团课）
+由教练授课、会员预约参加的团体课程。关键状态：正常(0)、已取消(1)、已结束(2)、进行中(3)、教练缺席(5)、自动结束(6)、教练迟到(7)。
+
+### GroupCourseBooking（团课预约）
+会员对团课的预约记录。关键状态：已预约(0)、已取消(1)、已出席(2)、缺席(3)、教练缺席(4)、迟到(5)。
+
+### CoachViolation（教练违规）
+教练在教学过程中的违规行为记录。类型：COACH_LATE（迟到）、COACH_ABSENT（缺席）、NOT_MANUAL_END（未手动结课）。
+
+---
+
+## 统计领域术语
+
+### CoachStatistics（教练违规统计）
+**全局汇总维度**的教练违规数据。包含：教练总数、违规总数、迟到/缺席/未手动结课次数、违规教练数、开课总数。这是现有功能。
+
+### CoachPerformance（教练业绩）
+**新增领域术语**。指单个教练在指定时间段内的正向业绩指标集合，用于教练绩效考核和横向对比。
+
+### 教练业绩指标
+
+| 指标 | 英文 | 定义 |
+|------|------|------|
+| 授课量 | Completed Courses | 统计周期内教练完成的团课节数。仅计入 status=2（已结束）或 status=6（自动结束）的课程 |
+| 出席人次 | Attended Students | 统计周期内参加该教练课程的学员总人次。即该教练所有课程下 booking.status='2'（已出席）的预约记录数 |
+| 出勤率 | Attendance Rate | 出席人次 / 非取消预约总数 × 100% |
+| 满员率 | Fill Rate | 各课程（出席人数 / 最大容量）的平均值。基于实际出席人数计算 |
+| 违规次数 | Violation Count | 统计周期内该教练的违规记录总数（来自 coach_violation 表） |
+| 综合评分 | Composite Score | 授课量（归一化）×40% + 出勤率×30% + 满员率×30%，满分100 |
+
+### 综合评分归一化规则
+授课量归一化：将每个教练的授课量映射到 0-100 区间。计算公式 = (该教练授课量 / 所有教练中最大授课量) × 100。授课量为 0 时评分也为 0。
+
+### 排行榜（Coach Ranking）
+所有教练按综合评分从高到低排列的列表。支持管理员查看全局排名和点击单个教练查看明细。
+
+### 个人业绩视图（Personal Performance View）
+教练本人查看自己的业绩数据，不含与其他教练的对比。显示授课量、出席人次、出勤率、满员率、违规次数、综合评分。
+
+### 时间周期（Period）
+- DAY：今日
+- WEEK：本周（周一~周日）
+- MONTH：本月
+- LAST_30_DAYS：近30天
+- LAST_90_DAYS：近90天
+- YEAR：今年
+- CUSTOM：自定义日期范围
@@ -0,0 +1,202 @@
+import java.util.Base64;
+import java.math.BigInteger;
+import java.io.ByteArrayInputStream;
+
+public class KeyAnalyzer {
+    public static void main(String[] args) {
+        String privateKeyBase64 = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
+        
+        System.out.println("========== 密钥分析开始 ==========");
+        System.out.println("密钥长度: " + privateKeyBase64.length());
+        
+        byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
+        System.out.println("解码后长度: " + keyBytes.length + " bytes");
+        
+        // 打印前30字节
+        System.out.print("前30字节(hex): ");
+        for (int i = 0; i < 30 && i < keyBytes.length; i++) {
+            System.out.printf("%02X ", keyBytes[i]);
+        }
+        System.out.println();
+        
+        // 解析ASN.1结构
+        try {
+            parseASN1(keyBytes);
+        } catch (Exception e) {
+            System.out.println("解析失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    
+    static void parseASN1(byte[] keyBytes) throws Exception {
+        ByteArrayInputStream bis = new ByteArrayInputStream(keyBytes);
+        
+        // 读取SEQUENCE
+        int tag = bis.read();
+        System.out.println("第一个tag: 0x" + Integer.toHexString(tag));
+        
+        if (tag == 0x30) {
+            System.out.println("这是SEQUENCE");
+            
+            // 读取长度
+            int len = readASN1Length(bis);
+            System.out.println("SEQUENCE长度: " + len);
+            
+            // 检查下一个tag
+            int nextTag = bis.read();
+            System.out.println("下一个tag: 0x" + Integer.toHexString(nextTag));
+            
+            if (nextTag == 0x02) {
+                // INTEGER
+                int intLen = readASN1Length(bis);
+                byte[] versionBytes = new byte[intLen];
+                bis.read(versionBytes);
+                int version = new BigInteger(versionBytes).intValue();
+                System.out.println("版本INTEGER值: " + version);
+                
+                // 检查这是PKCS#8还是PKCS#1
+                // PKCS#8: version=0后是SEQUENCE(算法标识符)
+                // PKCS#1: version=0后是INTEGER(modulus)
+                int afterVersionTag = bis.read();
+                System.out.println("版本后的tag: 0x" + Integer.toHexString(afterVersionTag));
+                
+                if (afterVersionTag == 0x30) {
+                    System.out.println(">>> 这是PKCS#8格式 (version后是SEQUENCE)");
+                    
+                    // 解析PKCS#8
+                    // AlgorithmIdentifier: SEQUENCE { OID, NULL }
+                    int algLen = readASN1Length(bis);
+                    System.out.println("AlgorithmIdentifier长度: " + algLen);
+                    
+                    // 跳过AlgorithmIdentifier内容
+                    byte[] algBytes = new byte[algLen];
+                    bis.read(algBytes);
+                    
+                    // 打印OID
+                    System.out.print("OID bytes: ");
+                    for (int i = 0; i < algBytes.length; i++) {
+                        System.out.printf("%02X ", algBytes[i]);
+                    }
+                    System.out.println();
+                    
+                    // 下一个应该是OCTET STRING (包含私钥)
+                    int octetTag = bis.read();
+                    System.out.println("下一个tag: 0x" + Integer.toHexString(octetTag));
+                    
+                    if (octetTag == 0x04) {
+                        System.out.println("这是OCTET STRING (包含私钥数据)");
+                        int octetLen = readASN1Length(bis);
+                        System.out.println("OCTET STRING长度: " + octetLen);
+                        
+                        // OCTET STRING内容是PKCS#1私钥
+                        byte[] pkcs1Bytes = new byte[octetLen];
+                        bis.read(pkcs1Bytes);
+                        
+                        System.out.print("PKCS#1私钥前20字节: ");
+                        for (int i = 0; i < 20; i++) {
+                            System.out.printf("%02X ", pkcs1Bytes[i]);
+                        }
+                        System.out.println();
+                        
+                        // 解析PKCS#1私钥
+                        ByteArrayInputStream pkcs1Stream = new ByteArrayInputStream(pkcs1Bytes);
+                        int pkcs1Tag = pkcs1Stream.read();
+                        System.out.println("PKCS#1第一个tag: 0x" + Integer.toHexString(pkcs1Tag));
+                        
+                        if (pkcs1Tag == 0x30) {
+                            int pkcs1Len = readASN1Length(pkcs1Stream);
+                            System.out.println("PKCS#1 SEQUENCE长度: " + pkcs1Len);
+                            
+                            // version
+                            int vTag = pkcs1Stream.read();
+                            int vLen = readASN1Length(pkcs1Stream);
+                            byte[] vBytes = new byte[vLen];
+                            pkcs1Stream.read(vBytes);
+                            System.out.println("PKCS#1版本: " + new BigInteger(vBytes));
+                            
+                            // 解析私钥参数
+                            parsePKCS1(pkcs1Stream);
+                        }
+                    }
+                } else if (afterVersionTag == 0x02) {
+                    System.out.println(">>> 这是PKCS#1格式 (version后是INTEGER)");
+                    
+                    // 继续解析PKCS#1
+                    parsePKCS1(bis);
+                } else {
+                    System.out.println(">>> 未知格式 (tag: 0x" + Integer.toHexString(afterVersionTag) + ")");
+                }
+            }
+        }
+    }
+    
+    static void parsePKCS1(ByteArrayInputStream bis) throws Exception {
+        System.out.println("\n========== 解析PKCS#1私钥参数 ==========");
+        
+        // modulus
+        BigInteger modulus = readASN1Integer(bis);
+        System.out.println("modulus长度: " + modulus.bitLength() + " bits");
+        
+        // publicExponent
+        BigInteger publicExponent = readASN1Integer(bis);
+        System.out.println("publicExponent: " + publicExponent);
+        
+        // privateExponent
+        BigInteger privateExponent = readASN1Integer(bis);
+        System.out.println("privateExponent长度: " + privateExponent.bitLength() + " bits");
+        
+        // prime1
+        BigInteger prime1 = readASN1Integer(bis);
+        System.out.println("prime1长度: " + prime1.bitLength() + " bits");
+        
+        // prime2
+        BigInteger prime2 = readASN1Integer(bis);
+        System.out.println("prime2长度: " + prime2.bitLength() + " bits");
+        
+        // 验证 prime1 * prime2 == modulus
+        BigInteger calculatedModulus = prime1.multiply(prime2);
+        boolean valid = calculatedModulus.equals(modulus);
+        System.out.println("\n验证 prime1 * prime2 == modulus: " + valid);
+        
+        if (!valid) {
+            System.out.println(">>> 密钥数学关系不正确！这是无效的RSA私钥");
+            System.out.println("计算得到的modulus长度: " + calculatedModulus.bitLength() + " bits");
+        }
+        
+        // exponent1
+        BigInteger exponent1 = readASN1Integer(bis);
+        System.out.println("exponent1长度: " + exponent1.bitLength() + " bits");
+        
+        // exponent2
+        BigInteger exponent2 = readASN1Integer(bis);
+        System.out.println("exponent2长度: " + exponent2.bitLength() + " bits");
+        
+        // coefficient
+        BigInteger coefficient = readASN1Integer(bis);
+        System.out.println("coefficient长度: " + coefficient.bitLength() + " bits");
+        
+        System.out.println("\n========== 解析完成 ==========");
+    }
+    
+    static int readASN1Length(ByteArrayInputStream bis) throws Exception {
+        int firstByte = bis.read();
+        if ((firstByte & 0x80) == 0) {
+            return firstByte;
+        }
+        int numBytes = firstByte & 0x7F;
+        int length = 0;
+        for (int i = 0; i < numBytes; i++) {
+            length = (length << 8) | (bis.read() & 0xFF);
+        }
+        return length;
+    }
+    
+    static BigInteger readASN1Integer(ByteArrayInputStream bis) throws Exception {
+        int tag = bis.read();
+        if (tag != 0x02) throw new Exception("期望INTEGER tag: 0x02, 实际: 0x" + Integer.toHexString(tag));
+        int len = readASN1Length(bis);
+        byte[] data = new byte[len];
+        bis.read(data);
+        return new BigInteger(1, data);
+    }
+}
@@ -0,0 +1,98 @@
+# ADR-0001: 教练业绩统计功能设计
+
+**日期**: 2026-07-22
+**状态**: 已决定
+**决策者**: 通过 grill-with-docs 追问明确
+
+---
+
+## 背景
+
+需要在后台管理系统中为体育馆新增"教练业绩统计"功能。现有系统已有 `gym-dataCount` 模块提供全局统计（含教练违规统计 `CoachStatistics`），但缺少**按教练维度**的业绩数据（授课量、出勤率、满员率等正向指标）。
+
+---
+
+## 决策
+
+### 1. 架构：扩展现有 gym-dataCount 模块
+
+**选择**: 在 `gym-dataCount` 模块中新增 CoachPerformance 相关的 Handler + Service + DAO，而非新建独立模块。
+
+**理由**:
+- `gym-dataCount` 模块已有成熟的统计架构（DatabaseClient + Reactive + Redis 缓存 + 时间范围推导）
+- 现有 `DataStatisticsDao` 已有教练相关的 SQL 聚合查询，可直接复用
+- 避免模块膨胀，将"统计"职责收敛在一个模块中
+- `manage-app` 已依赖 `gym-dataCount`，路由注册零成本
+
+**替代方案被拒绝**: 新建 `gym-coach-performance` 独立模块。理由：功能规模不足以支撑独立模块，且会引入额外的模块间依赖管理成本。
+
+### 2. 数据源：完全基于团课预约数据
+
+**选择**: 业绩统计的"出席人次"和"出勤率"完全基于 `group_course_booking` 表（status='2'=已出席），而非 `sign_in_record` 签到表。
+
+**理由**:
+- `sign_in_record` 表中没有 `coach_id` 字段，签到只关联会员（member_id），不关联教练
+- 学员→教练的唯一数据路径是：member → group_course_booking → group_course → coach_id
+- 改造签到表会增加数据库变更成本，且签到不等于上课（签到可能发生在任何时间）
+
+**风险**: 如果未来签到记录需要关联教练（例如一对一的私教签到），需要重新评估此决策。
+
+### 3. 授课量定义：仅计入已完成课程
+
+**选择**: 只统计 `status IN (2, 6)` 的课程（已结束 + 自动结束）。
+
+**拒绝的定义**:
+- 所有非取消课程：会包含教练缺席(status=5)的课程，不应算作业绩
+- 所有排课：会包含已取消的课程，不能反映真实工作量
+
+### 4. 满员率：按出席人数计算
+
+**选择**: 满员率 = 各课程（出席人数 / max_members）的平均值。
+
+**拒绝的定义**: 按预约人数（current_members）计算。理由：预约了但没来的学员不能算"满员"，出席人数更真实地反映了课程实际到场情况。
+
+### 5. 综合评分权重：授课量 40% + 出勤率 30% + 满员率 30%
+
+**选择**: 授课量占比最高，体现工作量；出勤率和满员率体现教学质量。
+
+**归一化规则**: 授课量按所有教练中最大值归一化到 0-100。这样即使只有少数教练开课多，评分也能合理分布。
+
+**拒绝的替代方案**:
+- 三指标等权重(33/33/34)：弱化了工作量差异
+- 授课量 50%：过度强调数量而忽视质量
+
+### 6. 不包含学员留存率
+
+**选择**: 首版不计算学员留存率。
+
+**理由**: 现有系统缺少"学员持续上课"的显式数据模型。要实现留存率需要定义"留存"的判定规则（如：连续两个月以上预约同一教练的课程），这会引入新的领域概念，增加首版复杂度。
+
+---
+
+## 影响
+
+### 后端变更
+- `gym-dataCount` 模块新增：`CoachPerformance` domain、`CoachPerformanceHandler`、`CoachPerformanceDao`
+- `manage-app` 的 `SystemRouter` 中新增 2 条路由
+
+### 前端变更
+- `StatisticsDashboard.vue` 新增"教练业绩"Tab
+- `statistics.api.ts` 新增 API 接口类型
+- 可选：教练端新增个人业绩页面（通过路由守卫区分角色）
+
+### 数据库
+- 无新增表。完全基于现有表（`group_course`、`group_course_booking`、`coach_violation`、`sys_user`）
+
+---
+
+## 备选方案记录
+
+### 方案 A：基于签到表改造（已拒绝）
+改造 `sign_in_record` 添加 `coach_id` 字段，使签到直接关联教练。
+- 优点：数据更准确（签到是真实到店行为）
+- 缺点：需要改表、改签到流程、影响面大；签到不等于上团课
+
+### 方案 B：新建独立模块（已拒绝）
+新建 `gym-coach-performance` 独立 Maven 模块。
+- 优点：职责隔离清晰
+- 缺点：模块碎片化，增加编译和依赖管理成本
@@ -14,6 +14,7 @@
 3. [团课管理接口](#团课管理接口)
   - [获取所有团课](#获取所有团课)
   - [分页获取团课](#分页获取团课)
+   - [多条件查询团课](#多条件查询团课)
   - [根据ID获取团课详情](#根据ID获取团课详情)
   - [创建团课](#创建团课)
   - [更新团课](#更新团课)
@@ -154,6 +155,149 @@

 ---

+### 多条件查询团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/search` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**功能说明**: 支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询，默认不查询不可预约的团课（已取消或已结束）。
+
+**请求体**:
+
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| courseName | String | 否 | - | 课程名称（模糊查询，不区分大小写） |
+| courseType | Long | 否 | - | 课程类型ID |
+| startDate | LocalDateTime | 否 | - | 查询开始日期 |
+| endDate | LocalDateTime | 否 | - | 查询结束日期 |
+| timePeriod | String | 否 | - | 时间段：`morning`(6:00-12:00)、`afternoon`(12:00-18:00)、`evening`(18:00-24:00) |
+| priceSort | String | 否 | - | 价格排序：`asc`(从低到高)、`desc`(从高到低) |
+| remainingMost | Boolean | 否 | false | 是否按剩余名额最多排序 |
+| page | Integer | 否 | 0 | 页码，从0开始 |
+| size | Integer | 否 | 10 | 每页数量，最大100 |
+
+**查询条件优先级说明**:
+
+| 优先级 | 条件类型 | 说明 |
+|--------|----------|------|
+| 1 | 默认过滤 | 自动过滤已删除和不可预约的团课（status != 0） |
+| 2 | 基础筛选 | courseName、courseType、startDate、endDate、timePeriod |
+| 3 | 排序规则 | remainingMost优先，其次priceSort，默认按startTime升序 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "查询成功",
+  "data": {
+    "content": [
+      {
+        "id": 1,
+        "courseName": "瑜伽入门",
+        "coachId": 1,
+        "courseType": 1,
+        "startTime": "2026-06-15T09:00:00",
+        "endTime": "2026-06-15T10:00:00",
+        "maxMembers": 20,
+        "currentMembers": 5,
+        "status": 0,
+        "location": "健身房A区",
+        "coverImage": "https://example.com/yoga.jpg",
+        "description": "适合初学者的瑜伽课程",
+        "pointCardAmount": 1,
+        "storedValueAmount": 50.00,
+        "createdAt": "2026-06-01T10:00:00",
+        "updatedAt": "2026-06-01T10:00:00"
+      }
+    ],
+    "totalPages": 3,
+    "totalElements": 25,
+    "currentPage": 0,
+    "pageSize": 10,
+    "first": true,
+    "last": false
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "查询失败的原因"
+}
+```
+
+**使用示例**:
+
+1. **查询瑜伽课程**
+```json
+{
+  "courseName": "瑜伽"
+}
+```
+
+2. **查询特定类型的早晨课程**
+```json
+{
+  "courseType": 1,
+  "timePeriod": "morning"
+}
+```
+
+3. **查询下周的课程，按价格从低到高排序**
+```json
+{
+  "startDate": "2026-06-16T00:00:00",
+  "endDate": "2026-06-22T23:59:59",
+  "priceSort": "asc"
+}
+```
+
+4. **查询剩余名额最多的晚间课程**
+```json
+{
+  "timePeriod": "evening",
+  "remainingMost": true
+}
+```
+
+5. **多条件组合查询**
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+---
+
 ### 根据ID获取团课详情

 | 属性 | 值 |
@@ -460,26 +604,26 @@
 | 属性 | 值 |
 |------|-----|
 | **HTTP方法** | POST |
-| **接口路径** | `/api/groupCourse/{courseId}/signin` |
+| **接口路径** | `/api/groupCourse/signin/{memberId}` |
 | **所属文件** | `GroupCourseHandler.java` |

 **路径参数**:

 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| courseId | Long | 是 | 团课ID |
+| memberId | Long | 是 | 会员ID |

 **请求体**:

 ```json
 {
-  "memberId": 1001
+  "courseId": 1
 }
 ```

 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| memberId | Long | **是** | 会员ID |
+| courseId | Long | **是** | 团课ID |

 **成功响应** (200 OK):

@@ -494,16 +638,39 @@
 }
 ```

-**失败响应** (400 Bad Request):
+**失败响应** (400 Bad Request) —— 校验规则及对应错误信息:
+
+| 序号 | 校验规则 | 错误信息 |
+|------|----------|----------|
+| 1 | 团课不存在或已被删除 | `团课不存在或已删除` |
+| 2 | 团课状态为"已取消" | `团课已取消，无法签到` |
+| 3 | 团课状态为"已结束" | `团课已结束，无法签到` |
+| 4 | 当前时间早于开课前2小时 | `未到签到时间，请在开课前2小时内签到` |
+| 5 | 当前时间晚于团课结束时间 | `团课已结束，无法签到` |
+| 6 | 课程当前人数已达上限 | `课程已满员，无法签到` |
+| 7 | 用户今日无到店签到记录 | `请先完成到店签到` |
+| 8 | 到店签到状态非SUCCESS | `到店签到未成功，请重新签到` |
+| 9 | 用户未预约此课程 | `您未预约此课程，无法签到` |
+| - | 请求体为空 | `请求体不能为空` |
+| - | 请求体缺少courseId | `courseId不能为空` |
+
+> **说明**: 校验按上表顺序依次执行，命中第一个失败条件即返回对应错误信息。
+
+**失败响应示例**:

 ```json
 {
  "success": false,
-  "message": "课程已满员"
+  "message": "未到签到时间，请在开课前2小时内签到"
 }
 ```

---
+```json
+{
+  "success": false,
+  "message": "您未预约此课程，无法签到"
+}
+```

 ### 删除团课

@@ -1493,7 +1660,14 @@
 ### 团课管理
 1. **创建团课**：课程名称为必填项
 2. **取消团课**：需提前24小时通知，否则拒绝操作
-3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制
+3. **团课签到**：严格按以下顺序校验，任一不通过即拒绝签到：
+   - 团课是否存在且未被删除
+   - 团课状态不为"已取消"
+   - 团课状态不为"已结束"（含已过结束时间）
+   - 当前时间在开课前2小时内（签到时间窗口）
+   - 课程当前人数未达到最大人数上限
+   - 用户今日已成功到店签到（查询 sign_in_record 表当日 SUCCESS 记录）
+   - 用户已预约该课程（有效预约）
 4. **删除团课**：采用软删除机制，数据保留可恢复

 ### 团课预约
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>gym-auth</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Auth</name>
+    <description>Phone Authentication Module - Phone Number Login Services</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-sys</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <!-- 阿里云号码认证服务（新版SDK） -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dypnsapi20170525</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <!-- 阿里云一键登录服务（旧版SDK，保留兼容） -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dypnsapi</artifactId>
+            <version>1.2.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,7 @@
+package cn.novalon.gym.manage.auth.config;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+}
@@ -0,0 +1,18 @@
+package cn.novalon.gym.manage.auth.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "dcloud.univerify")
+public class DCloudUniverifyConfig {
+    private String appid;
+    private String appkey;
+    private String apiSecret;
+    private String apiUrl = "https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber";
+    private String proxyHost;
+    private Integer proxyPort;
+    private Integer timeout = 10000;
+}
@@ -0,0 +1,47 @@
+package cn.novalon.gym.manage.auth.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 阿里云短信配置属性类
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "alibaba.cloud.sms")
+public class SmsProperties {
+
+    /**
+     * 访问密钥ID
+     */
+    private String accessKeyId;
+
+    /**
+     * 访问密钥密钥
+     */
+    private String accessKeySecret;
+
+    /**
+     * 短信签名名称
+     */
+    private String signName;
+
+    /**
+     * 短信模板CODE
+     */
+    private String templateCode;
+
+    /**
+     * 短信验证码长度（默认6位）
+     */
+    private int codeLength = 6;
+
+    /**
+     * 短信验证码有效期（秒，默认300秒=5分钟）
+     */
+    private long codeExpireSeconds = 300;
+}
@@ -0,0 +1,26 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneCodeLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    @Pattern(regexp = "^\\d{4,6}$", message = "验证码格式不正确")
+    private String code;
+}
@@ -0,0 +1,23 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginDto {
+
+    private String phone;
+
+    private String accessToken;
+
+    private String openid;
+
+    private String nickname;
+
+    private String avatar;
+}
@@ -0,0 +1,22 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 发送短信验证码请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendCodeRequest {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+}
@@ -0,0 +1,25 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 短信验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+}
@@ -0,0 +1,59 @@
+package cn.novalon.gym.manage.auth.handler;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Tag(name = "手机号认证", description = "手机号一键登录与验证码登录")
+public class PhoneAuthHandler {
+
+    private final PhoneAuthService phoneAuthService;
+
+    @Operation(summary = "手机号一键登录", description = "使用uniapp官方运营商认证，直接手机号登录或注册")
+    public Mono<ServerResponse> oneClickLogin(ServerRequest request) {
+        log.info("收到手机号一键登录请求");
+
+        return request.bodyToMono(PhoneLoginDto.class)
+                .flatMap(phoneAuthService::oneClickLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+
+    @Operation(summary = "发送短信验证码", description = "使用阿里云发送短信验证码")
+    public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
+        log.info("收到发送短信验证码请求");
+
+        return request.bodyToMono(SendCodeRequest.class)
+                .flatMap(req -> phoneAuthService.sendSmsCode(req.getPhone()))
+                .flatMap(success -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));
+    }
+
+    @Operation(summary = "手机号验证码登录", description = "使用阿里云短信验证码登录或注册")
+    public Mono<ServerResponse> codeLogin(ServerRequest request) {
+        log.info("收到手机号验证码登录请求");
+
+        return request.bodyToMono(PhoneCodeLoginDto.class)
+                .flatMap(phoneAuthService::codeLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+}
@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.auth.service;
+
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import reactor.core.publisher.Mono;
+
+/**
+ * 手机号认证服务接口
+ */
+public interface PhoneAuthService {
+
+    /**
+     * 手机号一键登录（uniapp官方运营商认证）
+     * 已注册则直接登录，未注册则自动注册后登录
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
+
+    /**
+     * 发送短信验证码（阿里云）
+     *
+     * @param phone 手机号
+     * @return 是否发送成功
+     */
+    Mono<Boolean> sendSmsCode(String phone);
+
+    /**
+     * 手机号验证码登录（阿里云）
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request);
+}
@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.auth.service;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * 短信服务接口
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+public interface SmsService {
+
+    /**
+     * 发送短信验证码
+     *
+     * @param phone 手机号
+     * @return 发送结果
+     */
+    Mono<Boolean> sendVerificationCode(String phone);
+
+    /**
+     * 验证短信验证码
+     *
+     * @param phone 手机号
+     * @param code  验证码
+     * @return 验证结果
+     */
+    Mono<Boolean> verifyCode(String phone, String code);
+
+    /**
+     * 获取验证码（用于测试或特殊场景）
+     *
+     * @param phone 手机号
+     * @return 验证码
+     */
+    Mono<String> getVerificationCode(String phone);
+}
@@ -0,0 +1,270 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.novalon.gym.manage.auth.config.DCloudUniverifyConfig;
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import cn.novalon.gym.manage.common.exception.ErrorCode;
+import cn.novalon.gym.manage.common.exception.SystemException;
+import cn.novalon.gym.manage.member.entity.Member;
+import cn.novalon.gym.manage.member.es.entity.MemberES;
+import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
+import cn.novalon.gym.manage.member.repository.IMemberRepository;
+import cn.novalon.gym.manage.member.util.AesUtil;
+import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.member.util.MemberNoGenerator;
+import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PhoneAuthServiceImpl implements PhoneAuthService {
+
+    private final IMemberRepository memberRepository;
+    private final MemberESRepository memberESRepository;
+    private final EsSyncUtils esSyncUtils;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final SmsService smsService;
+    private final SmsProperties smsProperties;
+    private final DCloudUniverifyConfig dCloudUniverifyConfig;
+    
+    private WebClient webClient;
+
+    private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
+
+    @PostConstruct
+    public void init() {
+        this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
+        this.webClient = WebClient.builder()
+                .baseUrl(dCloudUniverifyConfig.getApiUrl())
+                .defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
+                .build();
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
+        log.info("手机号一键登录请求, phone: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
+
+        if (request.getPhone() != null && !request.getPhone().isEmpty()) {
+            log.info("直接使用手机号登录");
+            String encryptedPhone = encryptPhone(request.getPhone());
+            return processPhoneLogin(encryptedPhone, request);
+        }
+
+        if (request.getAccessToken() == null || request.getAccessToken().isEmpty()) {
+            log.error("一键登录失败: accessToken为空");
+            return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "登录凭证无效，请重试"));
+        }
+
+        return getPhoneByDcloudApi(request.getAccessToken(), request.getOpenid())
+                .flatMap(phone -> {
+                    log.info("通过access_token获取手机号成功: {}", maskPhone(phone));
+                    String encryptedPhone = encryptPhone(phone);
+                    return processPhoneLogin(encryptedPhone, request);
+                })
+                .onErrorResume(e -> {
+                    log.error("一键登录失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
+        return memberRepository.findByPhone(encryptedPhone)
+                .flatMap(existingMember -> {
+                    log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                    return doLogin(existingMember, false, request);
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.info("手机号未注册，创建新会员");
+                    return createNewMemberAndLogin(request, encryptedPhone);
+                }));
+    }
+
+    private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put("appid", dCloudUniverifyConfig.getAppid());
+        requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
+        requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
+        requestBody.put("access_token", accessToken);
+        requestBody.put("openid", openid);
+
+        log.info("调用DCloud Univerify API, params: {}", requestBody);
+
+        return webClient.post()
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .flatMap(response -> {
+                    log.info("DCloud API响应: {}", response);
+                    
+                    Integer code = (Integer) response.get("code");
+                    Boolean success = (Boolean) response.get("success");
+                    
+                    if ((code != null && code == 0) || (success != null && success)) {
+                        Map<String, Object> data = (Map<String, Object>) response.get("data");
+                        if (data != null) {
+                            String phoneNumber = (String) data.get("phoneNumber");
+                            if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                                return Mono.just(phoneNumber);
+                            }
+                        }
+                        String phoneNumber = (String) response.get("phoneNumber");
+                        if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                            return Mono.just(phoneNumber);
+                        }
+                        String phone = (String) response.get("phone");
+                        if (phone != null && !phone.isEmpty()) {
+                            return Mono.just(phone);
+                        }
+                    }
+                    
+                    String message = (String) response.get("message");
+                    log.warn("DCloud API返回错误: code={}, success={}, message={}", code, success, message);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + message));
+                })
+                .onErrorResume(e -> {
+                    log.error("调用DCloud API失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    /**
+     * 手机号脱敏显示
+     */
+    private String maskPhone(String phone) {
+        if (phone == null || phone.length() < 11) {
+            return phone;
+        }
+        return phone.substring(0, 3) + "****" + phone.substring(7);
+    }
+
+    @Override
+    public Mono<Boolean> sendSmsCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+        return smsService.sendVerificationCode(phone);
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
+        log.info("手机号验证码登录, phone: {}", request.getPhone());
+
+        return smsService.verifyCode(request.getPhone(), request.getCode())
+                .flatMap(verified -> {
+                    if (!verified) {
+                        log.warn("验证码验证失败, phone: {}", request.getPhone());
+                        return Mono.error(new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "验证码错误或已过期"));
+                    }
+
+                    String encryptedPhone = encryptPhone(request.getPhone());
+
+                    return memberRepository.findByPhone(encryptedPhone)
+                            .flatMap(existingMember -> {
+                                log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                                return doLogin(existingMember, false, null);
+                            })
+                            .switchIfEmpty(Mono.defer(() -> {
+                                log.info("手机号未注册，创建新会员");
+                                PhoneLoginDto registerRequest = new PhoneLoginDto();
+                                return createNewMemberAndLogin(registerRequest, encryptedPhone);
+                            }));
+                });
+    }
+
+    private Mono<PhoneLoginVO> createNewMemberAndLogin(PhoneLoginDto request, String encryptedPhone) {
+        String memberNo = MemberNoGenerator.generate();
+        log.info("生成会员号: {}", memberNo);
+
+        Member member = new Member();
+        member.setMemberNo(memberNo);
+        member.setPhone(encryptedPhone);
+        member.setNickname(request != null ? request.getNickname() : null);
+        member.setAvatar(request != null ? request.getAvatar() : null);
+        member.setLastLoginAt(LocalDateTime.now());
+        member.setIsDeleted(false);
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .flatMap(savedMember -> {
+                    log.info("新会员创建成功, memberId: {}, memberNo: {}", savedMember.getId(), savedMember.getMemberNo());
+                    return doLogin(savedMember, true, request);
+                });
+    }
+
+    private Mono<PhoneLoginVO> doLogin(Member member, boolean isNewUser, PhoneLoginDto request) {
+        log.info("登录成功, memberId: {}", member.getId());
+
+        member.setLastLoginAt(LocalDateTime.now());
+
+        if (isNewUser && request != null) {
+            if ((member.getNickname() == null || member.getNickname().isEmpty())
+                    && request.getNickname() != null && !request.getNickname().isEmpty()) {
+                member.setNickname(request.getNickname());
+            }
+            if ((member.getAvatar() == null || member.getAvatar().isEmpty())
+                    && request.getAvatar() != null && !request.getAvatar().isEmpty()) {
+                member.setAvatar(request.getAvatar());
+            }
+        }
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .map(this::buildLoginResponse);
+    }
+
+    private PhoneLoginVO buildLoginResponse(Member member) {
+        boolean needCompleteInfo = member.getNickname() == null || member.getNickname().isEmpty();
+
+        List<String> roles = new ArrayList<>();
+        String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
+
+        log.info("JWT Token 生成成功, memberId: {}", member.getId());
+
+        PhoneLoginVO vo = new PhoneLoginVO();
+        vo.setMemberId(member.getId());
+        vo.setMemberNo(member.getMemberNo());
+        vo.setAccessToken(accessToken);
+        vo.setRefreshToken(accessToken);
+        vo.setExpiresIn(86400);
+        vo.setIsNewUser(member.getCreatedAt() == null ? false :
+                member.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(1)));
+        vo.setNeedCompleteInfo(needCompleteInfo);
+        vo.setNickname(member.getNickname());
+        vo.setAvatar(member.getAvatar());
+        vo.setPhone(member.getPhone() != null ? decryptPhone(member.getPhone()) : null);
+        return vo;
+    }
+
+    private String encryptPhone(String phoneNumber) {
+        try {
+            return AesUtil.encrypt(phoneNumber);
+        } catch (Exception e) {
+            log.error("手机号加密失败", e);
+            throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败");
+        }
+    }
+
+    private String decryptPhone(String encryptedPhone) {
+        try {
+            return AesUtil.decrypt(encryptedPhone);
+        } catch (Exception e) {
+            log.error("手机号解密失败", e);
+            return null;
+        }
+    }
+}
@@ -0,0 +1,198 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsServiceImpl implements SmsService {
+
+    private static final long SEND_INTERVAL_SECONDS = 60;
+    private static final long CODE_EXPIRE_SECONDS = 300;
+
+    private final SmsProperties smsProperties;
+    private final RedisUtil redisUtil;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public Mono<Boolean> sendVerificationCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+
+        String rateLimitKey = RedisKeyConstants.SMS_CODE + phone + ":rate_limit";
+
+        return redisUtil.get(rateLimitKey, Long.class)
+                .defaultIfEmpty(0L)
+                .flatMap(lastSendTime -> {
+                    long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+
+                    if (currentTime - lastSendTime < SEND_INTERVAL_SECONDS) {
+                        long remainingSeconds = SEND_INTERVAL_SECONDS - (currentTime - lastSendTime);
+                        log.warn("发送频率限制, phone: {}, 剩余时间: {}秒", phone, remainingSeconds);
+                        return Mono.just(false);
+                    }
+
+                    return Mono.fromCallable(() -> {
+                        try {
+                            IAcsClient client = createClient();
+
+                            CommonRequest request = new CommonRequest();
+                            request.setSysMethod(MethodType.POST);
+                            request.setSysDomain("dypnsapi.aliyuncs.com");
+                            request.setSysVersion("2017-05-25");
+                            request.setSysAction("SendSmsVerifyCode");
+                            request.putQueryParameter("PhoneNumber", phone);
+                            request.putQueryParameter("SignName", smsProperties.getSignName());
+                            request.putQueryParameter("TemplateCode", smsProperties.getTemplateCode());
+                            request.putQueryParameter("TemplateParam", "{\"code\":\"##code##\",\"min\":\"5\"}");
+                            request.putQueryParameter("ReturnVerifyCode", "true");
+
+                            log.info("阿里云号码认证请求参数 - signName: {}, templateCode: {}, templateParam: {}",
+                                    smsProperties.getSignName(),
+                                    smsProperties.getTemplateCode(),
+                                    "{\"code\":\"##code##\",\"min\":\"5\"}");
+
+                            CommonResponse response = client.getCommonResponse(request);
+                            String responseData = response.getData();
+                            log.info("阿里云号码认证原始响应: {}", responseData);
+
+                            JsonNode jsonNode = objectMapper.readTree(responseData);
+
+                            JsonNode codeNode = jsonNode.get("Code");
+                            if (codeNode == null) {
+                                log.error("阿里云响应中找不到Code字段, 原始响应: {}", responseData);
+                                return false;
+                            }
+
+                            String code = codeNode.asText();
+
+                            if ("OK".equals(code)) {
+                                JsonNode requestIdNode = jsonNode.get("RequestId");
+                                String requestId = requestIdNode != null ? requestIdNode.asText() : "unknown";
+                                log.info("短信验证码发送成功, phone: {}, requestId: {}", phone, requestId);
+
+                                // 提取验证码并存入Redis
+                                JsonNode modelNode = jsonNode.get("Model");
+                                if (modelNode != null) {
+                                    JsonNode verifyCodeNode = modelNode.get("VerifyCode");
+                                    if (verifyCodeNode != null) {
+                                        String verifyCode = verifyCodeNode.asText();
+                                        String smsCodeKey = RedisKeyConstants.SMS_CODE + phone;
+                                        redisUtil.setWithExpire(smsCodeKey, verifyCode, CODE_EXPIRE_SECONDS).subscribe();
+                                        log.info("验证码已存入Redis, phone: {}, key: {}, expire: {}秒", phone, smsCodeKey, CODE_EXPIRE_SECONDS);
+                                    } else {
+                                        log.warn("响应中未找到Model.VerifyCode字段, 原始响应: {}", responseData);
+                                    }
+                                } else {
+                                    log.warn("响应中未找到Model字段, 原始响应: {}", responseData);
+                                }
+
+                                redisUtil.setWithExpire(rateLimitKey, currentTime, SEND_INTERVAL_SECONDS).subscribe();
+                                return true;
+                            }
+
+                            JsonNode messageNode = jsonNode.get("Message");
+                            String message = messageNode != null ? messageNode.asText() : "unknown";
+                            log.error("短信验证码发送失败, phone: {}, code: {}, message: {}", phone, code, message);
+                            return false;
+
+                        } catch (Exception e) {
+                            log.error("发送短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
+                            return false;
+                        }
+                    });
+                });
+    }
+
+    @Override
+    public Mono<Boolean> verifyCode(String phone, String code) {
+        log.info("验证短信验证码, phone: {}", phone);
+
+        return Mono.fromCallable(() -> {
+            try {
+                IAcsClient client = createClient();
+
+                CommonRequest request = new CommonRequest();
+                request.setSysMethod(MethodType.POST);
+                request.setSysDomain("dypnsapi.aliyuncs.com");
+                request.setSysVersion("2017-05-25");
+                request.setSysAction("CheckSmsVerifyCode");
+                request.putQueryParameter("PhoneNumber", phone);
+                request.putQueryParameter("VerifyCode", code);
+
+                log.info("阿里云号码认证核验参数 - phone: {}, code: {}", phone, code);
+
+                CommonResponse response = client.getCommonResponse(request);
+                String responseData = response.getData();
+                log.info("阿里云号码认证核验原始响应: {}", responseData);
+
+                JsonNode jsonNode = objectMapper.readTree(responseData);
+
+                JsonNode codeNode = jsonNode.get("Code");
+                if (codeNode == null) {
+                    log.error("阿里云核验响应中找不到Code字段, 原始响应: {}", responseData);
+                    return false;
+                }
+
+                String responseCode = codeNode.asText();
+                JsonNode modelNode = jsonNode.get("Model");
+                JsonNode verifyResultNode = modelNode != null ? modelNode.get("VerifyResult") : null;
+                boolean verifyResult = verifyResultNode != null && "PASS".equals(verifyResultNode.asText());
+
+                if ("OK".equals(responseCode) && verifyResult) {
+                    log.info("验证码验证成功, phone: {}", phone);
+                    return true;
+                }
+
+                JsonNode messageNode = jsonNode.get("Message");
+                String message = messageNode != null ? messageNode.asText() : "unknown";
+                log.warn("验证码验证失败, phone: {}, code: {}, message: {}, result: {}",
+                        phone, responseCode, message, verifyResult);
+                return false;
+
+            } catch (Exception e) {
+                log.error("验证短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public Mono<String> getVerificationCode(String phone) {
+        try {
+            String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+            return redisUtil.get(cacheKey, String.class);
+        } catch (Exception e) {
+            log.error("获取验证码异常, phone: {}", phone, e);
+            return Mono.empty();
+        }
+    }
+
+    private IAcsClient createClient() throws ClientException {
+        IClientProfile profile = DefaultProfile.getProfile(
+                "cn-hangzhou",
+                smsProperties.getAccessKeyId(),
+                smsProperties.getAccessKeySecret());
+        DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", "Dypnsapi", "dypnsapi.aliyuncs.com");
+        return new DefaultAcsClient(profile);
+    }
+}
@@ -0,0 +1,36 @@
+package cn.novalon.gym.manage.auth.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号一键登录响应VO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginVO {
+
+    private Long memberId;
+
+    private String memberNo;
+
+    private String phone;
+
+    private String accessToken;
+
+    private String refreshToken;
+
+    private Integer expiresIn;
+
+    private Boolean isNewUser;
+
+    private Boolean needCompleteInfo;
+
+    private String nickname;
+
+    private String avatar;
+}
@@ -0,0 +1,5 @@
+cn.novalon.gym.manage.auth.handler.PhoneAuthHandler
+cn.novalon.gym.manage.auth.service.impl.PhoneAuthServiceImpl
+cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl
+cn.novalon.gym.manage.auth.config.AuthConfig
+cn.novalon.gym.manage.auth.config.SmsProperties
@@ -0,0 +1,106 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("Auth DTO 单元测试")
+class DtoValidationTest {
+
+    @Nested
+    @DisplayName("PhoneLoginDto 测试")
+    class PhoneLoginDtoTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            PhoneLoginDto dto = new PhoneLoginDto();
+
+            dto.setPhone("13800138000");
+            dto.setAccessToken("token-abc-123");
+            dto.setOpenid("openid-xyz-456");
+            dto.setNickname("测试用户");
+            dto.setAvatar("https://cdn.example.com/avatar.png");
+
+            assertThat(dto.getPhone()).isEqualTo("13800138000");
+            assertThat(dto.getAccessToken()).isEqualTo("token-abc-123");
+            assertThat(dto.getOpenid()).isEqualTo("openid-xyz-456");
+            assertThat(dto.getNickname()).isEqualTo("测试用户");
+            assertThat(dto.getAvatar()).isEqualTo("https://cdn.example.com/avatar.png");
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            PhoneLoginDto dto = PhoneLoginDto.builder()
+                    .phone("13900139000")
+                    .accessToken("token-def-456")
+                    .openid("openid-ghi-789")
+                    .nickname("张三")
+                    .avatar("https://cdn.example.com/avatar2.png")
+                    .build();
+
+            assertThat(dto.getPhone()).isEqualTo("13900139000");
+            assertThat(dto.getAccessToken()).isEqualTo("token-def-456");
+            assertThat(dto.getOpenid()).isEqualTo("openid-ghi-789");
+            assertThat(dto.getNickname()).isEqualTo("张三");
+            assertThat(dto.getAvatar()).isEqualTo("https://cdn.example.com/avatar2.png");
+        }
+    }
+
+    @Nested
+    @DisplayName("PhoneCodeLoginDto 测试")
+    class PhoneCodeLoginDtoTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            PhoneCodeLoginDto dto = new PhoneCodeLoginDto();
+
+            dto.setPhone("15000150000");
+            dto.setCode("123456");
+
+            assertThat(dto.getPhone()).isEqualTo("15000150000");
+            assertThat(dto.getCode()).isEqualTo("123456");
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            PhoneCodeLoginDto dto = PhoneCodeLoginDto.builder()
+                    .phone("13700137000")
+                    .code("654321")
+                    .build();
+
+            assertThat(dto.getPhone()).isEqualTo("13700137000");
+            assertThat(dto.getCode()).isEqualTo("654321");
+        }
+    }
+
+    @Nested
+    @DisplayName("SendCodeRequest 测试")
+    class SendCodeRequestTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取phone字段")
+        void shouldSetAndGetPhone() {
+            SendCodeRequest req = new SendCodeRequest();
+
+            req.setPhone("18600186000");
+
+            assertThat(req.getPhone()).isEqualTo("18600186000");
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置phone字段")
+        void shouldBuildCorrectly() {
+            SendCodeRequest req = SendCodeRequest.builder()
+                    .phone("15900159000")
+                    .build();
+
+            assertThat(req.getPhone()).isEqualTo("15900159000");
+        }
+    }
+}
@@ -118,6 +118,11 @@
            <artifactId>hutool-all</artifactId>
            <version>5.8.25</version>
        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>core</artifactId>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Class name="~.*\.entity\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.dto\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.converter\..*" />
+    </Match>
+</FindBugsFilter>
@@ -0,0 +1,43 @@
+package cn.novalon.gym.manage.checkIn.config;
+
+import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.HandlerMapping;
+import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class WebSocketConfig {
+
+    @Autowired
+    private MyWebSocketHandler myWebSocketHandler;
+
+    /**
+     * 注册 WebSocket 路由映射
+     * 路径对应前端连接的 ws://xxx/webSocket/checkIn
+     */
+    @Bean
+    public HandlerMapping webSocketMapping() {
+        Map<String, WebSocketHandler> map = new HashMap<>();
+        map.put("/webSocket/checkIn", myWebSocketHandler);
+
+        SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+        mapping.setUrlMap(map);
+        mapping.setOrder(10);  // 设置优先级
+        return mapping;
+    }
+
+    /**
+     * 注册 WebSocket 处理器适配器（必须）
+     */
+    @Bean
+    public WebSocketHandlerAdapter handlerAdapter() {
+        return new WebSocketHandlerAdapter();
+    }
+}
@@ -206,4 +206,4 @@ public class SignInRecord {
    public void restore() {
        this.isDelete = false;
    }
-}
+}
@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.checkIn.handler;

 import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
 import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
+import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
+import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
 import cn.novalon.gym.manage.sys.util.AuthUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
+import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;

 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -36,6 +39,7 @@ public class CheckInHandler {
    public Mono<ServerResponse> checkIn(ServerRequest request) {

        Long memberId = authUtil.getMemberIdOrThrow(request);
+
        return request.bodyToMono(Map.class)
                .flatMap(body -> {
                    String qrContent = (String) body.get("qrContent");
@@ -190,4 +194,4 @@ public class CheckInHandler {
                        .contentType(MediaType.APPLICATION_JSON)
                        .bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
    }
-}
+}
@@ -78,4 +78,4 @@ public interface ICheckInService {
     * @return 签到统计VO
     */
    Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
-}
+}
@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.checkIn.service.impl;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
 import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
 import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
 import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
@@ -13,14 +15,14 @@ import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
 import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
 import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
 import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -47,37 +49,30 @@ public class CheckServiceImpl implements ICheckInService {
    private final MemberCardRepository memberCardRepository;
    private final SignInRecordRepository signInRecordRepository;
    private final IGroupCourseBookingService groupCourseBookingService;
+    private final IGroupCourseBookingRepository groupCourseBookingRepository;

    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

    @Override
    public Mono<QRCodeVo> getQRCode(Long memberId) {
-        log.info("开始查询会员信息, memberId: {}", memberId);
+        log.info("开始生成会员签到二维码, memberId: {}", memberId);
        
-        return findValidMemberCard(memberId)
-                .flatMap(cardRecord -> {
-                    log.info("会员信息查询完成, memberCardRecordId: {}", cardRecord.getMemberCardRecordId());
-                    
-                    log.info("开始生成二维码");
-                    String qrContent = QRRedisKey.generateQrcodeContent();
-                    Map<String, Object> redisMap = new HashMap<>();
-                    redisMap.put("qrContent", qrContent);
-                    redisMap.put("isUsed", false);
-                    redisMap.put("memberId", memberId);
-                    redisMap.put("memberCardRecordId", cardRecord.getMemberCardRecordId());
+        String qrContent = QRRedisKey.generateQrcodeContent();
+        Map<String, Object> redisMap = new HashMap<>();
+        redisMap.put("qrContent", qrContent);
+        redisMap.put("isUsed", false);
+        redisMap.put("memberId", memberId);

-                    return redisUtil.setWithExpire(
-                                    RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
-                                    redisMap,
-                                    getSecondsUntilEndOfDay()
-                            )
-                            .then(Mono.fromSupplier(() -> {
-                                String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
-                                        BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
-                                return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
-                            }));
-                })
-                .switchIfEmpty(Mono.error(new RuntimeException("该会员没有可用的会员卡")));
+        return redisUtil.setWithExpire(
+                        RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
+                        redisMap,
+                        getSecondsUntilEndOfDay()
+                )
+                .then(Mono.fromSupplier(() -> {
+                    String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
+                            BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
+                    return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
+                }));
    }

    @Override
@@ -113,9 +108,10 @@ public class CheckServiceImpl implements ICheckInService {
                            }
                            log.info("二维码匹配成功，memberId: {}", memberId);

-                            Long memberCardRecordId = ((Number) map.get("memberCardRecordId")).longValue();
+                        Long memberCardRecordId = map.get("memberCardRecordId") != null 
+                                ? ((Number) map.get("memberCardRecordId")).longValue() : null;

-                            return processCheckIn(memberId, memberCardRecordId, map, qrContent);
+                        return processCheckIn(memberId, memberCardRecordId, map, qrContent);
                        } else {
                            MyWebSocketHandler.sendFailure(qrContent, "二维码无效");
                            return Mono.error(new RuntimeException("二维码无效"));
@@ -145,60 +141,43 @@ public class CheckServiceImpl implements ICheckInService {
        LocalDateTime now = LocalDateTime.now();
        
        // 发送实时进度通知
-        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_CARD", "正在验证会员卡...");
-        
-        return memberCardRecordRepository.findById(memberCardRecordId)
-                .switchIfEmpty(Mono.defer(() -> {
-                    MyWebSocketHandler.sendFailure(qrContent, "会员卡记录不存在");
-                    return Mono.error(new RuntimeException("会员卡记录不存在"));
-                }))
-                .flatMap(cardRecord -> {
-                    if (!"ACTIVE".equals(cardRecord.getStatus().name())) {
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡状态不正确");
-                        return Mono.error(new RuntimeException("会员卡状态不正确"));
-                    }
+        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "正在检查预约信息...");
+
+        // 检查是否有需要签到的团课预约，有则返回有效预约
+        return validateBooking(memberId, now)
+                .flatMap(booking ->
+                    // 有有效预约：将预约状态更新为"已出席"
+                    groupCourseBookingRepository.updateStatus(booking.getId(), "2")
+                            .doOnNext(count -> log.info("已更新预约状态为已出席, bookingId: {}, rows: {}", booking.getId(), count))
+                            .then(Mono.just(true))
+                )
+                .defaultIfEmpty(false)
+                .then(Mono.defer(() -> {
+                    redisMap.put("isUsed", true);
+                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
                    
-                    if (cardRecord.getExpireTime() != null && cardRecord.getExpireTime().isBefore(now)) {
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡已过期");
-                        return Mono.error(new RuntimeException("会员卡已过期"));
-                    }
-
-                    // 发送实时进度通知
-                    MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
-
-                    // 检查是否有需要签到的团课预约
-                    return validateBooking(memberId, now)
-                            .then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
-                                    .switchIfEmpty(Mono.defer(() -> {
-                                        MyWebSocketHandler.sendFailure(qrContent, "会员卡类型不存在");
-                                        return Mono.error(new RuntimeException("会员卡类型不存在"));
-                                    }))
-                                    .flatMap(card -> {
-                                        // 发送实时进度通知
-                                        MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
-                                        
-                                        return deductCardUsage(cardRecord, card)
-                                                .flatMap(updatedRecord -> {
-                                                    redisMap.put("isUsed", true);
-                                                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
-                                                    
-                                                    return saveSignInRecord(memberId, cardRecord.getMemberCardRecordId(), card.getMemberCardId())
-                                                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
-                                                            .then(Mono.defer(() -> {
-                                                                String successMsg = buildSuccessResponse(now);
-                                                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
-                                                                log.info("签到成功, memberId: {}, cardRecordId: {}", memberId, memberCardRecordId);
-                                                                return Mono.just(successMsg);
-                                                            }));
-                                                });
-                                    }));
-                });
+                    return saveSignInRecord(memberId, null, null)
+                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
+                            // 清除统计缓存和课程缓存，确保管理端/教练端立即反映最新数据
+                            .then(Mono.defer(() -> 
+                                redisUtil.deleteByPattern("datacount:statistics:*")
+                                        .then(Mono.defer(() -> redisUtil.deleteByPattern("group_course:*")))
+                                        .doOnSuccess(v -> log.info("已清除统计缓存和课程缓存, memberId: {}", memberId))
+                                        .then()
+                            ))
+                            .then(Mono.defer(() -> {
+                                String successMsg = buildSuccessResponse(now);
+                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
+                                log.info("签到成功, memberId: {}", memberId);
+                                return Mono.just(successMsg);
+                            }));
+                }));
    }

    /**
-     * 验证预约信息
+     * 验证预约信息，返回时间匹配的有效预约
     */
-    private Mono<Void> validateBooking(Long memberId, LocalDateTime now) {
+    private Mono<GroupCourseBooking> validateBooking(Long memberId, LocalDateTime now) {
        return groupCourseBookingService.getBookingsByMemberId(memberId)
                .filter(booking -> {
                    String status = booking.getStatus();
@@ -213,19 +192,18 @@ public class CheckServiceImpl implements ICheckInService {
                    if (bookings.isEmpty()) {
                        return Mono.empty();
                    }
-                    boolean hasValidBooking = bookings.stream()
-                            .anyMatch(b -> {
+                    // 找到时间范围内第一个有效预约（课程时间内±30分钟）
+                    return Flux.fromIterable(bookings)
+                            .filter(b -> {
                                LocalDateTime startTime = b.getCourseStartTime();
                                return startTime != null && 
                                       !startTime.isBefore(now.minusMinutes(30)) && 
                                       !startTime.isAfter(now.plusMinutes(30));
-                            });
-                    if (hasValidBooking) {
-                        log.info("会员{}有有效的团课预约", memberId);
-                    } else {
-                        log.warn("会员{}有预约但不在签到时间范围内", memberId);
-                    }
-                    return Mono.empty();
+                            })
+                            .next()
+                            .doOnNext(b -> log.info("会员{}有有效的团课预约, bookingId: {}", memberId, b.getId()))
+                            .switchIfEmpty(Mono.fromRunnable(() -> 
+                                    log.warn("会员{}有预约但不在签到时间范围内", memberId)));
                });
    }

@@ -199,4 +199,4 @@ public class MyWebSocketHandler implements WebSocketHandler {
        cleanupTimeoutConnections();
        return qrContentToSink.size();
    }
-}
+}
@@ -3,6 +3,7 @@ package cn.novalon.gym.manage.checkin;
 import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
 import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
 import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
 import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
 import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
@@ -57,6 +58,9 @@ class CheckInModuleTest {
    @Mock
    private IGroupCourseBookingService groupCourseBookingService;

+    @Mock
+    private IGroupCourseBookingRepository groupCourseBookingRepository;
+
    @Mock
    private MemberCard mockMemberCard;

@@ -72,7 +76,8 @@ class CheckInModuleTest {
    void setUp() {
        MockitoAnnotations.openMocks(this);
        checkService = new CheckServiceImpl(qrCodeConfig, redisUtil, memberCardRecordRepository, 
-                memberCardRepository, signInRecordRepository, groupCourseBookingService);
+                memberCardRepository, signInRecordRepository, groupCourseBookingService,
+                groupCourseBookingRepository);

        when(mockMemberCard.getId()).thenReturn(1L);
        when(mockMemberCard.getMemberCardType()).thenReturn("TIME_CARD");
@@ -126,6 +131,7 @@ class CheckInModuleTest {
        String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
        
        when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
+        when(redisUtil.deleteByPattern(any(String.class))).thenReturn(Mono.empty());
        when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
        when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
        when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>gym-coach</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Coach</name>
+    <description>Coach Management Module - Course Start/End, Violation Tracking</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-sys</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-groupCourse</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,15 @@
+package cn.novalon.gym.manage.coach.dao;
+
+import cn.novalon.gym.manage.coach.entity.CoachViolationEntity;
+import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 教练违规记录 DAO
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Repository
+public interface CoachViolationDao extends R2dbcRepository<CoachViolationEntity, Long> {
+}
@@ -0,0 +1,61 @@
+package cn.novalon.gym.manage.coach.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.time.LocalDateTime;
+
+/**
+ * 教练违规记录实体类 - 对应 coach_violation 表
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Table("coach_violation")
+public class CoachViolationEntity extends BaseEntity {
+
+    @Column("coach_id")
+    private Long coachId;
+
+    @Column("course_id")
+    private Long courseId;
+
+    @Column("violation_time")
+    private LocalDateTime violationTime;
+
+    @Column("violation_reason")
+    private String violationReason;
+
+    public Long getCoachId() {
+        return coachId;
+    }
+
+    public void setCoachId(Long coachId) {
+        this.coachId = coachId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public LocalDateTime getViolationTime() {
+        return violationTime;
+    }
+
+    public void setViolationTime(LocalDateTime violationTime) {
+        this.violationTime = violationTime;
+    }
+
+    public String getViolationReason() {
+        return violationReason;
+    }
+
+    public void setViolationReason(String violationReason) {
+        this.violationReason = violationReason;
+    }
+}
@@ -0,0 +1,42 @@
+package cn.novalon.gym.manage.coach.enums;
+
+/**
+ * 团课预约状态枚举
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+public enum BookingStatus {
+
+    BOOKED("0", "已预约"),
+    CANCELLED("1", "已取消"),
+    ATTENDED("2", "已出席"),
+    ABSENT("3", "缺席"),
+    COACH_ABSENT("4", "教练缺席"),
+    LATE("5", "迟到");
+
+    private final String value;
+    private final String desc;
+
+    BookingStatus(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static BookingStatus fromValue(String value) {
+        for (BookingStatus status : values()) {
+            if (status.value.equals(value)) {
+                return status;
+            }
+        }
+        return BOOKED;
+    }
+}
@@ -0,0 +1,30 @@
+package cn.novalon.gym.manage.coach.enums;
+
+/**
+ * 教练违规原因枚举
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+public enum ViolationReason {
+
+    COACH_LATE("COACH_LATE", "教练迟到"),
+    COACH_ABSENT("COACH_ABSENT", "教练缺席"),
+    NOT_MANUAL_END("NOT_MANUAL_END", "教练未手动结课");
+
+    private final String value;
+    private final String desc;
+
+    ViolationReason(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}
@@ -0,0 +1,68 @@
+package cn.novalon.gym.manage.coach.handler;
+
+import cn.novalon.gym.manage.coach.service.CoachCourseService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+/**
+ * 教练开课/结课处理器
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Component
+@Tag(name = "教练开课结课", description = "教练开课与结课操作")
+public class CoachCourseHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(CoachCourseHandler.class);
+    private final CoachCourseService coachCourseService;
+    private final AuthUtil authUtil;
+
+    public CoachCourseHandler(CoachCourseService coachCourseService, AuthUtil authUtil) {
+        this.coachCourseService = coachCourseService;
+        this.authUtil = authUtil;
+    }
+
+    @Operation(summary = "教练开课", description = "教练手动开课，记录实际开课时间，若超时则判定迟到")
+    public Mono<ServerResponse> startCourse(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        Long coachId = authUtil.getMemberIdOrThrow(request);
+
+        return coachCourseService.startCourse(courseId, coachId)
+                .flatMap(result -> ServerResponse.ok().bodyValue(Map.of(
+                        "message", "开课成功",
+                        "status", result.getStatus(),
+                        "actualStartTime", result.getActualStartTime() != null ? result.getActualStartTime().toString() : ""
+                )))
+                .onErrorResume(e -> {
+                    logger.error("开课失败: {}", e.getMessage());
+                    return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
+                });
+    }
+
+    @Operation(summary = "教练结课", description = "教练手动结课，记录实际结课时间")
+    public Mono<ServerResponse> endCourse(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        Long coachId = authUtil.getMemberIdOrThrow(request);
+
+        return coachCourseService.endCourse(courseId, coachId)
+                .flatMap(result -> ServerResponse.ok().bodyValue(Map.of(
+                        "message", "结课成功",
+                        "status", result.getStatus(),
+                        "actualEndTime", result.getActualEndTime() != null ? result.getActualEndTime().toString() : ""
+                )))
+                .onErrorResume(e -> {
+                    logger.error("结课失败: {}", e.getMessage());
+                    return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
+                });
+    }
+}
@@ -0,0 +1,118 @@
+package cn.novalon.gym.manage.coach.handler;
+
+import cn.novalon.gym.manage.coach.service.CoachCourseService;
+import cn.novalon.gym.manage.sys.core.domain.SysUser;
+import cn.novalon.gym.manage.sys.dto.request.CoachCreateRequest;
+import cn.novalon.gym.manage.sys.dto.request.CoachUpdateRequest;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 教练管理处理器（从 manage-app 迁移至 gym-coach 模块）
+ *
+ * @author 张翔
+ * @date 2026-07-19
+ */
+@Component
+@Tag(name = "教练管理", description = "教练相关操作")
+public class CoachHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(CoachHandler.class);
+    private final CoachCourseService coachCourseService;
+    private final Validator validator;
+
+    public CoachHandler(CoachCourseService coachCourseService, Validator validator) {
+        this.coachCourseService = coachCourseService;
+        this.validator = validator;
+    }
+
+    @Operation(summary = "获取所有教练", description = "获取系统中所有教练列表")
+    public Mono<ServerResponse> getAllCoaches(ServerRequest request) {
+        return ServerResponse.ok()
+                .body(coachCourseService.getAllCoaches(), SysUser.class);
+    }
+
+    @Operation(summary = "创建教练", description = "创建新教练（创建用户并分配教练角色）")
+    public Mono<ServerResponse> createCoach(ServerRequest request) {
+        return request.bodyToMono(CoachCreateRequest.class)
+                .flatMap(req -> {
+                    var violations = validator.validate(req);
+                    if (!violations.isEmpty()) {
+                        Map<String, String> errors = new HashMap<>();
+                        violations.forEach(v -> errors.put(v.getPropertyPath().toString(), v.getMessage()));
+                        return ServerResponse.badRequest().bodyValue(errors);
+                    }
+                    return coachCourseService.createCoach(
+                            req.getUsername(), req.getPassword(),
+                            req.getNickname(), req.getEmail(), req.getPhone())
+                            .flatMap(user -> ServerResponse.status(HttpStatus.CREATED).bodyValue(user))
+                            .onErrorResume(e -> {
+                                logger.error("创建教练失败", e);
+                                return ServerResponse.badRequest()
+                                        .bodyValue(Map.of("error", e.getMessage()));
+                            });
+                });
+    }
+
+    @Operation(summary = "更新教练信息", description = "更新教练基本信息（昵称、邮箱、手机号）")
+    public Mono<ServerResponse> updateCoach(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return request.bodyToMono(CoachUpdateRequest.class)
+                .flatMap(req -> coachCourseService.updateCoach(id, req.getNickname(), req.getEmail(), req.getPhone())
+                        .flatMap(user -> ServerResponse.ok().bodyValue(user))
+                        .switchIfEmpty(ServerResponse.notFound().build())
+                        .onErrorResume(e -> {
+                            logger.error("更新教练失败", e);
+                            return ServerResponse.badRequest()
+                                    .bodyValue(Map.of("error", e.getMessage()));
+                        }));
+    }
+
+    @Operation(summary = "禁用教练", description = "禁用教练账号，自动取消其所有非进行中的团课")
+    public Mono<ServerResponse> disableCoach(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return coachCourseService.disableCoach(id)
+                .then(ServerResponse.ok().bodyValue(Map.of("message", "教练已禁用")))
+                .onErrorResume(e -> {
+                    logger.error("禁用教练失败: {}", e.getMessage());
+                    return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
+                });
+    }
+
+    @Operation(summary = "获取教练的团课", description = "获取指定教练教授的所有团课")
+    public Mono<ServerResponse> getCoachCourses(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return coachCourseService.getCoachCourses(id)
+                .collectList()
+                .flatMap(courses -> ServerResponse.ok().bodyValue(courses))
+                .switchIfEmpty(ServerResponse.ok().bodyValue(List.of()));
+    }
+
+    @Operation(summary = "获取教练违规次数统计", description = "获取所有教练的违规次数")
+    public Mono<ServerResponse> getViolationCounts(ServerRequest request) {
+        return coachCourseService.getViolationCounts()
+                .collectList()
+                .flatMap(counts -> ServerResponse.ok().bodyValue(counts));
+    }
+
+    @Operation(summary = "获取教练违规记录", description = "获取指定教练的违规记录")
+    public Mono<ServerResponse> getCoachViolations(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return coachCourseService.getCoachViolations(id)
+                .collectList()
+                .flatMap(violations -> ServerResponse.ok().bodyValue(violations))
+                .switchIfEmpty(ServerResponse.ok().bodyValue(List.of()));
+    }
+}
@@ -0,0 +1,178 @@
+package cn.novalon.gym.manage.coach.scheduler;
+
+import cn.novalon.gym.manage.coach.enums.ViolationReason;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
+import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.r2dbc.core.DatabaseClient;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+/**
+ * 教练课程定时调度器
+ * 
+ * 功能：
+ * 1. 检查未手动开课的课程，超时标记为教练缺席(5)并记录违规
+ * 2. 检查未手动结课的课程，超时标记为自动结束(6)并记录违规
+ * 
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Component
+public class CoachCourseScheduler {
+
+    private static final Logger logger = LoggerFactory.getLogger(CoachCourseScheduler.class);
+    private static final long ONE_HOUR_MINUTES = 60;
+    private static final long END_GRACE_MINUTES = 10;
+
+    private final GroupCourseDao groupCourseDao;
+    private final GroupCourseBookingDao groupCourseBookingDao;
+    private final DatabaseClient databaseClient;
+    private final RedisUtil redisUtil;
+
+    public CoachCourseScheduler(GroupCourseDao groupCourseDao,
+                                 GroupCourseBookingDao groupCourseBookingDao,
+                                 DatabaseClient databaseClient,
+                                 RedisUtil redisUtil) {
+        this.groupCourseDao = groupCourseDao;
+        this.groupCourseBookingDao = groupCourseBookingDao;
+        this.databaseClient = databaseClient;
+        this.redisUtil = redisUtil;
+    }
+
+    /**
+     * 每分钟检查一次：
+     * - status=0(NORMAL) 的课程是否已过开课缺席阈值
+     * - status=3(IN_PROGRESS) 或 status=7(COACH_LATE) 的课程是否已过结课宽限期
+     */
+    @Scheduled(fixedRate = 60000)
+    public void checkAndProcessCourses() {
+        logger.debug("教练课程调度器开始检查");
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 1. 检查未开课的课程
+        processAbsentCourses(now)
+                .subscribe(
+                        count -> {
+                            if (count > 0) {
+                                logger.info("教练课程调度器：处理了 {} 门教练缺席课程", count);
+                                invalidateCache();
+                            }
+                        },
+                        error -> logger.error("教练课程调度器（缺席检查）执行失败：{}", error.getMessage(), error)
+                );
+
+        // 2. 检查未结课的课程
+        processAutoEndCourses(now)
+                .subscribe(
+                        count -> {
+                            if (count > 0) {
+                                logger.info("教练课程调度器：处理了 {} 门自动结束课程", count);
+                                invalidateCache();
+                            }
+                        },
+                        error -> logger.error("教练课程调度器（自动结课）执行失败：{}", error.getMessage(), error)
+                );
+    }
+
+    /**
+     * 处理缺席课程：status=0 且已过开课缺席阈值
+     */
+    private Mono<Long> processAbsentCourses(LocalDateTime now) {
+        return groupCourseDao.findByStatusAndStartTimeBefore(databaseClient, "0", now)
+                .filter(course -> isAbsentThresholdExceeded(course, now))
+                .flatMap(course -> markAsCoachAbsent(course, now))
+                .count();
+    }
+
+    /**
+     * 处理自动结课：status IN ('3','7') 且 end_time + 10分钟 已过
+     */
+    private Mono<Long> processAutoEndCourses(LocalDateTime now) {
+        LocalDateTime endThreshold = now.minusMinutes(END_GRACE_MINUTES);
+        return groupCourseDao.findByStatusInAndEndTimeBefore(databaseClient,
+                        new String[]{String.valueOf(CourseStatus.IN_PROGRESS.getValue()),
+                                     String.valueOf(CourseStatus.COACH_LATE.getValue())},
+                        endThreshold)
+                .flatMap(course -> markAsAutoEnded(course, now))
+                .count();
+    }
+
+    /**
+     * 判断课程是否已过缺席阈值
+     */
+    private boolean isAbsentThresholdExceeded(GroupCourseEntity course, LocalDateTime now) {
+        long courseDurationMinutes = Duration.between(course.getStartTime(), course.getEndTime()).toMinutes();
+        long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
+
+        if (courseDurationMinutes >= ONE_HOUR_MINUTES) {
+            return minutesSinceStart > 30;
+        } else {
+            long thresholdB = Math.max(1, (long) (courseDurationMinutes * 0.25));
+            return minutesSinceStart > thresholdB;
+        }
+    }
+
+    /**
+     * 标记课程为教练缺席(5)，更新预约记录为教练缺席(4)，记录违规
+     */
+    private Mono<GroupCourseEntity> markAsCoachAbsent(GroupCourseEntity course, LocalDateTime now) {
+        logger.info("课程 {} 教练缺席，标记为 COACH_ABSENT", course.getId());
+
+        return insertViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_ABSENT)
+                .then(groupCourseDao.updateToCoachAbsent(course.getId(), now, now))
+                .then(groupCourseBookingDao.updateStatusByCourseId(course.getId(), "0", "4"))
+                .thenReturn(course);
+    }
+
+    /**
+     * 标记课程为自动结束(6)，记录违规
+     */
+    private Mono<GroupCourseEntity> markAsAutoEnded(GroupCourseEntity course, LocalDateTime now) {
+        logger.info("课程 {} 未手动结课，标记为 AUTO_ENDED", course.getId());
+
+        return insertViolation(course.getCoachId(), course.getId(), now, ViolationReason.NOT_MANUAL_END)
+                .then(groupCourseDao.updateToAutoEnded(course.getId(), now, now))
+                .thenReturn(course);
+    }
+
+    /**
+     * 插入违规记录（使用 DatabaseClient 直连）
+     */
+    private Mono<Void> insertViolation(Long coachId, Long courseId, LocalDateTime violationTime,
+                                        ViolationReason reason) {
+        return databaseClient.sql("""
+                        INSERT INTO coach_violation (coach_id, course_id, violation_time, violation_reason, created_at, updated_at)
+                        VALUES (:coachId, :courseId, :violationTime, :reason, :now, :now)
+                        """)
+                .bind("coachId", coachId)
+                .bind("courseId", courseId)
+                .bind("violationTime", violationTime)
+                .bind("reason", reason.getValue())
+                .bind("now", LocalDateTime.now())
+                .then();
+    }
+
+    /**
+     * 清除统计缓存和团课缓存 —— 调度器触发时，如有课程状态变更则必须及时失效
+     */
+    private void invalidateCache() {
+        redisUtil.deleteByPattern("datacount:statistics:*").subscribe(
+                deleted -> logger.debug("调度器清除统计缓存，已删除 {} 条", deleted),
+                error -> logger.warn("调度器清除统计缓存失败: {}", error.getMessage())
+        );
+        redisUtil.deleteByPattern("group_course:*").subscribe(
+                deleted -> logger.debug("调度器清除团课缓存，已删除 {} 条", deleted),
+                error -> logger.warn("调度器清除团课缓存失败: {}", error.getMessage())
+        );
+    }
+}
@@ -0,0 +1,357 @@
+package cn.novalon.gym.manage.coach.service;
+
+import cn.novalon.gym.manage.coach.dao.CoachViolationDao;
+import cn.novalon.gym.manage.coach.entity.CoachViolationEntity;
+import cn.novalon.gym.manage.coach.enums.ViolationReason;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.common.util.StatusConstants;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
+import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.sys.core.domain.SysRole;
+import cn.novalon.gym.manage.sys.core.domain.SysUser;
+import cn.novalon.gym.manage.sys.core.domain.UserRole;
+import cn.novalon.gym.manage.sys.core.repository.ISysRoleRepository;
+import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository;
+import cn.novalon.gym.manage.sys.core.repository.IUserRoleRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
+import org.springframework.r2dbc.core.DatabaseClient;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * 教练课程服务（含教练管理 + 开课/结课逻辑 + 违规记录）
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Service
+public class CoachCourseService {
+
+    private static final Logger logger = LoggerFactory.getLogger(CoachCourseService.class);
+    private static final String COACH_ROLE_NAME = "教练";
+    private static final long ONE_HOUR_MINUTES = 60;
+
+    private final ISysUserRepository userRepository;
+    private final ISysRoleRepository roleRepository;
+    private final IUserRoleRepository userRoleRepository;
+    private final IGroupCourseRepository groupCourseRepository;
+    private final IGroupCourseBookingRepository bookingRepository;
+    private final GroupCourseDao groupCourseDao;
+    private final GroupCourseBookingDao groupCourseBookingDao;
+    private final CoachViolationDao violationDao;
+    private final DatabaseClient databaseClient;
+    private final PasswordEncoder passwordEncoder;
+    private final RedisUtil redisUtil;
+
+    public CoachCourseService(ISysUserRepository userRepository,
+                              ISysRoleRepository roleRepository,
+                              IUserRoleRepository userRoleRepository,
+                              IGroupCourseRepository groupCourseRepository,
+                              IGroupCourseBookingRepository bookingRepository,
+                              GroupCourseDao groupCourseDao,
+                              GroupCourseBookingDao groupCourseBookingDao,
+                              CoachViolationDao violationDao,
+                              DatabaseClient databaseClient,
+                              PasswordEncoder passwordEncoder,
+                              RedisUtil redisUtil) {
+        this.userRepository = userRepository;
+        this.roleRepository = roleRepository;
+        this.userRoleRepository = userRoleRepository;
+        this.groupCourseRepository = groupCourseRepository;
+        this.bookingRepository = bookingRepository;
+        this.groupCourseDao = groupCourseDao;
+        this.groupCourseBookingDao = groupCourseBookingDao;
+        this.violationDao = violationDao;
+        this.databaseClient = databaseClient;
+        this.passwordEncoder = passwordEncoder;
+        this.redisUtil = redisUtil;
+    }
+
+    // ==================== 教练管理（从原 CoachService 迁移） ====================
+
+    public Flux<SysUser> getAllCoaches() {
+        return getCoachRoleId()
+                .flatMapMany(roleId -> userRoleRepository.findByRoleId(roleId)
+                        .map(UserRole::getUserId)
+                        .collectList()
+                        .flatMapMany(userIds -> {
+                            if (userIds.isEmpty()) {
+                                return Flux.empty();
+                            }
+                            return Flux.fromIterable(userIds)
+                                    .flatMap(userRepository::findById)
+                                    .filter(user -> user.getDeletedAt() == null);
+                        }));
+    }
+
+    public Mono<SysUser> createCoach(String username, String password, String nickname, String email, String phone) {
+        return getCoachRoleId().flatMap(coachRoleId -> {
+            SysUser user = new SysUser();
+            user.generateId();
+            user.setUsername(username);
+            user.setPassword(passwordEncoder.encode(password));
+            user.setNickname(nickname);
+            user.setEmail(email);
+            user.setPhone(phone);
+            user.setStatus(StatusConstants.ENABLED);
+
+            return userRepository.save(user)
+                    .flatMap(saved -> {
+                        UserRole userRole = new UserRole();
+                        userRole.setUserId(saved.getId());
+                        userRole.setRoleId(coachRoleId);
+                        return userRoleRepository.save(userRole).thenReturn(saved);
+                    });
+        });
+    }
+
+    public Mono<SysUser> updateCoach(Long id, String nickname, String email, String phone) {
+        return userRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("教练不存在")))
+                .flatMap(user -> {
+                    if (nickname != null) user.setNickname(nickname);
+                    if (email != null) user.setEmail(email);
+                    if (phone != null) user.setPhone(phone);
+                    user.setUpdatedAt(LocalDateTime.now());
+                    return userRepository.update(user);
+                });
+    }
+
+    @Transactional(transactionManager = "connectionFactoryTransactionManager")
+    public Mono<Void> disableCoach(Long id) {
+        return userRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("教练不存在")))
+                .flatMap(user ->
+                    groupCourseRepository.countByCoachIdAndStatus(id, 3L)
+                            .flatMap(inProgressCount -> {
+                                if (inProgressCount > 0) {
+                                    return Mono.error(new RuntimeException(
+                                            "该教练有 " + inProgressCount + " 门正在进行中的团课，无法禁用"));
+                                }
+                                return groupCourseRepository.cancelCoursesByCoachIdExceptStatus(id, 3L)
+                                        .then();
+                            })
+                            .then(Mono.defer(() -> {
+                                user.setStatus(StatusConstants.DISABLED);
+                                user.setUpdatedAt(LocalDateTime.now());
+                                return userRepository.update(user).then();
+                            }))
+                )
+                .then(invalidateStatisticsCache());
+    }
+
+    public Flux<GroupCourse> getCoachCourses(Long coachId) {
+        return groupCourseRepository.findByCoachId(coachId, Sort.by(Sort.Direction.DESC, "startTime"))
+                .flatMap(course ->
+                    bookingRepository.countValidBookings(course.getId())
+                            .map(count -> {
+                                course.setCurrentMembers(count.intValue());
+                                return course;
+                            })
+                            .defaultIfEmpty(course)
+                );
+    }
+
+    public Mono<Long> getCoachRoleId() {
+        return roleRepository.findByRoleName(COACH_ROLE_NAME)
+                .map(SysRole::getId)
+                .switchIfEmpty(Mono.error(new RuntimeException("教练角色未找到，请先执行数据库迁移")));
+    }
+
+    // ==================== 开课逻辑 ====================
+
+    /**
+     * 教练手动开课
+     * 判定逻辑：
+     * - 长课时(>=1h): 10分钟内正常，10~30分钟迟到，>30分钟拒绝
+     * - 短课时(<1h): 10%时长内正常，10%~25%迟到，>25%拒绝
+     */
+    public Mono<GroupCourseEntity> startCourse(Long courseId, Long coachId) {
+        return groupCourseDao.findByIdIsAndDeletedAtIsNull(courseId)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    // 验证教练身份
+                    if (!course.getCoachId().equals(coachId)) {
+                        return Mono.error(new RuntimeException("您不是该课程的教练，无权开课"));
+                    }
+                    // 验证课程状态：只有 NORMAL(0) 可以开课
+                    if (!CourseStatus.NORMAL.getValue().equals(course.getStatus())) {
+                        return Mono.error(new RuntimeException("当前课程状态不允许开课，当前状态: " + course.getStatus()));
+                    }
+
+                    LocalDateTime now = LocalDateTime.now();
+                    long courseDurationMinutes = Duration.between(course.getStartTime(), course.getEndTime()).toMinutes();
+
+                    if (courseDurationMinutes >= ONE_HOUR_MINUTES) {
+                        return handleLongCourseStart(course, now);
+                    } else {
+                        return handleShortCourseStart(course, now, courseDurationMinutes);
+                    }
+                });
+    }
+
+    private Mono<GroupCourseEntity> handleLongCourseStart(GroupCourseEntity course, LocalDateTime now) {
+        long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
+
+        if (minutesSinceStart < 0) {
+            return Mono.error(new RuntimeException("课程尚未到开课时间"));
+        }
+        if (minutesSinceStart <= 10) {
+            // 正常开课
+            return doStartCourse(course, now, CourseStatus.IN_PROGRESS, null);
+        }
+        if (minutesSinceStart <= 30) {
+            // 教练迟到
+            return recordViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_LATE)
+                    .then(doStartCourse(course, now, CourseStatus.COACH_LATE, ViolationReason.COACH_LATE));
+        }
+        // >30分钟，拒绝（调度器应已标记为缺席）
+        return Mono.error(new RuntimeException("已超过开课时间30分钟，无法开课"));
+    }
+
+    private Mono<GroupCourseEntity> handleShortCourseStart(GroupCourseEntity course, LocalDateTime now,
+                                                            long courseDurationMinutes) {
+        long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
+        long thresholdA = Math.max(1, (long) (courseDurationMinutes * 0.10));
+        long thresholdB = Math.max(1, (long) (courseDurationMinutes * 0.25));
+
+        if (minutesSinceStart < 0) {
+            return Mono.error(new RuntimeException("课程尚未到开课时间"));
+        }
+        if (minutesSinceStart <= thresholdA) {
+            // 正常开课
+            return doStartCourse(course, now, CourseStatus.IN_PROGRESS, null);
+        }
+        if (minutesSinceStart <= thresholdB) {
+            // 教练迟到
+            return recordViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_LATE)
+                    .then(doStartCourse(course, now, CourseStatus.COACH_LATE, ViolationReason.COACH_LATE));
+        }
+        // >thresholdB，拒绝
+        return Mono.error(new RuntimeException("已超过开课时间，无法开课"));
+    }
+
+    private Mono<GroupCourseEntity> doStartCourse(GroupCourseEntity course, LocalDateTime now,
+                                                   CourseStatus newStatus, ViolationReason violationReason) {
+        course.setStatus(newStatus.getValue());
+        course.setActualStartTime(now);
+        course.setUpdatedAt(now);
+        return groupCourseDao.updateStartInfo(course.getId(), String.valueOf(newStatus.getValue()), now, now)
+                .then(groupCourseDao.findByIdIsAndDeletedAtIsNull(course.getId()))
+                .flatMap(entity -> invalidateStatisticsCache().thenReturn(entity));
+    }
+
+    // ==================== 结课逻辑 ====================
+
+    /**
+     * 教练手动结课
+     * 可在 IN_PROGRESS(3) 或 COACH_LATE(7) 状态下结课
+     * 必须在标注结课时间 + 10分钟内
+     */
+    public Mono<GroupCourseEntity> endCourse(Long courseId, Long coachId) {
+        return groupCourseDao.findByIdIsAndDeletedAtIsNull(courseId)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    // 验证教练身份
+                    if (!course.getCoachId().equals(coachId)) {
+                        return Mono.error(new RuntimeException("您不是该课程的教练，无权结课"));
+                    }
+                    // 验证状态：IN_PROGRESS(3) 或 COACH_LATE(7)
+                    Long status = course.getStatus();
+                    if (!CourseStatus.IN_PROGRESS.getValue().equals(status)
+                            && !CourseStatus.COACH_LATE.getValue().equals(status)) {
+                        return Mono.error(new RuntimeException("当前课程状态不允许结课，当前状态: " + status));
+                    }
+
+                    LocalDateTime now = LocalDateTime.now();
+                    long minutesAfterEnd = Duration.between(course.getEndTime(), now).toMinutes();
+
+                    if (minutesAfterEnd > 10) {
+                        return Mono.error(new RuntimeException("已超过结课时间10分钟，请等待系统自动结课"));
+                    }
+
+                    course.setStatus(CourseStatus.ENDED.getValue());
+                    course.setActualEndTime(now);
+                    course.setUpdatedAt(now);
+                    return groupCourseDao.updateEndInfo(course.getId(), String.valueOf(CourseStatus.ENDED.getValue()), now, now)
+                            .then(groupCourseDao.findByIdIsAndDeletedAtIsNull(course.getId()))
+                            .flatMap(entity -> invalidateStatisticsCache().thenReturn(entity));
+                });
+    }
+
+    // ==================== 违规记录 ====================
+
+    /**
+     * 记录教练违规行为（使用 DatabaseClient 直连，避免 R2DBC Entity 映射问题）
+     */
+    public Mono<Void> recordViolation(Long coachId, Long courseId, LocalDateTime violationTime,
+                                       ViolationReason reason) {
+        LocalDateTime now = LocalDateTime.now();
+        return databaseClient.sql("""
+                        INSERT INTO coach_violation (coach_id, course_id, violation_time, violation_reason, created_at, updated_at)
+                        VALUES (:coachId, :courseId, :violationTime, :reason, :now, :now)
+                        """)
+                .bind("coachId", coachId)
+                .bind("courseId", courseId)
+                .bind("violationTime", violationTime)
+                .bind("reason", reason.getValue())
+                .bind("now", now)
+                .then();
+    }
+
+    // ==================== 违规查询 ====================
+
+    /**
+     * 获取所有教练的违规次数统计
+     */
+    public Flux<Map<String, Object>> getViolationCounts() {
+        return databaseClient.sql("""
+                        SELECT coach_id, COUNT(*) AS count
+                        FROM coach_violation
+                        WHERE deleted_at IS NULL
+                        GROUP BY coach_id
+                        """)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 获取指定教练的违规记录
+     */
+    public Flux<Map<String, Object>> getCoachViolations(Long coachId) {
+        return databaseClient.sql("""
+                        SELECT v.*, gc.course_name
+                        FROM coach_violation v
+                        LEFT JOIN group_course gc ON v.course_id = gc.id AND gc.deleted_at IS NULL
+                        WHERE v.coach_id = :coachId AND v.deleted_at IS NULL
+                        ORDER BY v.violation_time DESC
+                        """)
+                .bind("coachId", coachId)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 清除统计缓存和团课缓存 —— 课程状态变更后调用，返回 Mono 确保链式执行
+     */
+    private Mono<Void> invalidateStatisticsCache() {
+        return redisUtil.deleteByPattern("datacount:statistics:*")
+                .then(redisUtil.deleteByPattern("group_course:*"))
+                .doOnNext(count -> {})
+                .then();
+    }
+}
@@ -0,0 +1,62 @@
+package cn.novalon.gym.manage.coach.entity;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("CoachViolationEntity 单元测试")
+class CoachViolationEntityTest {
+
+    @Test
+    @DisplayName("无参构造和setter/getter应正确设置和读取coachId")
+    void shouldSetAndGetCoachId() {
+        CoachViolationEntity entity = new CoachViolationEntity();
+        entity.setCoachId(100L);
+        assertThat(entity.getCoachId()).isEqualTo(100L);
+    }
+
+    @Test
+    @DisplayName("无参构造和setter/getter应正确设置和读取courseId")
+    void shouldSetAndGetCourseId() {
+        CoachViolationEntity entity = new CoachViolationEntity();
+        entity.setCourseId(200L);
+        assertThat(entity.getCourseId()).isEqualTo(200L);
+    }
+
+    @Test
+    @DisplayName("无参构造和setter/getter应正确设置和读取violationTime")
+    void shouldSetAndGetViolationTime() {
+        CoachViolationEntity entity = new CoachViolationEntity();
+        LocalDateTime time = LocalDateTime.of(2026, 7, 20, 14, 30, 0);
+        entity.setViolationTime(time);
+        assertThat(entity.getViolationTime()).isEqualTo(time);
+    }
+
+    @Test
+    @DisplayName("无参构造和setter/getter应正确设置和读取violationReason")
+    void shouldSetAndGetViolationReason() {
+        CoachViolationEntity entity = new CoachViolationEntity();
+        entity.setViolationReason("COACH_LATE");
+        assertThat(entity.getViolationReason()).isEqualTo("COACH_LATE");
+    }
+
+    @Test
+    @DisplayName("所有字段应可正常设置和读取")
+    void shouldSetAndGetAllFieldsCorrectly() {
+        CoachViolationEntity entity = new CoachViolationEntity();
+        LocalDateTime time = LocalDateTime.of(2026, 7, 22, 9, 0, 0);
+
+        entity.setCoachId(1L);
+        entity.setCourseId(2L);
+        entity.setViolationTime(time);
+        entity.setViolationReason("COACH_ABSENT");
+
+        assertThat(entity.getCoachId()).isEqualTo(1L);
+        assertThat(entity.getCourseId()).isEqualTo(2L);
+        assertThat(entity.getViolationTime()).isEqualTo(time);
+        assertThat(entity.getViolationReason()).isEqualTo("COACH_ABSENT");
+    }
+}
@@ -0,0 +1,63 @@
+package cn.novalon.gym.manage.coach.enums;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("ViolationReason 枚举单元测试")
+class CoachEnumsTest {
+
+    @Test
+    @DisplayName("COACH_LATE应具有正确的name和description")
+    void coachLateShouldHaveCorrectValueAndDesc() {
+        assertThat(ViolationReason.COACH_LATE.getValue()).isEqualTo("COACH_LATE");
+        assertThat(ViolationReason.COACH_LATE.getDesc()).isEqualTo("教练迟到");
+    }
+
+    @Test
+    @DisplayName("COACH_ABSENT应具有正确的name和description")
+    void coachAbsentShouldHaveCorrectValueAndDesc() {
+        assertThat(ViolationReason.COACH_ABSENT.getValue()).isEqualTo("COACH_ABSENT");
+        assertThat(ViolationReason.COACH_ABSENT.getDesc()).isEqualTo("教练缺席");
+    }
+
+    @Test
+    @DisplayName("NOT_MANUAL_END应具有正确的name和description")
+    void notManualEndShouldHaveCorrectValueAndDesc() {
+        assertThat(ViolationReason.NOT_MANUAL_END.getValue()).isEqualTo("NOT_MANUAL_END");
+        assertThat(ViolationReason.NOT_MANUAL_END.getDesc()).isEqualTo("教练未手动结课");
+    }
+
+    @Test
+    @DisplayName("枚举值总数应为3个")
+    void shouldHaveThreeValues() {
+        assertThat(ViolationReason.values()).hasSize(3);
+    }
+
+    @ParameterizedTest
+    @EnumSource(ViolationReason.class)
+    @DisplayName("每个枚举值的getValue和getDesc均不应为空")
+    void everyEnumShouldHaveNonEmptyValueAndDesc(ViolationReason reason) {
+        assertThat(reason.getValue()).isNotBlank();
+        assertThat(reason.getDesc()).isNotBlank();
+    }
+
+    @Test
+    @DisplayName("name()方法应返回枚举常量名称")
+    void nameShouldReturnEnumConstantName() {
+        assertThat(ViolationReason.COACH_LATE.name()).isEqualTo("COACH_LATE");
+        assertThat(ViolationReason.COACH_ABSENT.name()).isEqualTo("COACH_ABSENT");
+        assertThat(ViolationReason.NOT_MANUAL_END.name()).isEqualTo("NOT_MANUAL_END");
+    }
+
+    @Test
+    @DisplayName("valueOf应正确解析枚举常量名称")
+    void valueOfShouldParseCorrectly() {
+        assertThat(ViolationReason.valueOf("COACH_LATE")).isEqualTo(ViolationReason.COACH_LATE);
+        assertThat(ViolationReason.valueOf("COACH_ABSENT")).isEqualTo(ViolationReason.COACH_ABSENT);
+        assertThat(ViolationReason.valueOf("NOT_MANUAL_END")).isEqualTo(ViolationReason.NOT_MANUAL_END);
+    }
+}
@@ -67,7 +67,12 @@
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
-            <version>5.2.5</version>
+        </dependency>
+
+        <!-- Fix commons-compress version for POI compatibility -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
        </dependency>

        <!-- Gym Modules -->
@@ -100,8 +105,20 @@
    <build>
        <plugins>
            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
            </plugin>
        </plugins>
    </build>
@@ -6,6 +6,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.Map;

 /**
 * 数据统计 DAO - 使用 DatabaseClient 执行跨表聚合查询
@@ -180,4 +181,175 @@ public class DataStatisticsDao {
            this.count = count;
        }
    }
+
+    // ========== 教练相关统计 ==========
+
+    /** 统计教练总数（角色为"教练"的用户） */
+    public Mono<Long> countTotalCoaches() {
+        return databaseClient.sql("""
+                        SELECT COUNT(*) FROM sys_user u
+                        INNER JOIN user_role ur ON u.id = ur.user_id
+                        INNER JOIN sys_role sr ON ur.role_id = sr.id
+                        WHERE sr.role_key = 'coach' AND u.deleted_at IS NULL
+                        """)
+                .map(row -> row.get(0, Long.class))
+                .one();
+    }
+
+    /** 统计违规总数（时间范围） */
+    public Mono<Long> countTotalViolations(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT COUNT(*) FROM coach_violation
+                        WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .map(row -> row.get(0, Long.class))
+                .one();
+    }
+
+    /** 按违规类型统计次数 */
+    public Flux<Map<String, Object>> countViolationsByReason(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT violation_reason, COUNT(*) AS count
+                        FROM coach_violation
+                        WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
+                        GROUP BY violation_reason
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
+
+    /** 统计有违规记录的教练数 */
+    public Mono<Long> countViolatedCoaches(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT COUNT(DISTINCT coach_id) FROM coach_violation
+                        WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .map(row -> row.get(0, Long.class))
+                .one();
+    }
+
+    /** 统计区间内开课的团课数 */
+    public Mono<Long> countCourses(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT COUNT(*) FROM group_course
+                        WHERE start_time >= :startTime AND start_time < :endTime AND deleted_at IS NULL
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .map(row -> row.get(0, Long.class))
+                .one();
+    }
+
+    // ========== 教练业绩统计 ==========
+
+    /**
+     * 获取所有教练基本信息（ID、昵称、用户名）
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> getAllCoachesWithInfo() {
+        return databaseClient.sql("""
+                        SELECT u.id, u.nickname, u.username
+                        FROM sys_user u
+                        INNER JOIN user_role ur ON u.id = ur.user_id
+                        INNER JOIN sys_role sr ON ur.role_id = sr.id
+                        WHERE sr.role_key = 'coach' AND u.deleted_at IS NULL
+                        ORDER BY u.id
+                        """)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 按教练统计已完成课程数（status=2或6）
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> countCompletedCoursesByCoach(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT coach_id, COUNT(*) AS count
+                        FROM group_course
+                        WHERE start_time >= :startTime AND start_time < :endTime
+                        AND status IN ('2', '6') AND deleted_at IS NULL
+                        GROUP BY coach_id
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 按教练统计出席人次（通过团课关联，booking.status='2'）
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> countAttendedStudentsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT gc.coach_id, COUNT(*) AS count
+                        FROM group_course_booking b
+                        INNER JOIN group_course gc ON b.course_id = gc.id
+                        WHERE b.status = '2' AND b.deleted_at IS NULL
+                        AND gc.deleted_at IS NULL
+                        AND gc.start_time >= :startTime AND gc.start_time < :endTime
+                        GROUP BY gc.coach_id
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 按教练统计总非取消预约数（用于计算出勤率分母）
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> countTotalBookingsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT gc.coach_id, COUNT(*) AS count
+                        FROM group_course_booking b
+                        INNER JOIN group_course gc ON b.course_id = gc.id
+                        WHERE b.status != '1' AND b.deleted_at IS NULL
+                        AND gc.deleted_at IS NULL
+                        AND gc.start_time >= :startTime AND gc.start_time < :endTime
+                        GROUP BY gc.coach_id
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 按教练获取满员率明细（每个已完成课程的出席人数和最大容量）
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> getFillRateDetailByCoach(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT gc.coach_id, gc.max_members, COUNT(b.id) AS attended
+                        FROM group_course gc
+                        LEFT JOIN group_course_booking b ON gc.id = b.course_id AND b.status = '2' AND b.deleted_at IS NULL
+                        WHERE gc.start_time >= :startTime AND gc.start_time < :endTime
+                        AND gc.status IN ('2', '6') AND gc.deleted_at IS NULL
+                        GROUP BY gc.coach_id, gc.id, gc.max_members
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
+
+    /**
+     * 按教练统计违规次数
+     */
+    public reactor.core.publisher.Flux<java.util.Map<String, Object>> countViolationsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
+        return databaseClient.sql("""
+                        SELECT coach_id, COUNT(*) AS count
+                        FROM coach_violation
+                        WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
+                        GROUP BY coach_id
+                        """)
+                .bind("startTime", startTime)
+                .bind("endTime", endTime)
+                .fetch()
+                .all();
+    }
 }
@@ -0,0 +1,49 @@
+package cn.novalon.gym.manage.datacount.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 教练个人业绩
+ *
+ * @author system
+ * @date 2026-07-22
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CoachPerformance {
+
+    /** 教练ID */
+    private Long coachId;
+
+    /** 教练昵称 */
+    private String coachName;
+
+    /** 教练头像 */
+    private String avatar;
+
+    /** 授课量（已完成课程数） */
+    private Long completedCourses;
+
+    /** 出席人次 */
+    private Long attendedStudents;
+
+    /** 总非取消预约数 */
+    private Long totalBookings;
+
+    /** 出勤率（百分比） */
+    private Double attendanceRate;
+
+    /** 满员率（百分比） */
+    private Double fillRate;
+
+    /** 违规次数 */
+    private Long violationCount;
+
+    /** 综合评分 */
+    private Double compositeScore;
+}
@@ -0,0 +1,40 @@
+package cn.novalon.gym.manage.datacount.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 教练统计数据
+ *
+ * @author 张翔
+ * @date 2026-07-20
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CoachStatistics {
+
+    /** 教练总数 */
+    private Long totalCoaches;
+
+    /** 违规总数 */
+    private Long totalViolations;
+
+    /** 迟到次数 */
+    private Long lateCount;
+
+    /** 缺席次数 */
+    private Long absentCount;
+
+    /** 未手动结课次数 */
+    private Long notManualEndCount;
+
+    /** 有违规记录的教练数 */
+    private Long violatedCoaches;
+
+    /** 统计区间内开课的团课数 */
+    private Long totalCourses;
+}
@@ -59,6 +59,12 @@ public class DataStatistics {
        public static final String WEEK = "WEEK";
        /** 月统计 */
        public static final String MONTH = "MONTH";
+        /** 近30天 */
+        public static final String LAST_30_DAYS = "LAST_30_DAYS";
+        /** 近90天 */
+        public static final String LAST_90_DAYS = "LAST_90_DAYS";
+        /** 今年 */
+        public static final String YEAR = "YEAR";

        private PeriodType() {}
    }
@@ -37,6 +37,11 @@ public class StatisticsSummary {
     */
    private SignInStatistics signInStatistics;

+    /**
+     * 教练统计数据
+     */
+    private CoachStatistics coachStatistics;
+
    /**
     * 统计数据生成时间
     */
@@ -0,0 +1,101 @@
+package cn.novalon.gym.manage.datacount.handler;
+
+import cn.novalon.gym.manage.datacount.domain.CoachPerformance;
+import cn.novalon.gym.manage.datacount.domain.StatisticsQuery;
+import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 教练业绩 Handler
+ *
+ * @author system
+ * @date 2026-07-22
+ */
+@Component
+@Tag(name = "教练业绩", description = "教练业绩统计相关操作")
+public class CoachPerformanceHandler {
+
+    private static final Logger log = LoggerFactory.getLogger(CoachPerformanceHandler.class);
+
+    @Autowired
+    private IDataStatisticsService dataStatisticsService;
+
+    @Operation(summary = "获取教练业绩排行榜", description = "获取所有教练的业绩排名（按综合评分降序）")
+    public Mono<ServerResponse> getCoachPerformanceRanking(ServerRequest request) {
+        StatisticsQuery query = buildQueryFromRequest(request);
+
+        return dataStatisticsService.getCoachPerformanceList(query)
+                .collectList()
+                .flatMap(list -> ServerResponse.ok().bodyValue(list))
+                .onErrorResume(e -> {
+                    log.error("获取教练业绩排行榜失败", e);
+                    return ServerResponse.ok().bodyValue(java.util.List.of());
+                });
+    }
+
+    @Operation(summary = "获取指定教练业绩", description = "获取单个教练的业绩详情")
+    public Mono<ServerResponse> getCoachPerformanceById(ServerRequest request) {
+        Long coachId = Long.parseLong(request.pathVariable("coachId"));
+        StatisticsQuery query = buildQueryFromRequest(request);
+
+        return dataStatisticsService.getCoachPerformanceById(coachId, query)
+                .flatMap(p -> ServerResponse.ok().bodyValue(p))
+                .onErrorResume(e -> {
+                    log.error("获取教练{}业绩失败", coachId, e);
+                    return ServerResponse.ok().bodyValue(
+                            CoachPerformance.builder().coachId(coachId).coachName("获取失败").build());
+                });
+    }
+
+    @Operation(summary = "获取当前教练业绩", description = "当前登录的教练查看自己的业绩")
+    public Mono<ServerResponse> getMyPerformance(ServerRequest request) {
+        return request.queryParam("coachId")
+                .map(coachIdStr -> {
+                    Long coachId = Long.parseLong(coachIdStr);
+                    StatisticsQuery query = buildQueryFromRequest(request);
+                    return dataStatisticsService.getCoachPerformanceById(coachId, query)
+                            .flatMap(p -> ServerResponse.ok().bodyValue(p));
+                })
+                .orElse(ServerResponse.badRequest().bodyValue("缺少 coachId 参数"));
+    }
+
+    private StatisticsQuery buildQueryFromRequest(ServerRequest request) {
+        StatisticsQuery.StatisticsQueryBuilder builder = StatisticsQuery.builder();
+
+        request.queryParam("statType").ifPresent(builder::statType);
+        request.queryParam("periodType").ifPresent(builder::periodType);
+        request.queryParam("startTime").ifPresent(startTimeStr -> {
+            try {
+                builder.startTime(LocalDateTime.parse(startTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+            } catch (Exception e) {
+                try {
+                    builder.startTime(LocalDateTime.parse(startTimeStr));
+                } catch (Exception ignored) {
+                }
+            }
+        });
+        request.queryParam("endTime").ifPresent(endTimeStr -> {
+            try {
+                builder.endTime(LocalDateTime.parse(endTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+            } catch (Exception e) {
+                try {
+                    builder.endTime(LocalDateTime.parse(endTimeStr));
+                } catch (Exception ignored) {
+                }
+            }
+        });
+
+        return builder.build();
+    }
+}
@@ -75,4 +75,21 @@ public interface IDataStatisticsService {
     * @return 统计数据
     */
    Mono<StatisticsSummary> getStatisticsSummaryWithCache(StatisticsQuery query);
+
+    /**
+     * 获取教练业绩排行榜
+     *
+     * @param query 查询条件
+     * @return 教练业绩列表（按综合评分降序）
+     */
+    reactor.core.publisher.Flux<CoachPerformance> getCoachPerformanceList(StatisticsQuery query);
+
+    /**
+     * 获取单个教练业绩
+     *
+     * @param coachId 教练ID
+     * @param query 查询条件
+     * @return 单个教练业绩
+     */
+    Mono<CoachPerformance> getCoachPerformanceById(Long coachId, StatisticsQuery query);
 }
@@ -22,8 +22,11 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * 数据统计服务实现类
@@ -171,18 +174,47 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
        return count != null ? count : 0L;
    }

+    private Mono<CoachStatistics> getCoachStatistics(StatisticsQuery query) {
+        LocalDateTime startTime = getStartTime(query);
+        LocalDateTime endTime = getEndTime(query);
+
+        Mono<Long> totalCoachesMono = dataStatisticsDao.countTotalCoaches();
+        Mono<Long> totalViolationsMono = dataStatisticsDao.countTotalViolations(startTime, endTime);
+        Mono<Long> violatedCoachesMono = dataStatisticsDao.countViolatedCoaches(startTime, endTime);
+        Mono<Long> totalCoursesMono = dataStatisticsDao.countCourses(startTime, endTime);
+        Mono<Map<String, Long>> violationByReasonMono = dataStatisticsDao.countViolationsByReason(startTime, endTime)
+                .collectMap(row -> (String) row.get("violation_reason"),
+                            row -> ((Number) row.get("count")).longValue());
+
+        return Mono.zip(totalCoachesMono, totalViolationsMono, violatedCoachesMono, totalCoursesMono, violationByReasonMono)
+                .map(tuple -> {
+                    Map<String, Long> reasonMap = tuple.getT5();
+                    return CoachStatistics.builder()
+                            .totalCoaches(tuple.getT1())
+                            .totalViolations(tuple.getT2())
+                            .lateCount(reasonMap.getOrDefault("COACH_LATE", 0L))
+                            .absentCount(reasonMap.getOrDefault("COACH_ABSENT", 0L))
+                            .notManualEndCount(reasonMap.getOrDefault("NOT_MANUAL_END", 0L))
+                            .violatedCoaches(tuple.getT3())
+                            .totalCourses(tuple.getT4())
+                            .build();
+                });
+    }
+
    @Override
    public Mono<StatisticsSummary> getStatisticsSummary(StatisticsQuery query) {
        Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query);
        Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query);
        Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query);
+        Mono<CoachStatistics> coachStatsMono = getCoachStatistics(query);

-        return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono)
+        return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono, coachStatsMono)
                .map(tuple -> StatisticsSummary.builder()
                        .statDate(LocalDateTime.now().toLocalDate().toString())
                        .memberStatistics(tuple.getT1())
                        .bookingStatistics(tuple.getT2())
                        .signInStatistics(tuple.getT3())
+                        .coachStatistics(tuple.getT4())
                        .generatedAt(LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
                        .build());
    }
@@ -458,13 +490,16 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
        String periodType = query.getPeriodType();

        if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
-            // 周统计：本周一
            return today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay();
        } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
-            // 月统计：本月第一天
            return today.withDayOfMonth(1).atStartOfDay();
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
+            return today.minusDays(29).atStartOfDay();
+        } else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
+            return today.minusDays(89).atStartOfDay();
+        } else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            return today.withDayOfYear(1).atStartOfDay();
        } else {
-            // 日统计：当天零点
            return today.atStartOfDay();
        }
    }
@@ -478,17 +513,146 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
        String periodType = query.getPeriodType();

        if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
-            // 周统计：本周日 23:59:59
            return today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)).atTime(23, 59, 59);
        } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
-            // 月统计：本月最后一天 23:59:59
            return today.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)
+                || DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)
+                || DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            return LocalDateTime.now();
        } else {
-            // 日统计：当前时间
            return LocalDateTime.now();
        }
    }

+    // ========== 教练业绩统计 ==========
+
+    @Override
+    public reactor.core.publisher.Flux<CoachPerformance> getCoachPerformanceList(StatisticsQuery query) {
+        LocalDateTime startTime = getStartTime(query);
+        LocalDateTime endTime = getEndTime(query);
+
+        // 1. 获取所有教练基本信息
+        Mono<Map<Long, Map<String, Object>>> coachesMono = dataStatisticsDao.getAllCoachesWithInfo()
+                .collectMap(row -> ((Number) row.get("id")).longValue(), row -> row);
+
+        // 2. 各教练授课量
+        Mono<Map<Long, Long>> coursesMono = dataStatisticsDao.countCompletedCoursesByCoach(startTime, endTime)
+                .collectMap(row -> ((Number) row.get("coach_id")).longValue(),
+                            row -> ((Number) row.get("count")).longValue());
+
+        // 3. 各教练出席人次
+        Mono<Map<Long, Long>> attendedMono = dataStatisticsDao.countAttendedStudentsByCoach(startTime, endTime)
+                .collectMap(row -> ((Number) row.get("coach_id")).longValue(),
+                            row -> ((Number) row.get("count")).longValue());
+
+        // 4. 各教练总预约数（非取消）
+        Mono<Map<Long, Long>> totalBookingsMono = dataStatisticsDao.countTotalBookingsByCoach(startTime, endTime)
+                .collectMap(row -> ((Number) row.get("coach_id")).longValue(),
+                            row -> ((Number) row.get("count")).longValue());
+
+        // 5. 满员率明细（collectMultimap 返回 Collection<V> 而非 List<V>）
+        Mono<Map<Long, Collection<FillRateItem>>> fillRateMono = dataStatisticsDao.getFillRateDetailByCoach(startTime, endTime)
+                .map(row -> new FillRateItem(
+                        ((Number) row.get("coach_id")).longValue(),
+                        ((Number) row.get("max_members")).intValue(),
+                        ((Number) row.get("attended")).longValue()
+                ))
+                .collectMultimap(FillRateItem::coachId);
+
+        // 6. 各教练违规次数
+        Mono<Map<Long, Long>> violationsMono = dataStatisticsDao.countViolationsByCoach(startTime, endTime)
+                .collectMap(row -> ((Number) row.get("coach_id")).longValue(),
+                            row -> ((Number) row.get("count")).longValue());
+
+        return Mono.zip(coachesMono, coursesMono, attendedMono, totalBookingsMono, fillRateMono, violationsMono)
+                .flatMapMany(tuple -> {
+                    Map<Long, Map<String, Object>> coaches = tuple.getT1();
+                    Map<Long, Long> coursesMap = tuple.getT2();
+                    Map<Long, Long> attendedMap = tuple.getT3();
+                    Map<Long, Long> totalBookingsMap = tuple.getT4();
+                    Map<Long, Collection<FillRateItem>> fillRateMap = tuple.getT5();
+                    Map<Long, Long> violationsMap = tuple.getT6();
+
+                    // 计算最大授课量（用于归一化）
+                    long maxCourses = coursesMap.values().stream().mapToLong(Long::longValue).max().orElse(1L);
+
+                    List<CoachPerformance> performances = coaches.keySet().stream()
+                            .map(coachId -> {
+                                Map<String, Object> coachInfo = coaches.get(coachId);
+                                long courses = coursesMap.getOrDefault(coachId, 0L);
+                                long attended = attendedMap.getOrDefault(coachId, 0L);
+                                long totalBookings = totalBookingsMap.getOrDefault(coachId, 0L);
+                                long violations = violationsMap.getOrDefault(coachId, 0L);
+
+                                double attendanceRate = totalBookings > 0
+                                        ? (double) attended / totalBookings * 100 : 0;
+                                double fillRate = calculateFillRate(fillRateMap.getOrDefault(coachId, List.of()));
+                                double normalizedCourses = maxCourses > 0
+                                        ? (double) courses / maxCourses * 100 : 0;
+                                double compositeScore = normalizedCourses * 0.4
+                                        + attendanceRate * 0.3 + fillRate * 0.3;
+
+                                return CoachPerformance.builder()
+                                        .coachId(coachId)
+                                        .coachName(getString(coachInfo, "nickname", getString(coachInfo, "username", "")))
+                                        .avatar(getString(coachInfo, "avatar", null))
+                                        .completedCourses(courses)
+                                        .attendedStudents(attended)
+                                        .totalBookings(totalBookings)
+                                        .attendanceRate(Math.round(attendanceRate * 100.0) / 100.0)
+                                        .fillRate(Math.round(fillRate * 100.0) / 100.0)
+                                        .violationCount(violations)
+                                        .compositeScore(Math.round(compositeScore * 100.0) / 100.0)
+                                        .build();
+                            })
+                            .sorted((a, b) -> Double.compare(b.getCompositeScore(), a.getCompositeScore()))
+                            .collect(Collectors.toList());
+
+                    return reactor.core.publisher.Flux.fromIterable(performances);
+                });
+    }
+
+    @Override
+    public Mono<CoachPerformance> getCoachPerformanceById(Long coachId, StatisticsQuery query) {
+        return getCoachPerformanceList(query)
+                .filter(p -> p.getCoachId().equals(coachId))
+                .next()
+                .switchIfEmpty(Mono.just(CoachPerformance.builder()
+                        .coachId(coachId)
+                        .coachName("未知教练")
+                        .completedCourses(0L)
+                        .attendedStudents(0L)
+                        .totalBookings(0L)
+                        .attendanceRate(0.0)
+                        .fillRate(0.0)
+                        .violationCount(0L)
+                        .compositeScore(0.0)
+                        .build()));
+    }
+
+    /**
+     * 计算满员率：各课程 (出席人数/maxMembers) 的平均值
+     */
+    private double calculateFillRate(Collection<FillRateItem> items) {
+        if (items == null || items.isEmpty()) return 0;
+        return items.stream()
+                .mapToDouble(item -> item.maxMembers > 0
+                        ? (double) item.attended / item.maxMembers * 100 : 0)
+                .average()
+                .orElse(0);
+    }
+
+    private String getString(Map<String, Object> map, String key, String defaultValue) {
+        Object val = map.get(key);
+        return val != null ? val.toString() : defaultValue;
+    }
+
+    /**
+     * 满员率明细项
+     */
+    private record FillRateItem(Long coachId, int maxMembers, long attended) {}
+
    /**
     * 根据周期类型调整时间范围
     * 用于定时任务中的周期统计
@@ -503,6 +667,15 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
        } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
            startTime = date.withDayOfMonth(1).atStartOfDay();
            endTime = date.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
+            startTime = date.minusDays(29).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
+            startTime = date.minusDays(89).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            startTime = date.withDayOfYear(1).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
        } else {
            startTime = date.atStartOfDay();
            endTime = date.plusDays(1).atStartOfDay();
@@ -0,0 +1,280 @@
+package cn.novalon.gym.manage.datacount.domain;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("DataCount 领域对象单元测试")
+class DomainObjectsTest {
+
+    @Nested
+    @DisplayName("MemberStatistics 测试")
+    class MemberStatisticsTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            MemberStatistics ms = new MemberStatistics();
+
+            ms.setStatDate("2026-07-22");
+            ms.setNewMembers(150L);
+            ms.setActiveMembers(320L);
+            ms.setTotalMembers(5000L);
+            ms.setSignInMembers(200L);
+            ms.setBookingMembers(180L);
+            ms.setCancelBookingMembers(15L);
+
+            assertThat(ms.getStatDate()).isEqualTo("2026-07-22");
+            assertThat(ms.getNewMembers()).isEqualTo(150L);
+            assertThat(ms.getActiveMembers()).isEqualTo(320L);
+            assertThat(ms.getTotalMembers()).isEqualTo(5000L);
+            assertThat(ms.getSignInMembers()).isEqualTo(200L);
+            assertThat(ms.getBookingMembers()).isEqualTo(180L);
+            assertThat(ms.getCancelBookingMembers()).isEqualTo(15L);
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            MemberStatistics ms = MemberStatistics.builder()
+                    .statDate("2026-06-15")
+                    .newMembers(50L)
+                    .activeMembers(100L)
+                    .totalMembers(2000L)
+                    .signInMembers(80L)
+                    .bookingMembers(70L)
+                    .cancelBookingMembers(5L)
+                    .build();
+
+            assertThat(ms.getStatDate()).isEqualTo("2026-06-15");
+            assertThat(ms.getNewMembers()).isEqualTo(50L);
+            assertThat(ms.getActiveMembers()).isEqualTo(100L);
+            assertThat(ms.getTotalMembers()).isEqualTo(2000L);
+            assertThat(ms.getSignInMembers()).isEqualTo(80L);
+            assertThat(ms.getBookingMembers()).isEqualTo(70L);
+            assertThat(ms.getCancelBookingMembers()).isEqualTo(5L);
+        }
+    }
+
+    @Nested
+    @DisplayName("BookingStatistics 测试")
+    class BookingStatisticsTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            BookingStatistics bs = new BookingStatistics();
+
+            bs.setStatDate("2026-07-22");
+            bs.setNewBookings(60L);
+            bs.setCancelBookings(10L);
+            bs.setAttendBookings(45L);
+            bs.setAbsentBookings(5L);
+            bs.setAttendanceRate(0.90);
+            bs.setCancelRate(0.10);
+            bs.setBookingMembers(55L);
+            bs.setCancelMembers(8L);
+
+            assertThat(bs.getStatDate()).isEqualTo("2026-07-22");
+            assertThat(bs.getNewBookings()).isEqualTo(60L);
+            assertThat(bs.getCancelBookings()).isEqualTo(10L);
+            assertThat(bs.getAttendBookings()).isEqualTo(45L);
+            assertThat(bs.getAbsentBookings()).isEqualTo(5L);
+            assertThat(bs.getAttendanceRate()).isEqualTo(0.90);
+            assertThat(bs.getCancelRate()).isEqualTo(0.10);
+            assertThat(bs.getBookingMembers()).isEqualTo(55L);
+            assertThat(bs.getCancelMembers()).isEqualTo(8L);
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            BookingStatistics bs = BookingStatistics.builder()
+                    .statDate("2026-07-01")
+                    .newBookings(30L)
+                    .cancelBookings(3L)
+                    .attendBookings(25L)
+                    .absentBookings(2L)
+                    .attendanceRate(0.83)
+                    .cancelRate(0.10)
+                    .bookingMembers(28L)
+                    .cancelMembers(3L)
+                    .build();
+
+            assertThat(bs.getStatDate()).isEqualTo("2026-07-01");
+            assertThat(bs.getNewBookings()).isEqualTo(30L);
+            assertThat(bs.getCancelBookings()).isEqualTo(3L);
+            assertThat(bs.getAttendBookings()).isEqualTo(25L);
+            assertThat(bs.getAbsentBookings()).isEqualTo(2L);
+            assertThat(bs.getAttendanceRate()).isEqualTo(0.83);
+            assertThat(bs.getCancelRate()).isEqualTo(0.10);
+            assertThat(bs.getBookingMembers()).isEqualTo(28L);
+            assertThat(bs.getCancelMembers()).isEqualTo(3L);
+        }
+    }
+
+    @Nested
+    @DisplayName("SignInStatistics 测试")
+    class SignInStatisticsTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            SignInStatistics ss = new SignInStatistics();
+
+            ss.setStatDate("2026-07-22");
+            ss.setTotalSignIns(200L);
+            ss.setSuccessSignIns(180L);
+            ss.setFailedSignIns(20L);
+            ss.setSuccessRate(0.90);
+            ss.setSignInMembers(150L);
+            ss.setQrCodeSignIns(100L);
+            ss.setManualSignIns(50L);
+            ss.setFaceSignIns(30L);
+
+            assertThat(ss.getStatDate()).isEqualTo("2026-07-22");
+            assertThat(ss.getTotalSignIns()).isEqualTo(200L);
+            assertThat(ss.getSuccessSignIns()).isEqualTo(180L);
+            assertThat(ss.getFailedSignIns()).isEqualTo(20L);
+            assertThat(ss.getSuccessRate()).isEqualTo(0.90);
+            assertThat(ss.getSignInMembers()).isEqualTo(150L);
+            assertThat(ss.getQrCodeSignIns()).isEqualTo(100L);
+            assertThat(ss.getManualSignIns()).isEqualTo(50L);
+            assertThat(ss.getFaceSignIns()).isEqualTo(30L);
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            SignInStatistics ss = SignInStatistics.builder()
+                    .statDate("2026-06-01")
+                    .totalSignIns(500L)
+                    .successSignIns(480L)
+                    .failedSignIns(20L)
+                    .successRate(0.96)
+                    .signInMembers(400L)
+                    .qrCodeSignIns(300L)
+                    .manualSignIns(100L)
+                    .faceSignIns(80L)
+                    .build();
+
+            assertThat(ss.getStatDate()).isEqualTo("2026-06-01");
+            assertThat(ss.getTotalSignIns()).isEqualTo(500L);
+            assertThat(ss.getSuccessSignIns()).isEqualTo(480L);
+            assertThat(ss.getFailedSignIns()).isEqualTo(20L);
+            assertThat(ss.getSuccessRate()).isEqualTo(0.96);
+            assertThat(ss.getSignInMembers()).isEqualTo(400L);
+            assertThat(ss.getQrCodeSignIns()).isEqualTo(300L);
+            assertThat(ss.getManualSignIns()).isEqualTo(100L);
+            assertThat(ss.getFaceSignIns()).isEqualTo(80L);
+        }
+    }
+
+    @Nested
+    @DisplayName("StatisticsSummary 测试")
+    class StatisticsSummaryTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            MemberStatistics ms = MemberStatistics.builder().newMembers(10L).build();
+            BookingStatistics bs = BookingStatistics.builder().newBookings(20L).build();
+            SignInStatistics ss = SignInStatistics.builder().totalSignIns(30L).build();
+            CoachStatistics cs = CoachStatistics.builder().totalCoaches(5L).build();
+
+            StatisticsSummary summary = new StatisticsSummary();
+            summary.setStatDate("2026-07-22");
+            summary.setMemberStatistics(ms);
+            summary.setBookingStatistics(bs);
+            summary.setSignInStatistics(ss);
+            summary.setCoachStatistics(cs);
+            summary.setGeneratedAt("2026-07-22T10:00:00");
+
+            assertThat(summary.getStatDate()).isEqualTo("2026-07-22");
+            assertThat(summary.getMemberStatistics()).isSameAs(ms);
+            assertThat(summary.getBookingStatistics()).isSameAs(bs);
+            assertThat(summary.getSignInStatistics()).isSameAs(ss);
+            assertThat(summary.getCoachStatistics()).isSameAs(cs);
+            assertThat(summary.getGeneratedAt()).isEqualTo("2026-07-22T10:00:00");
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            MemberStatistics ms = MemberStatistics.builder().newMembers(5L).build();
+
+            StatisticsSummary summary = StatisticsSummary.builder()
+                    .statDate("2026-07-22")
+                    .memberStatistics(ms)
+                    .generatedAt("2026-07-22T12:00:00")
+                    .build();
+
+            assertThat(summary.getStatDate()).isEqualTo("2026-07-22");
+            assertThat(summary.getMemberStatistics()).isSameAs(ms);
+            assertThat(summary.getGeneratedAt()).isEqualTo("2026-07-22T12:00:00");
+        }
+    }
+
+    @Nested
+    @DisplayName("CoachPerformance 测试")
+    class CoachPerformanceTest {
+
+        @Test
+        @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+        void shouldSetAndGetAllFields() {
+            CoachPerformance cp = new CoachPerformance();
+
+            cp.setCoachId(1L);
+            cp.setCoachName("张教练");
+            cp.setAvatar("https://avatar.jpg");
+            cp.setCompletedCourses(50L);
+            cp.setAttendedStudents(200L);
+            cp.setTotalBookings(220L);
+            cp.setAttendanceRate(0.91);
+            cp.setFillRate(0.85);
+            cp.setViolationCount(2L);
+            cp.setCompositeScore(88.5);
+
+            assertThat(cp.getCoachId()).isEqualTo(1L);
+            assertThat(cp.getCoachName()).isEqualTo("张教练");
+            assertThat(cp.getAvatar()).isEqualTo("https://avatar.jpg");
+            assertThat(cp.getCompletedCourses()).isEqualTo(50L);
+            assertThat(cp.getAttendedStudents()).isEqualTo(200L);
+            assertThat(cp.getTotalBookings()).isEqualTo(220L);
+            assertThat(cp.getAttendanceRate()).isEqualTo(0.91);
+            assertThat(cp.getFillRate()).isEqualTo(0.85);
+            assertThat(cp.getViolationCount()).isEqualTo(2L);
+            assertThat(cp.getCompositeScore()).isEqualTo(88.5);
+        }
+
+        @Test
+        @DisplayName("Builder构造应正确设置所有字段")
+        void shouldBuildCorrectly() {
+            CoachPerformance cp = CoachPerformance.builder()
+                    .coachId(2L)
+                    .coachName("李教练")
+                    .avatar("http://example.com/avatar.png")
+                    .completedCourses(100L)
+                    .attendedStudents(500L)
+                    .totalBookings(520L)
+                    .attendanceRate(0.96)
+                    .fillRate(0.92)
+                    .violationCount(0L)
+                    .compositeScore(95.0)
+                    .build();
+
+            assertThat(cp.getCoachId()).isEqualTo(2L);
+            assertThat(cp.getCoachName()).isEqualTo("李教练");
+            assertThat(cp.getAvatar()).isEqualTo("http://example.com/avatar.png");
+            assertThat(cp.getCompletedCourses()).isEqualTo(100L);
+            assertThat(cp.getAttendedStudents()).isEqualTo(500L);
+            assertThat(cp.getTotalBookings()).isEqualTo(520L);
+            assertThat(cp.getAttendanceRate()).isEqualTo(0.96);
+            assertThat(cp.getFillRate()).isEqualTo(0.92);
+            assertThat(cp.getViolationCount()).isEqualTo(0L);
+            assertThat(cp.getCompositeScore()).isEqualTo(95.0);
+        }
+    }
+}
@@ -0,0 +1,74 @@
+package cn.novalon.gym.manage.datacount.domain;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("StatisticsQuery 单元测试")
+class StatisticsQueryTest {
+
+    @Test
+    @DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
+    void shouldSetAndGetAllFields() {
+        StatisticsQuery query = new StatisticsQuery();
+        LocalDateTime start = LocalDateTime.of(2026, 7, 1, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2026, 7, 22, 23, 59);
+
+        query.setStatType("MEMBER");
+        query.setPeriodType("MONTH");
+        query.setStartTime(start);
+        query.setEndTime(end);
+        query.setPage(0);
+        query.setSize(20);
+
+        assertThat(query.getStatType()).isEqualTo("MEMBER");
+        assertThat(query.getPeriodType()).isEqualTo("MONTH");
+        assertThat(query.getStartTime()).isEqualTo(start);
+        assertThat(query.getEndTime()).isEqualTo(end);
+        assertThat(query.getPage()).isEqualTo(0);
+        assertThat(query.getSize()).isEqualTo(20);
+    }
+
+    @Test
+    @DisplayName("Builder构造应正确设置所有字段")
+    void shouldBuildWithAllFields() {
+        LocalDateTime start = LocalDateTime.of(2026, 1, 1, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2026, 12, 31, 23, 59);
+
+        StatisticsQuery query = StatisticsQuery.builder()
+                .statType("BOOKING")
+                .periodType("WEEK")
+                .startTime(start)
+                .endTime(end)
+                .page(1)
+                .size(50)
+                .build();
+
+        assertThat(query.getStatType()).isEqualTo("BOOKING");
+        assertThat(query.getPeriodType()).isEqualTo("WEEK");
+        assertThat(query.getStartTime()).isEqualTo(start);
+        assertThat(query.getEndTime()).isEqualTo(end);
+        assertThat(query.getPage()).isEqualTo(1);
+        assertThat(query.getSize()).isEqualTo(50);
+    }
+
+    @Test
+    @DisplayName("全参构造应正确设置所有字段")
+    void shouldConstructWithAllArgs() {
+        LocalDateTime start = LocalDateTime.of(2026, 3, 1, 8, 0);
+        LocalDateTime end = LocalDateTime.of(2026, 3, 31, 20, 0);
+
+        StatisticsQuery query = new StatisticsQuery(
+                "SIGN_IN", "DAY", start, end, 2, 100);
+
+        assertThat(query.getStatType()).isEqualTo("SIGN_IN");
+        assertThat(query.getPeriodType()).isEqualTo("DAY");
+        assertThat(query.getStartTime()).isEqualTo(start);
+        assertThat(query.getEndTime()).isEqualTo(end);
+        assertThat(query.getPage()).isEqualTo(2);
+        assertThat(query.getSize()).isEqualTo(100);
+    }
+}
@@ -35,11 +35,6 @@
            <artifactId>manage-common</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-sys</artifactId>
-            <version>${project.version}</version>
-        </dependency>
        <dependency>
            <groupId>cn.novalon.gym.manage</groupId>
            <artifactId>manage-db</artifactId>
@@ -86,13 +81,41 @@
            <artifactId>gym-member</artifactId>
            <version>${project.version}</version>
        </dependency>
+        
+        <!-- ZXing QR Code依赖 -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+        <!-- 阿里云OSS SDK -->
+        <!--
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.17.4</version>
+        </dependency>
+        -->
+        
+        <!-- 文件管理模块（统一文件存储） -->
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-file</artifactId>
+            <version>${project.version}</version>
+        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
            </plugin>
        </plugins>
    </build>
@@ -61,6 +61,12 @@ public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookin
     */
    Mono<Long> countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);

+    /**
+     * 统计会员取消的预约次数
+     */
+    @org.springframework.data.r2dbc.repository.Query("SELECT COUNT(*) FROM group_course_booking WHERE member_id = :memberId AND status = '1' AND deleted_at IS NULL")
+    Mono<Long> countCancelledByMemberId(Long memberId);
+
    /**
     * 查询会员是否有时间冲突的预约（状态为已预约且未取消）
     * 时间冲突条件：新课程的开始时间 < 已预约课程的结束时间 且 新课程的结束时间 > 已预约课程的开始时间
@@ -108,4 +114,11 @@ public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookin
    @org.springframework.data.r2dbc.repository.Modifying
    @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET status = '3', updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
    Mono<Integer> updateToAbsent(Long id, java.time.LocalDateTime updatedAt);
+
+    /**
+     * 批量更新某课程的预约状态（教练缺席场景）
+     */
+    @org.springframework.data.r2dbc.repository.Modifying
+    @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET status = :newStatus, updated_at = NOW() WHERE course_id = :courseId AND status = :oldStatus AND deleted_at IS NULL")
+    Mono<Integer> updateStatusByCourseId(Long courseId, String oldStatus, String newStatus);
 }
@@ -1,16 +1,20 @@
-
 package cn.novalon.gym.manage.groupcourse.dao;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.repository.Modifying;
 import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;

@Repository
 public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long> {
@@ -29,13 +33,345 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
    @Query("UPDATE group_course SET status = '1', updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
    Mono<Integer> cancelCourse(Long id, LocalDateTime updatedAt);

-    @Modifying
-    @Query("UPDATE group_course SET current_members = current_members + :delta, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
-    Mono<Integer> updateCurrentMembers(Long id, Integer delta, LocalDateTime updatedAt);
-
    @Modifying
    @Query("UPDATE group_course SET deleted_at = :deletedAt WHERE id = :id")
    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);

+    // ---------- 教练相关 SQL 方法 ----------
+
+    @Modifying
+    @Query("UPDATE group_course SET status = :status, actual_start_time = :actualStartTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateStartInfo(Long id, String status, LocalDateTime actualStartTime, LocalDateTime updatedAt);
+
+    @Modifying
+    @Query("UPDATE group_course SET status = :status, actual_end_time = :actualEndTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateEndInfo(Long id, String status, LocalDateTime actualEndTime, LocalDateTime updatedAt);
+
+    @Modifying
+    @Query("UPDATE group_course SET status = '5', actual_end_time = :actualEndTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateToCoachAbsent(Long id, LocalDateTime actualEndTime, LocalDateTime updatedAt);
+
+    @Modifying
+    @Query("UPDATE group_course SET status = '6', actual_end_time = :actualEndTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateToAutoEnded(Long id, LocalDateTime actualEndTime, LocalDateTime updatedAt);
+
+    /**
+     * 查询指定状态且开始时间早于指定时间的课程（用于缺席检查）
+     */
+    default Flux<GroupCourseEntity> findByStatusAndStartTimeBefore(DatabaseClient databaseClient, String status, LocalDateTime time) {
+        return databaseClient.sql("SELECT * FROM group_course WHERE status = :status AND start_time < :time AND deleted_at IS NULL")
+                .bind("status", status)
+                .bind("time", time)
+                .map((row, meta) -> mapRowToEntity(row))
+                .all();
+    }
+
+    /**
+     * 查询指定状态集合且结束时间早于指定时间的课程（用于自动结课检查）
+     */
+    default Flux<GroupCourseEntity> findByStatusInAndEndTimeBefore(DatabaseClient databaseClient, String[] statuses, LocalDateTime time) {
+        return databaseClient.sql("SELECT * FROM group_course WHERE status = ANY(:statuses::varchar[]) AND end_time < :time AND deleted_at IS NULL")
+                .bind("statuses", statuses)
+                .bind("time", time)
+                .map((row, meta) -> mapRowToEntity(row))
+                .all();
+    }
+
    Flux<GroupCourseEntity> findByCourseTypeAndDeletedAtIsNull(Long courseType);
-}
+
+    // ==================== 教练相关查询 ====================
+
+    Flux<GroupCourseEntity> findByCoachIdAndDeletedAtIsNull(Long coachId);
+
+    Flux<GroupCourseEntity> findByCoachIdAndDeletedAtIsNull(Long coachId, Sort sort);
+
+    @Query("SELECT COUNT(*) FROM group_course WHERE coach_id = :coachId AND status = :status AND deleted_at IS NULL")
+    Mono<Long> countByCoachIdAndStatus(Long coachId, String status);
+
+    @Modifying
+    @Query("UPDATE group_course SET status = '1', updated_at = :updatedAt WHERE coach_id = :coachId AND status != :excludeStatus AND deleted_at IS NULL")
+    Mono<Integer> cancelCoursesByCoachIdExceptStatus(Long coachId, String excludeStatus, LocalDateTime updatedAt);
+
+    /**
+     * 多条件查询团课（使用 DatabaseClient 构建动态 SQL）
+     */
+    default Flux<GroupCourseEntity> searchGroupCourses(DatabaseClient databaseClient, GroupCourseQueryDto query) {
+        StringBuilder sql = new StringBuilder(
+            "SELECT gc.*, COALESCE(b.cnt, 0) AS current_members " +
+            "FROM group_course gc " +
+            "LEFT JOIN (SELECT course_id, COUNT(*) AS cnt FROM group_course_booking WHERE status = '0' GROUP BY course_id) b " +
+            "ON gc.id = b.course_id " +
+            "WHERE gc.deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        // 默认不查询可预约团课（status = '0' 且未过期）
+        conditions.add("gc.status = '0'");
+        conditions.add("gc.end_time > NOW()");
+
+        // 1. 团课名称模糊查询
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            conditions.add("gc.course_name ILIKE :courseName");
+        }
+
+        // 2. 基于团课类型查询
+        if (query.getCourseType() != null) {
+            conditions.add("gc.course_type = :courseType");
+        }
+
+        // 3. 基于日期时间段查询
+        if (query.getStartDate() != null) {
+            conditions.add("gc.start_time >= :startDate");
+        }
+        if (query.getEndDate() != null) {
+            conditions.add("gc.start_time <= :endDate");
+        }
+
+        // 4. 基于早晨/下午/夜晚时间段查询
+        if (query.getTimePeriod() != null && !query.getTimePeriod().isEmpty()) {
+            switch (query.getTimePeriod().toLowerCase()) {
+                case "morning":
+                    conditions.add("EXTRACT(HOUR FROM gc.start_time) >= 6 AND EXTRACT(HOUR FROM gc.start_time) < 12");
+                    break;
+                case "afternoon":
+                    conditions.add("EXTRACT(HOUR FROM gc.start_time) >= 12 AND EXTRACT(HOUR FROM gc.start_time) < 18");
+                    break;
+                case "evening":
+                    conditions.add("EXTRACT(HOUR FROM gc.start_time) >= 18 AND EXTRACT(HOUR FROM gc.start_time) < 24");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        sql.append(" AND ").append(String.join(" AND ", conditions));
+
+        // 5. 价格排序 / 6. 剩余名额最多排序
+        boolean hasPriceSort = query.getPriceSort() != null && !query.getPriceSort().isEmpty();
+        boolean hasRemainingMost = query.getRemainingMost() != null && query.getRemainingMost();
+
+        if (hasPriceSort || hasRemainingMost) {
+            sql.append(" ORDER BY");
+            List<String> orderClauses = new ArrayList<>();
+
+            if (hasRemainingMost) {
+                orderClauses.add(" (gc.max_members - COALESCE(b.cnt, 0)) DESC");
+            }
+
+            if (hasPriceSort) {
+                if ("asc".equalsIgnoreCase(query.getPriceSort())) {
+                    orderClauses.add(" gc.stored_value_amount ASC");
+                } else if ("desc".equalsIgnoreCase(query.getPriceSort())) {
+                    orderClauses.add(" gc.stored_value_amount DESC");
+                }
+            }
+
+            sql.append(String.join(",", orderClauses));
+        } else {
+            sql.append(" ORDER BY gc.start_time ASC");
+        }
+
+        // 分页
+        int page = query.getPage() != null ? query.getPage() : 0;
+        int size = query.getSize() != null ? query.getSize() : 10;
+        if (size < 1) size = 10;
+        if (size > 100) size = 100;
+        int offset = page * size;
+        sql.append(" LIMIT :limit OFFSET :offset");
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            spec = spec.bind("courseName", "%" + query.getCourseName() + "%");
+        }
+        if (query.getCourseType() != null) {
+            spec = spec.bind("courseType", query.getCourseType());
+        }
+        if (query.getStartDate() != null) {
+            spec = spec.bind("startDate", query.getStartDate());
+        }
+        if (query.getEndDate() != null) {
+            spec = spec.bind("endDate", query.getEndDate());
+        }
+        spec = spec.bind("limit", size);
+        spec = spec.bind("offset", offset);
+
+        return spec.map((row, meta) -> mapRowToEntity(row)).all();
+    }
+
+    /**
+     * 多条件查询团课总数
+     */
+    default Mono<Long> countSearchGroupCourses(DatabaseClient databaseClient, GroupCourseQueryDto query) {
+        StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        conditions.add("status = '0'");
+        conditions.add("end_time > NOW()");
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            conditions.add("course_name ILIKE :courseName");
+        }
+        if (query.getCourseType() != null) {
+            conditions.add("course_type = :courseType");
+        }
+        if (query.getStartDate() != null) {
+            conditions.add("start_time >= :startDate");
+        }
+        if (query.getEndDate() != null) {
+            conditions.add("start_time <= :endDate");
+        }
+        if (query.getTimePeriod() != null && !query.getTimePeriod().isEmpty()) {
+            switch (query.getTimePeriod().toLowerCase()) {
+                case "morning":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 6 AND EXTRACT(HOUR FROM start_time) < 12");
+                    break;
+                case "afternoon":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 12 AND EXTRACT(HOUR FROM start_time) < 18");
+                    break;
+                case "evening":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 18 AND EXTRACT(HOUR FROM start_time) < 24");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        sql.append(" AND ").append(String.join(" AND ", conditions));
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            spec = spec.bind("courseName", "%" + query.getCourseName() + "%");
+        }
+        if (query.getCourseType() != null) {
+            spec = spec.bind("courseType", query.getCourseType());
+        }
+        if (query.getStartDate() != null) {
+            spec = spec.bind("startDate", query.getStartDate());
+        }
+        if (query.getEndDate() != null) {
+            spec = spec.bind("endDate", query.getEndDate());
+        }
+
+        return spec.map((row, meta) -> row.get(0, Long.class)).one();
+    }
+
+    /**
+     * 分页查询团课（支持 keyword 和 status 过滤）
+     */
+    default Flux<GroupCourseEntity> findByPageFiltered(DatabaseClient databaseClient, PageRequest pageRequest) {
+        StringBuilder sql = new StringBuilder(
+            "SELECT gc.*, COALESCE(b.cnt, 0) AS current_members " +
+            "FROM group_course gc " +
+            "LEFT JOIN (SELECT course_id, COUNT(*) AS cnt FROM group_course_booking WHERE status = '0' GROUP BY course_id) b " +
+            "ON gc.id = b.course_id " +
+            "WHERE gc.deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            conditions.add("gc.course_name ILIKE :keyword");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            conditions.add("gc.status = :status");
+        }
+
+        if (!conditions.isEmpty()) {
+            sql.append(" AND ").append(String.join(" AND ", conditions));
+        }
+
+        String sort = pageRequest.getSort() != null ? pageRequest.getSort() : "id";
+        String order = "desc".equalsIgnoreCase(pageRequest.getOrder()) ? "DESC" : "ASC";
+        sql.append(" ORDER BY gc.").append(sort).append(" ").append(order);
+
+        int size = pageRequest.getSize();
+        if (size < 1) size = 10;
+        if (size > 100) size = 100;
+        int offset = pageRequest.getPage() * size;
+        sql.append(" LIMIT :limit OFFSET :offset");
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            spec = spec.bind("keyword", "%" + pageRequest.getKeyword() + "%");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            spec = spec.bind("status", pageRequest.getStatus());
+        }
+        spec = spec.bind("limit", size);
+        spec = spec.bind("offset", offset);
+
+        return spec.map((row, meta) -> mapRowToEntity(row)).all();
+    }
+
+    /**
+     * 分页查询团课总数（支持 keyword 和 status 过滤）
+     */
+    default Mono<Long> countByPageFiltered(DatabaseClient databaseClient, PageRequest pageRequest) {
+        StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            conditions.add("course_name ILIKE :keyword");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            conditions.add("status = :status");
+        }
+
+        if (!conditions.isEmpty()) {
+            sql.append(" AND ").append(String.join(" AND ", conditions));
+        }
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            spec = spec.bind("keyword", "%" + pageRequest.getKeyword() + "%");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            spec = spec.bind("status", pageRequest.getStatus());
+        }
+
+        return spec.map((row, meta) -> row.get(0, Long.class)).one();
+    }
+
+    /**
+     * 统计单门课程的有效预约人数（status='0'）
+     */
+    default Mono<Long> countValidBookings(DatabaseClient databaseClient, Long courseId) {
+        return databaseClient.sql("SELECT COUNT(*) FROM group_course_booking WHERE course_id = :id AND status = '0'")
+                .bind("id", courseId)
+                .map((row, meta) -> row.get(0, Long.class))
+                .one()
+                .defaultIfEmpty(0L);
+    }
+
+    /**
+     * 将数据库行映射为 GroupCourseEntity
+     */
+    private GroupCourseEntity mapRowToEntity(io.r2dbc.spi.Row row) {
+        GroupCourseEntity entity = new GroupCourseEntity();
+        entity.setId(row.get("id", Long.class));
+        entity.setCourseName(row.get("course_name", String.class));
+        entity.setCoachId(row.get("coach_id", Long.class));
+        entity.setCourseType(row.get("course_type", Long.class));
+        entity.setStartTime(row.get("start_time", LocalDateTime.class));
+        entity.setEndTime(row.get("end_time", LocalDateTime.class));
+        entity.setMaxMembers(row.get("max_members", Integer.class));
+        Integer cm = row.get("current_members", Integer.class);
+        entity.setCurrentMembers(cm != null ? cm : 0);
+        String statusStr = row.get("status", String.class);
+        entity.setStatus(statusStr != null ? Long.parseLong(statusStr) : null);
+        entity.setLocation(row.get("location", String.class));
+        entity.setCoverImage(row.get("cover_image", String.class));
+        entity.setDescription(row.get("description", String.class));
+        entity.setStoredValueAmount(row.get("stored_value_amount", java.math.BigDecimal.class));
+        entity.setActualStartTime(row.get("actual_start_time", LocalDateTime.class));
+        entity.setActualEndTime(row.get("actual_end_time", LocalDateTime.class));
+        entity.setQrCodePath(row.get("qr_code_path", String.class));
+        entity.setCreateBy(row.get("create_by", String.class));
+        entity.setUpdateBy(row.get("update_by", String.class));
+        entity.setCreatedAt(row.get("created_at", LocalDateTime.class));
+        entity.setUpdatedAt(row.get("updated_at", LocalDateTime.class));
+        entity.setDeletedAt(row.get("deleted_at", LocalDateTime.class));
+        return entity;
+    }
+}
@@ -0,0 +1,42 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseRecommendEntity;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.repository.Modifying;
+import org.springframework.data.r2dbc.repository.Query;
+import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public interface GroupCourseRecommendDao extends R2dbcRepository<GroupCourseRecommendEntity, Long> {
+
+    Mono<GroupCourseRecommendEntity> findByIdAndDeletedAtIsNull(Long id);
+
+    Flux<GroupCourseRecommendEntity> findAllByDeletedAtIsNull();
+
+    Flux<GroupCourseRecommendEntity> findAllByDeletedAtIsNull(Sort sort);
+
+    Flux<GroupCourseRecommendEntity> findByCourseIdAndDeletedAtIsNull(Long courseId);
+
+    Mono<GroupCourseRecommendEntity> findByCourseIdAndDeletedAtIsNullAndIsActiveTrue(Long courseId);
+
+    Flux<GroupCourseRecommendEntity> findByIsActiveTrueAndDeletedAtIsNull();
+
+    Flux<GroupCourseRecommendEntity> findByIsActiveTrueAndDeletedAtIsNull(Sort sort);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET is_active = :isActive, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateActiveStatus(Long id, Boolean isActive, LocalDateTime updatedAt);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET deleted_at = :deletedAt WHERE id = :id")
+    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET deleted_at = :deletedAt WHERE course_id = :courseId")
+    Mono<Integer> softDeleteByCourseId(Long courseId, LocalDateTime deletedAt);
+}
@@ -40,6 +40,14 @@ public class GroupCourse extends BaseDomain{
    @Schema(description = "课程状态", example = "0")
    private Long status;

+    //实际开课时间
+    @Schema(description = "实际开课时间")
+    private LocalDateTime actualStartTime;
+
+    //实际结课时间
+    @Schema(description = "实际结课时间")
+    private LocalDateTime actualEndTime;
+
    //上课地点
    @Schema(description = "上课地点", example = "龙泉驿区幸福路")
    private String location;
@@ -52,14 +60,14 @@ public class GroupCourse extends BaseDomain{
    @Schema(description = "课程描述", example = "从入门到入土")
    private String description;

-    //点卡额度（消耗次数）
-    @Schema(description = "点卡额度（消耗次数）", example = "1")
-    private Integer pointCardAmount;
-
    //储值卡额度（消耗金额）
    @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
    private java.math.BigDecimal storedValueAmount;

+    //二维码路径
+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
    public String getCourseName() {
        return courseName;
    }
@@ -124,6 +132,22 @@ public class GroupCourse extends BaseDomain{
        this.status = status;
    }

+    public LocalDateTime getActualStartTime() {
+        return actualStartTime;
+    }
+
+    public void setActualStartTime(LocalDateTime actualStartTime) {
+        this.actualStartTime = actualStartTime;
+    }
+
+    public LocalDateTime getActualEndTime() {
+        return actualEndTime;
+    }
+
+    public void setActualEndTime(LocalDateTime actualEndTime) {
+        this.actualEndTime = actualEndTime;
+    }
+
    public String getLocation() {
        return location;
    }
@@ -148,14 +172,6 @@ public class GroupCourse extends BaseDomain{
        this.description = description;
    }

-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
    public java.math.BigDecimal getStoredValueAmount() {
        return storedValueAmount;
    }
@@ -163,4 +179,12 @@ public class GroupCourse extends BaseDomain{
    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
        this.storedValueAmount = storedValueAmount;
    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }
@@ -21,6 +21,9 @@ public class GroupCourseDetail extends BaseDomain {
    @Schema(description = "教练ID", example = "1")
    private Long coachId;

+    @Schema(description = "教练名称", example = "张教练")
+    private String coachName;
+
    @Schema(description = "课程类型ID", example = "1")
    private Long courseType;

@@ -48,12 +51,12 @@ public class GroupCourseDetail extends BaseDomain {
    @Schema(description = "课程描述", example = "适合初学者的瑜伽课程")
    private String description;

-    @Schema(description = "点卡额度（消耗次数）", example = "1")
-    private Integer pointCardAmount;
-
    @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
    private BigDecimal storedValueAmount;

+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
    // ===== 关联的类型信息 =====

    @Schema(description = "类型信息")
@@ -99,6 +102,14 @@ public class GroupCourseDetail extends BaseDomain {
        this.coachId = coachId;
    }

+    public String getCoachName() {
+        return coachName;
+    }
+
+    public void setCoachName(String coachName) {
+        this.coachName = coachName;
+    }
+
    public Long getCourseType() {
        return courseType;
    }
@@ -171,14 +182,6 @@ public class GroupCourseDetail extends BaseDomain {
        this.description = description;
    }

-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
    public BigDecimal getStoredValueAmount() {
        return storedValueAmount;
    }
@@ -187,6 +190,14 @@ public class GroupCourseDetail extends BaseDomain {
        this.storedValueAmount = storedValueAmount;
    }

+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
+
    public GroupCourseType getTypeInfo() {
        return typeInfo;
    }
@@ -0,0 +1,84 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class GroupCourseRecommend extends BaseDomain {
+
+    @Schema(description = "团课ID", example = "1")
+    private Long courseId;
+
+    @Schema(description = "推荐标题", example = "本周热门课程")
+    private String recommendTitle;
+
+    @Schema(description = "推荐内容", example = "这是一门非常棒的课程，快来参加吧！")
+    private String recommendContent;
+
+    @Schema(description = "推荐理由", example = "教练专业，课程内容丰富")
+    private String recommendReason;
+
+    @Schema(description = "优先级（数字越大优先级越高）", example = "10")
+    private Integer priority;
+
+    @Schema(description = "是否启用", example = "true")
+    private Boolean isActive;
+
+    @Schema(description = "团课信息")
+    private GroupCourse groupCourse;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+
+    public GroupCourse getGroupCourse() {
+        return groupCourse;
+    }
+
+    public void setGroupCourse(GroupCourse groupCourse) {
+        this.groupCourse = groupCourse;
+    }
+}
@@ -0,0 +1,116 @@
+package cn.novalon.gym.manage.groupcourse.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+/**
+ * 团课多条件查询请求DTO
+ *
+ * @author 张翔
+ * @date 2026-06-14
+ */
+@Schema(description = "团课多条件查询参数")
+public class GroupCourseQueryDto {
+
+    @Schema(description = "课程名称（模糊查询）", example = "瑜伽")
+    private String courseName;
+
+    @Schema(description = "课程类型ID", example = "1")
+    private Long courseType;
+
+    @Schema(description = "查询开始日期", example = "2026-06-01T00:00:00")
+    private LocalDateTime startDate;
+
+    @Schema(description = "查询结束日期", example = "2026-06-30T23:59:59")
+    private LocalDateTime endDate;
+
+    @Schema(description = "时间段：morning-早晨(6:00-12:00), afternoon-下午(12:00-18:00), evening-夜晚(18:00-24:00)", example = "morning")
+    private String timePeriod;
+
+    @Schema(description = "价格排序：asc-从低到高, desc-从高到低", example = "asc")
+    private String priceSort;
+
+    @Schema(description = "按剩余名额最多排序", example = "true")
+    private Boolean remainingMost;
+
+    @Schema(description = "页码", example = "0")
+    private Integer page = 0;
+
+    @Schema(description = "每页大小", example = "10")
+    private Integer size = 10;
+
+    // ===== Getters and Setters =====
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Long getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(Long courseType) {
+        this.courseType = courseType;
+    }
+
+    public LocalDateTime getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDateTime startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDateTime getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDateTime endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getTimePeriod() {
+        return timePeriod;
+    }
+
+    public void setTimePeriod(String timePeriod) {
+        this.timePeriod = timePeriod;
+    }
+
+    public String getPriceSort() {
+        return priceSort;
+    }
+
+    public void setPriceSort(String priceSort) {
+        this.priceSort = priceSort;
+    }
+
+    public Boolean getRemainingMost() {
+        return remainingMost;
+    }
+
+    public void setRemainingMost(Boolean remainingMost) {
+        this.remainingMost = remainingMost;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+}
@@ -38,7 +38,15 @@ public class GroupCourseEntity extends BaseEntity {
    @Column("current_members")
    private Integer currentMembers;

-    //课程状态：0-正常，1-已取消，2-已结束
+    //实际开课时间
+    @Column("actual_start_time")
+    private LocalDateTime actualStartTime;
+
+    //实际结课时间
+    @Column("actual_end_time")
+    private LocalDateTime actualEndTime;
+
+    //课程状态：0-正常，1-已取消，2-已结束，3-进行中，5-教练缺席，6-自动结束，7-教练迟到
    @Column("status")
    private Long status;

@@ -54,14 +62,14 @@ public class GroupCourseEntity extends BaseEntity {
    @Column("description")
    private String description;

-    //点卡额度（消耗次数）
-    @Column("point_card_amount")
-    private Integer pointCardAmount;
-
    //储值卡额度（消耗金额）
    @Column("stored_value_amount")
    private java.math.BigDecimal storedValueAmount;

+    //二维码路径
+    @Column("qr_code_path")
+    private String qrCodePath;
+
    public String getCourseName() {
        return courseName;
    }
@@ -150,14 +158,6 @@ public class GroupCourseEntity extends BaseEntity {
        this.description = description;
    }

-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
    public java.math.BigDecimal getStoredValueAmount() {
        return storedValueAmount;
    }
@@ -165,4 +165,28 @@ public class GroupCourseEntity extends BaseEntity {
    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
        this.storedValueAmount = storedValueAmount;
    }
+
+    public LocalDateTime getActualStartTime() {
+        return actualStartTime;
+    }
+
+    public void setActualStartTime(LocalDateTime actualStartTime) {
+        this.actualStartTime = actualStartTime;
+    }
+
+    public LocalDateTime getActualEndTime() {
+        return actualEndTime;
+    }
+
+    public void setActualEndTime(LocalDateTime actualEndTime) {
+        this.actualEndTime = actualEndTime;
+    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }
@@ -0,0 +1,77 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.time.LocalDateTime;
+
+@Table("group_course_recommend")
+public class GroupCourseRecommendEntity extends BaseEntity {
+
+    @Column("course_id")
+    private Long courseId;
+
+    @Column("recommend_title")
+    private String recommendTitle;
+
+    @Column("recommend_content")
+    private String recommendContent;
+
+    @Column("recommend_reason")
+    private String recommendReason;
+
+    @Column("priority")
+    private Integer priority;
+
+    @Column("is_active")
+    private Boolean isActive;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+}
@@ -11,7 +11,10 @@ public enum CourseStatus {
    NORMAL(0L, "正常"),
    CANCELLED(1L, "已取消"),
    ENDED(2L, "已结束"),
-    IN_PROGRESS(3L, "进行中");
+    IN_PROGRESS(3L, "进行中"),
+    COACH_ABSENT(5L, "教练缺席"),
+    AUTO_ENDED(6L, "自动结束"),
+    COACH_LATE(7L, "教练迟到");

    private final Long value;
    private final String desc;
@@ -2,18 +2,18 @@ package cn.novalon.gym.manage.groupcourse.handler;

 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
-import cn.novalon.gym.manage.groupcourse.service.impl.GroupCourseRedisService;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
+import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;

+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -32,10 +32,9 @@ import java.util.List;
 public class BookingSagaHandler {

    private final IGroupCourseBookingRepository bookingRepository;
-    private final IGroupCourseRepository courseRepository;
    private final IMemberCardRecordService memberCardRecordService;
+    private final IMemberStoredCardService memberStoredCardService;
    private final MemberCardRepository memberCardRepository;
-    private final GroupCourseRedisService redisService;

    private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0;

@@ -44,10 +43,10 @@ public class BookingSagaHandler {
     *
     * 步骤：
     * 1. 保存预约记录
-     * 2. 扣减会员卡权益
+     * 2. 扣减储值卡余额（储值卡类型）
     * 3. 更新课程当前人数
     */
-    public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId) {
+    public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId, BigDecimal storedValueAmount) {
        List<SagaStep> steps = new ArrayList<>();
        List<SagaStep> rollbackSteps = new ArrayList<>();

@@ -60,33 +59,15 @@ public class BookingSagaHandler {
        steps.add(step1);
        rollbackSteps.add(0, step1);

-        // 步骤2：扣减会员卡权益（根据卡类型决定扣除次数还是金额）
+        // 步骤2：扣减权益（根据卡类型）
        SagaStep step2 = new SagaStep(
-                "扣减会员卡权益",
-                deductCardUsageByCardType(booking.getMemberId(), recordId),
-                Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId))
+                "扣减权益",
+                deductCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount),
+                Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount))
        );
        steps.add(step2);
        rollbackSteps.add(0, step2);

-        // 步骤3：更新课程当前人数
-        SagaStep step3 = new SagaStep(
-                "更新课程当前人数",
-                incrementCourseCurrentMembers(booking.getCourseId()),
-                Mono.defer(() -> decrementCourseCurrentMembers(booking.getCourseId()))
-        );
-        steps.add(step3);
-        rollbackSteps.add(0, step3);
-
-        // 步骤4：更新Redis预约计数
-        SagaStep step4 = new SagaStep(
-                "更新Redis预约计数",
-                incrementRedisBookingCount(booking.getCourseId()),
-                Mono.defer(() -> decrementRedisBookingCount(booking.getCourseId()))
-        );
-        steps.add(step4);
-        rollbackSteps.add(0, step4);
-
        return executeSaga(steps, rollbackSteps)
                .then(Mono.just(booking));
    }
@@ -94,7 +75,7 @@ public class BookingSagaHandler {
    /**
     * 根据会员卡类型扣减权益
     */
-    private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId) {
+    private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
        return memberCardRecordService.findById(recordId)
                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
                .flatMap(record -> {
@@ -109,14 +90,13 @@ public class BookingSagaHandler {

                                switch (cardType) {
                                    case COUNT_CARD:
-                                        // 次卡扣除次数
-                                        return deductCardUsage(recordId, 1, 0.0);
+                                        return Mono.error(new RuntimeException("团课预约仅支持储值卡和时长卡支付"));
                                    case STORED_VALUE_CARD:
-                                        // 储值卡扣除金额
-                                        return deductCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
+                                        return deductStoredCardBalance(memberId, storedValueAmount);
                                    case TIME_CARD:
-                                        // 时长卡不扣除，但需验证有效期
-                                        return validateTimeCard(record);
+                                        // 时长卡验证有效期后，仍须从储值卡扣款
+                                        return validateTimeCard(record)
+                                                .then(deductStoredCardBalance(memberId, storedValueAmount));
                                    default:
                                        return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
                                }
@@ -153,11 +133,10 @@ public class BookingSagaHandler {
    /**
     * 根据会员卡类型恢复权益
     */
-    private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId) {
+    private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
        return memberCardRecordService.findById(recordId)
                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
                .flatMap(record -> {
-                    // 验证会员卡归属（memberId为null时跳过验证）
                    if (memberId != null && !record.getMemberId().equals(memberId)) {
                        return Mono.error(new RuntimeException("会员卡不归属当前用户"));
                    }
@@ -168,11 +147,29 @@ public class BookingSagaHandler {

                                switch (cardType) {
                                    case COUNT_CARD:
-                                        return restoreCardUsage(recordId, 1, 0.0);
-                                    case STORED_VALUE_CARD:
-                                        return restoreCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
-                                    case TIME_CARD:
                                        return Mono.empty();
+                                    case STORED_VALUE_CARD:
+                                        // 返还储值卡余额（回滚时全额返还）
+                                        BigDecimal amount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+                                        return memberStoredCardService.recharge(memberId, amount)
+                                                .flatMap(rows -> {
+                                                    if (rows > 0) {
+                                                        log.info("储值卡回滚返还成功: memberId={}, amount={}", memberId, amount);
+                                                        return Mono.empty();
+                                                    }
+                                                    return Mono.empty();
+                                                });
+                                    case TIME_CARD:
+                                        // 时长卡回滚时也返还储值卡
+                                        BigDecimal timeAmount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+                                        return memberStoredCardService.recharge(memberId, timeAmount)
+                                                .flatMap(rows -> {
+                                                    if (rows > 0) {
+                                                        log.info("储值卡回滚返还成功(时长卡): memberId={}, amount={}", memberId, timeAmount);
+                                                        return Mono.empty();
+                                                    }
+                                                    return Mono.empty();
+                                                });
                                    default:
                                        return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
                                }
@@ -183,7 +180,7 @@ public class BookingSagaHandler {
    /**
     * 执行取消预约事务
     */
-    public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId) {
+    public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId, BigDecimal storedValueAmount, long cancelCount) {
        List<SagaStep> steps = new ArrayList<>();
        List<SagaStep> rollbackSteps = new ArrayList<>();

@@ -196,33 +193,16 @@ public class BookingSagaHandler {
        steps.add(step1);
        rollbackSteps.add(0, step1);

-        // 步骤2：恢复会员卡权益
+        // 步骤2：返还储值卡余额（含手续费逻辑）
        SagaStep step2 = new SagaStep(
-                "恢复会员卡权益",
-                restoreCardUsageByCardType(memberId, recordId),
-                Mono.defer(() -> deductCardUsageByCardType(memberId, recordId))
+                "返还储值卡余额",
+                refundStoredCardWithFee(memberId, storedValueAmount, cancelCount),
+                // 回滚时重新扣减
+                Mono.defer(() -> deductCardUsageByCardType(memberId, recordId, storedValueAmount))
        );
        steps.add(step2);
        rollbackSteps.add(0, step2);

-        // 步骤3：减少课程当前人数
-        SagaStep step3 = new SagaStep(
-                "减少课程当前人数",
-                decrementCourseCurrentMembers(courseId),
-                Mono.defer(() -> incrementCourseCurrentMembers(courseId))
-        );
-        steps.add(step3);
-        rollbackSteps.add(0, step3);
-
-        // 步骤4：更新Redis预约计数
-        SagaStep step4 = new SagaStep(
-                "更新Redis预约计数",
-                decrementRedisBookingCount(courseId),
-                Mono.defer(() -> incrementRedisBookingCount(courseId))
-        );
-        steps.add(step4);
-        rollbackSteps.add(0, step4);
-
        return executeSaga(steps, rollbackSteps)
                .then(bookingRepository.findById(bookingId));
    }
@@ -252,73 +232,35 @@ public class BookingSagaHandler {
        return bookingRepository.deleteById(bookingId);
    }

-    private Mono<Void> deductCardUsage(Long recordId, Integer deductTimes, Double deductAmount) {
-        if (deductTimes == 0 && deductAmount == 0.0) {
-            return Mono.empty();
-        }
-
-        return memberCardRecordService.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> {
-                    cn.novalon.gym.manage.member.enums.MemberCardRecordStatus status = record.getStatus();
-                    if (status != cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE) {
-                        return Mono.error(new RuntimeException("会员卡状态无效，当前状态: " + (status != null ? status.getDesc() : "未知")));
+    /**
+     * 从储值卡扣减余额
+     */
+    private Mono<Void> deductStoredCardBalance(Long memberId, BigDecimal storedValueAmount) {
+        BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
+                ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+        return memberStoredCardService.consume(memberId, amount)
+                .flatMap(rows -> {
+                    if (rows == 0) {
+                        return Mono.error(new RuntimeException("储值卡扣减失败，余额不足"));
                    }
-                    java.time.LocalDateTime expireTime = record.getExpireTime();
-                    if (expireTime != null && expireTime.isBefore(java.time.LocalDateTime.now())) {
-                        return Mono.error(new RuntimeException("会员卡已过期"));
-                    }
-                    if (record.getRemainingTimes() != null && deductTimes > 0 && record.getRemainingTimes() < deductTimes) {
-                        return Mono.error(new RuntimeException("会员卡剩余次数不足，当前剩余: " + record.getRemainingTimes() + "次"));
-                    }
-                    if (record.getRemainingAmount() != null && deductAmount > 0 && record.getRemainingAmount() < deductAmount) {
-                        return Mono.error(new RuntimeException("会员卡余额不足，当前剩余: " + record.getRemainingAmount()));
-                    }
-                    return memberCardRecordService.deductUsage(recordId, deductTimes, deductAmount)
-                            .flatMap(rows -> {
-                                if (rows == 0) {
-                                    return Mono.error(new RuntimeException("扣减会员卡权益失败，请重试"));
-                                }
-                                return Mono.empty();
-                            });
+                    log.info("储值卡扣减成功: memberId={}, amount={}", memberId, amount);
+                    return Mono.empty();
                });
    }

-    private Mono<Void> restoreCardUsage(Long recordId, Integer addTimes, Double addAmount) {
-        if (addTimes == 0 && addAmount == 0.0) {
-            return Mono.empty();
-        }
-
-        return memberCardRecordService.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
-                .flatMap(record -> {
-                    // 使用当前记录的过期时间，避免清空过期时间
-                    return memberCardRecordService.renewCard(recordId, addTimes, addAmount, record.getExpireTime())
-                            .flatMap(rows -> {
-                                if (rows == 0) {
-                                    return Mono.error(new RuntimeException("恢复会员卡权益失败，请重试"));
-                                }
-                                return Mono.empty();
-                            });
+    /**
+     * 返还储值卡余额（含手续费逻辑，仅用于取消预约）
+     */
+    private Mono<Void> refundStoredCardWithFee(Long memberId, BigDecimal storedValueAmount, long cancelCount) {
+        BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
+                ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+        return memberStoredCardService.refundBalanceWithFee(memberId, amount, cancelCount)
+                .flatMap(refundedAmount -> {
+                    log.info("储值卡退款成功(含手续费): memberId={}, cancelCount={}, 退款金额={}", memberId, cancelCount, refundedAmount);
+                    return Mono.empty();
                });
    }

-    private Mono<Void> incrementCourseCurrentMembers(Long courseId) {
-        return courseRepository.updateCurrentMembers(courseId, 1).then();
-    }
-
-    private Mono<Void> decrementCourseCurrentMembers(Long courseId) {
-        return courseRepository.updateCurrentMembers(courseId, -1).then();
-    }
-
-    private Mono<Void> incrementRedisBookingCount(Long courseId) {
-        return redisService.incrementBookingCount(courseId).then();
-    }
-
-    private Mono<Void> decrementRedisBookingCount(Long courseId) {
-        return redisService.decrementBookingCount(courseId).then();
-    }
-
    private Mono<Void> executeSaga(List<SagaStep> steps, List<SagaStep> rollbackSteps) {
        List<SagaStep> completedSteps = new ArrayList<>();
        return executeStep(steps, 0, completedSteps);
@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.handler;

+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import cn.novalon.gym.manage.groupcourse.service.ICourseLabelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,6 +30,13 @@ public class CourseLabelHandler {
                .body(courseLabelService.findAll(), CourseLabel.class);
    }

+    @Operation(summary = "分页查询标签", description = "支持按关键词筛选并分页查询标签")
+    public Mono<ServerResponse> getLabelsByPage(ServerRequest request) {
+        return request.bodyToMono(PageRequest.class)
+                .flatMap(pageRequest -> courseLabelService.findByPage(pageRequest)
+                        .flatMap(response -> ServerResponse.ok().bodyValue(response)));
+    }
+
    @Operation(summary = "根据ID获取标签", description = "根据ID获取标签详情")
    public Mono<ServerResponse> getLabelById(ServerRequest request) {
        Long id = Long.valueOf(request.pathVariable("id"));
@@ -147,17 +155,17 @@ public class CourseLabelHandler {
        return request.bodyToMono(Map.class)
                .flatMap(body -> {
                    @SuppressWarnings("unchecked")
-                    List<Integer> labelIdsInt = (List<Integer>) body.get("labelIds");
-                    
-                    if (labelIdsInt == null || labelIdsInt.isEmpty()) {
+                    List<?> rawIds = (List<?>) body.get("labelIds");
+
+                    if (rawIds == null || rawIds.isEmpty()) {
                        Map<String, Object> error = new HashMap<>();
                        error.put("success", false);
                        error.put("message", "labelIds不能为空");
                        return ServerResponse.badRequest().bodyValue(error);
                    }
-                    
-                    List<Long> labelIds = labelIdsInt.stream()
-                            .map(Integer::longValue)
+
+                    List<Long> labelIds = rawIds.stream()
+                            .map(id -> Long.valueOf(String.valueOf(id)))
                            .collect(java.util.stream.Collectors.toList());
                    
                    return courseLabelService.addLabelsToType(typeId, labelIds)
@@ -42,15 +42,11 @@ public class GroupCourseBookingHandler {
                    if (body.get("memberId") == null) {
                        return buildErrorResponse("请提供会员ID");
                    }
-                    if (body.get("memberCardRecordId") == null) {
-                        return buildErrorResponse("请提供会员卡记录ID");
-                    }

-                    Long courseId = ((Number) body.get("courseId")).longValue();
-                    Long memberId = ((Number) body.get("memberId")).longValue();
-                    Long memberCardRecordId = ((Number) body.get("memberCardRecordId")).longValue();
+                    Long courseId = toLong(body.get("courseId"), "courseId");
+                    Long memberId = toLong(body.get("memberId"), "memberId");

-                    return bookingService.bookCourse(courseId, memberId, memberCardRecordId)
+                    return bookingService.bookCourse(courseId, memberId)
                            .flatMap(booking -> {
                                Map<String, Object> response = new HashMap<>();
                                response.put("success", true);
@@ -76,7 +72,7 @@ public class GroupCourseBookingHandler {

        return request.bodyToMono(Map.class)
                .flatMap(body -> {
-                    Long memberId = ((Number) body.get("memberId")).longValue();
+                    Long memberId = toLong(body.get("memberId"), "memberId");

                    return bookingService.cancelBooking(bookingId, memberId)
                            .flatMap(booking -> {
@@ -129,6 +125,19 @@ public class GroupCourseBookingHandler {
                .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class);
    }

+    /**
+     * 安全转换为 Long，支持 Number 和 String 类型
+     */
+    private Long toLong(Object value, String fieldName) {
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        if (value instanceof String) {
+            return Long.valueOf((String) value);
+        }
+        throw new IllegalArgumentException("参数 " + fieldName + " 类型不正确");
+    }
+
    /**
     * 构建错误响应
     */
@@ -5,22 +5,29 @@ import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.vo.GroupCourseVO;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;

 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.time.LocalDateTime;

@Component
@Tag(name="团课管理",description = "团课相关操作")
 public class GroupCourseHandler {
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseHandler.class);
    private final IGroupCourseService groupCourseService;
    private final Validator validator;
    private final RedisUtil redisUtil;
@@ -36,11 +43,12 @@ public class GroupCourseHandler {
        this.objectMapper = objectMapper;
    }

-    @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表")
+    @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表（含教练昵称）")
    public Mono<ServerResponse> getAllGroupCourse(ServerRequest request){
        boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false"));
-        return ServerResponse.ok()
-                .body(groupCourseService.findAll(includeDeleted), GroupCourse.class);
+        return groupCourseService.findAllAsVO(includeDeleted)
+                .collectList()
+                .flatMap(list -> ServerResponse.ok().bodyValue(list));
    }

    @Operation(summary = "分页获取团课", description = "根据分页参数获取团课列表")
@@ -64,7 +72,7 @@ public class GroupCourseHandler {
                        pageRequest.setOrder("asc");
                    }

-                    return groupCourseService.findByPage(pageRequest, includeDeleted)
+                    return groupCourseService.findByPageAsVO(pageRequest, includeDeleted)
                            .flatMap(response -> ServerResponse.ok().bodyValue(response));
                });
    }
@@ -158,7 +166,7 @@ public class GroupCourseHandler {

    @Operation(summary = "团课签到", description = "会员签到参加团课")
    public Mono<ServerResponse> signIn(ServerRequest request) {
-        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
        
        return request.bodyToMono(Map.class)
                .flatMap(body -> {
@@ -169,15 +177,15 @@ public class GroupCourseHandler {
                        return ServerResponse.badRequest().bodyValue(response);
                    }
                    
-                    Object memberIdObj = body.get("memberId");
-                    if (memberIdObj == null) {
+                    Object courseIdObj = body.get("courseId");
+                    if (courseIdObj == null) {
                        Map<String, Object> response = new HashMap<>();
                        response.put("success", false);
-                        response.put("message", "memberId不能为空");
+                        response.put("message", "courseId不能为空");
                        return ServerResponse.badRequest().bodyValue(response);
                    }
                    
-                    Long memberId = ((Number) memberIdObj).longValue();
+                    Long courseId = ((Number) courseIdObj).longValue();
                    
                    return groupCourseService.signIn(courseId, memberId)
                            .flatMap(course -> {
@@ -215,6 +223,27 @@ public class GroupCourseHandler {
                });
    }

+    @Operation(summary = "多条件查询团课", description = "支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询")
+    public Mono<ServerResponse> searchGroupCourses(ServerRequest request) {
+        return request.bodyToMono(GroupCourseQueryDto.class)
+                .flatMap(query -> {
+                    return groupCourseService.searchGroupCourses(query)
+                            .flatMap(response -> {
+                                Map<String, Object> result = new HashMap<>();
+                                result.put("success", true);
+                                result.put("message", "查询成功");
+                                result.put("data", response);
+                                return ServerResponse.ok().bodyValue(result);
+                            });
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> errorResponse = new HashMap<>();
+                    errorResponse.put("success", false);
+                    errorResponse.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(errorResponse);
+                });
+    }
+
    @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据")
    public Mono<ServerResponse> getCacheByKey(ServerRequest request) {
        return request.bodyToMono(Map.class)
@@ -267,4 +296,50 @@ public class GroupCourseHandler {
                            });
                });
    }
+
+    @Operation(summary = "检查教练时间冲突", description = "检查教练在指定时间段内是否有时间冲突的团课")
+    public Mono<ServerResponse> checkCoachConflict(ServerRequest request) {
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    if (body == null) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "请求体不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+
+                    Object coachIdObj = body.get("coachId");
+                    Object startTimeStr = body.get("startTime");
+                    Object endTimeStr = body.get("endTime");
+                    Object excludeCourseIdObj = body.get("excludeCourseId");
+
+                    if (coachIdObj == null || startTimeStr == null || endTimeStr == null) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "coachId、startTime、endTime 不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+
+                    Long coachId = Long.valueOf(String.valueOf(coachIdObj));
+                    LocalDateTime startTime = LocalDateTime.parse(String.valueOf(startTimeStr));
+                    LocalDateTime endTime = LocalDateTime.parse(String.valueOf(endTimeStr));
+                    Long excludeCourseId = excludeCourseIdObj != null ? Long.valueOf(String.valueOf(excludeCourseIdObj)) : null;
+
+                    return groupCourseService.checkCoachConflict(coachId, startTime, endTime, excludeCourseId)
+                            .flatMap(conflicts -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("hasConflict", !conflicts.isEmpty());
+                                response.put("conflicts", conflicts);
+                                return ServerResponse.ok().bodyValue(response);
+                            });
+                })
+                .onErrorResume(error -> {
+                    logger.warn("检查教练时间冲突失败: {}", error.getMessage());
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", "检查失败: " + error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
 }
@@ -0,0 +1,164 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Tag(name = "团课推荐管理", description = "团课推荐相关操作")
+public class GroupCourseRecommendHandler {
+
+    private final IGroupCourseRecommendService recommendService;
+
+    public GroupCourseRecommendHandler(IGroupCourseRecommendService recommendService) {
+        this.recommendService = recommendService;
+    }
+
+    @Operation(summary = "获取所有团课推荐", description = "获取系统中所有团课推荐列表，支持按优先级排序")
+    public Mono<ServerResponse> getAllRecommendations(ServerRequest request) {
+        String sortBy = request.queryParam("sortBy").orElse("priority");
+        String sortOrder = request.queryParam("sortOrder").orElse("desc");
+
+        return ServerResponse.ok()
+                .body(recommendService.findAll(sortBy, sortOrder), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "获取所有启用的团课推荐", description = "获取系统中所有已启用的团课推荐列表（按优先级排序）")
+    public Mono<ServerResponse> getAllActiveRecommendations(ServerRequest request) {
+        return ServerResponse.ok()
+                .body(recommendService.findAllActive(), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "根据ID获取团课推荐", description = "根据ID获取团课推荐详情")
+    public Mono<ServerResponse> getRecommendationById(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return recommendService.findById(id)
+                .flatMap(recommend -> ServerResponse.ok().bodyValue(recommend))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "根据团课ID获取推荐", description = "根据团课ID获取该团课的推荐信息")
+    public Mono<ServerResponse> getRecommendationsByCourseId(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        return ServerResponse.ok()
+                .body(recommendService.findByCourseId(courseId), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "创建团课推荐", description = "创建新的团课推荐")
+    public Mono<ServerResponse> createRecommendation(ServerRequest request) {
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    if (recommend.getCourseId() == null) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "团课ID不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+
+                    return recommendService.create(recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐创建成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "更新团课推荐", description = "更新指定团课推荐信息")
+    public Mono<ServerResponse> updateRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    return recommendService.update(id, recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐更新成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "删除团课推荐", description = "删除指定团课推荐（软删除）")
+    public Mono<ServerResponse> deleteRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.delete(id)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐删除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "启用团课推荐", description = "启用指定团课推荐")
+    public Mono<ServerResponse> enableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.enable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐启用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "禁用团课推荐", description = "禁用指定团课推荐")
+    public Mono<ServerResponse> disableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.disable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐禁用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+}
@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.handler;

+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -134,4 +135,12 @@ public class GroupCourseTypeHandler {
                    return ServerResponse.badRequest().bodyValue(response);
                });
    }
+
+    @Operation(summary = "分页查询团课类型", description = "支持按关键词、分类筛选并分页查询团课类型")
+    public Mono<ServerResponse> getGroupCourseTypesByPage(ServerRequest request) {
+        return request.bodyToMono(PageRequest.class)
+                .flatMap(pageRequest -> groupCourseTypeService.findByPage(pageRequest)
+                        .flatMap(response -> ServerResponse.ok().bodyValue(response))
+                );
+    }
 }
@@ -0,0 +1,92 @@
+package cn.novalon.gym.manage.groupcourse.initializer;
+
+import cn.novalon.gym.manage.file.core.service.ISysFileService;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 项目启动时补全缺失的团课二维码
+ * 遍历所有未删除的团课，对qrCodePath为空的课程生成二维码并通过统一文件服务保存
+ */
+@Component
+public class QrCodeInitializer implements CommandLineRunner {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QrCodeInitializer.class);
+    
+    private final IGroupCourseRepository groupCourseRepository;
+    private final ObjectMapper objectMapper;
+    private final ISysFileService fileService;
+    
+    public QrCodeInitializer(IGroupCourseRepository groupCourseRepository,
+                             ObjectMapper objectMapper,
+                             ISysFileService fileService) {
+        this.groupCourseRepository = groupCourseRepository;
+        this.objectMapper = objectMapper;
+        this.fileService = fileService;
+    }
+    
+    @Override
+    public void run(String... args) {
+        logger.info("===== 开始检查团课二维码缺失情况 =====");
+        
+        groupCourseRepository.findByDeletedAtIsNull()
+                .filter(course -> course.getQrCodePath() == null || course.getQrCodePath().isEmpty())
+                .flatMap(course -> {
+                    try {
+                        logger.info("发现缺失二维码的团课 - id={}, name={}", course.getId(), course.getCourseName());
+                        
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime() != null ? course.getStartTime().toString() : null);
+                        qrCodeContent.put("endTime", course.getEndTime() != null ? course.getEndTime().toString() : null);
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码字节数组，通过统一文件服务保存
+                        return Mono.fromCallable(() -> QRCodeUtil.generateQrCodeBytes(jsonContent))
+                                .flatMap(qrCodeBytes -> {
+                                    String fileName = "qrcode_" + course.getId() + ".png";
+                                    return fileService.saveBytes(qrCodeBytes, fileName, "image/png", "system");
+                                })
+                                .flatMap(sysFile -> {
+                                    String qrCodeUrl = "/api/files/" + sysFile.getId() + "/preview";
+                                    course.setQrCodePath(qrCodeUrl);
+                                    
+                                    return groupCourseRepository.update(course)
+                                            .doOnSuccess(updated -> logger.info("团课二维码补全成功 - id={}, name={}, url={}", 
+                                                    updated.getId(), updated.getCourseName(), qrCodeUrl))
+                                            .doOnError(error -> logger.error("团课二维码补全失败(更新DB) - id={}, name={}, error: {}", 
+                                                    course.getId(), course.getCourseName(), error.getMessage()));
+                                });
+                    } catch (Exception e) {
+                        logger.error("团课二维码补全失败(生成) - id={}, name={}, error: {}", 
+                                course.getId(), course.getCourseName(), e.getMessage(), e);
+                        return Mono.empty();
+                    }
+                })
+                .collectList()
+                .doOnSuccess(list -> logger.info("===== 团课二维码检查完毕，共补全 {} 个缺失二维码 =====", list.size()))
+                .onErrorResume(error -> {
+                    logger.error("团课二维码初始化检查异常: {}", error.getMessage(), error);
+                    return Mono.empty();
+                })
+                .subscribe();
+    }
+}
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,4 +31,6 @@ public interface ICourseLabelRepository {
    Mono<Void> removeLabelFromType(Long typeId, Long labelId);

    Mono<Void> clearLabelsFromType(Long typeId);
+
+    Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest);
 }
@@ -89,4 +89,11 @@ public interface IGroupCourseBookingRepository {
     * @return 更新记录数
     */
    Mono<Integer> updateToAbsent(Long bookingId);
+
+    /**
+     * 统计会员取消的预约次数
+     * @param memberId 会员ID
+     * @return 取消次数
+     */
+    Mono<Long> countCancelledByMemberId(Long memberId);
 }
@@ -0,0 +1,30 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendRepository {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend);
+
+    Mono<Void> deleteById(Long id);
+
+    Mono<Void> deleteByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive);
+}
@@ -4,6 +4,7 @@ package cn.novalon.gym.manage.groupcourse.repository;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import org.springframework.data.domain.Sort;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -26,7 +27,14 @@ public interface IGroupCourseRepository {
    
    Mono<Void> deleteById(Long id);
    
-    Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta);
-    
    Flux<GroupCourse> findByCourseType(Long courseType);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
+
+    // ==================== 教练相关 ====================
+
+    Flux<GroupCourse> findByCoachId(Long coachId);
+    Flux<GroupCourse> findByCoachId(Long coachId, Sort sort);
+    Mono<Long> countByCoachIdAndStatus(Long coachId, Long status);
+    Mono<Integer> cancelCoursesByCoachIdExceptStatus(Long coachId, Long excludeStatus);
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -25,4 +27,6 @@ public interface IGroupCourseTypeRepository {
    Mono<GroupCourseType> update(GroupCourseType groupCourseType);

    Mono<Void> deleteById(Long id);
+
+    Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest);
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository.impl;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.CourseLabelDao;
 import cn.novalon.gym.manage.groupcourse.dao.CourseTypeLabelDao;
@@ -9,12 +11,17 @@ import cn.novalon.gym.manage.groupcourse.entity.CourseTypeLabelEntity;
 import cn.novalon.gym.manage.groupcourse.repository.ICourseLabelRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.query.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;

@Repository
@@ -26,12 +33,14 @@ public class CourseLabelRepository implements ICourseLabelRepository {
    private final CourseLabelDao courseLabelDao;
    private final CourseTypeLabelDao courseTypeLabelDao;
    private final GroupCourseConverter converter;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;

    public CourseLabelRepository(CourseLabelDao courseLabelDao, CourseTypeLabelDao courseTypeLabelDao, 
-                                  GroupCourseConverter converter) {
+                                  GroupCourseConverter converter, R2dbcEntityTemplate r2dbcEntityTemplate) {
        this.courseLabelDao = courseLabelDao;
        this.courseTypeLabelDao = courseTypeLabelDao;
        this.converter = converter;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
    }

    @Override
@@ -158,4 +167,41 @@ public class CourseLabelRepository implements ICourseLabelRepository {
        }
        return entity;
    }
+
+    @Override
+    public Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+        String keyword = pageRequest.getKeyword();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        List<Criteria> criteriaList = new ArrayList<>();
+        criteriaList.add(Criteria.where("deleted_at").isNull());
+        if (keyword != null && !keyword.isEmpty()) {
+            criteriaList.add(Criteria.where("label_name").like("%" + keyword + "%").ignoreCase(true));
+        }
+
+        Criteria criteria = criteriaList.isEmpty() ? Criteria.empty() : Criteria.from(criteriaList);
+        Query query = Query.query(criteria).with(org.springframework.data.domain.PageRequest.of(page, size, sortObj));
+
+        return r2dbcEntityTemplate.select(CourseLabelEntity.class)
+                .matching(query)
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(Query.query(criteria), CourseLabelEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<CourseLabel> list = tuple.getT1().stream()
+                            .map(this::toCourseLabel)
+                            .toList();
+                    return new PageResponse<>(list, totalPages, total, page, size);
+                });
+    }
 }
@@ -112,4 +112,9 @@ public class GroupCourseBookingRepository implements IGroupCourseBookingReposito
        java.time.LocalDateTime now = java.time.LocalDateTime.now();
        return groupCourseBookingDao.updateToAbsent(bookingId, now);
    }
+
+    @Override
+    public Mono<Long> countCancelledByMemberId(Long memberId) {
+        return groupCourseBookingDao.countCancelledByMemberId(memberId);
+    }
 }
@@ -0,0 +1,136 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseRecommendDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseRecommendEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public class GroupCourseRecommendRepository implements IGroupCourseRecommendRepository {
+
+    private final GroupCourseRecommendDao recommendDao;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
+
+    public GroupCourseRecommendRepository(GroupCourseRecommendDao recommendDao, 
+                                          R2dbcEntityTemplate r2dbcEntityTemplate) {
+        this.recommendDao = recommendDao;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendDao.findByIdAndDeletedAtIsNull(id)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendDao.findAllByDeletedAtIsNull()
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        Sort.Direction direction = "asc".equalsIgnoreCase(sortOrder) 
+                ? Sort.Direction.ASC 
+                : Sort.Direction.DESC;
+        Sort sort = Sort.by(direction, sortBy);
+        return recommendDao.findAllByDeletedAtIsNull(sort)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendDao.findByIsActiveTrueAndDeletedAtIsNull(Sort.by(Sort.Direction.DESC, "priority"))
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNull(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNullAndIsActiveTrue(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setCreatedAt(LocalDateTime.now());
+        entity.setUpdatedAt(LocalDateTime.now());
+        if (entity.getPriority() == null) {
+            entity.setPriority(0);
+        }
+        if (entity.getIsActive() == null) {
+            entity.setIsActive(true);
+        }
+
+        return recommendDao.save(entity)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setUpdatedAt(LocalDateTime.now());
+
+        return r2dbcEntityTemplate.update(entity)
+                .then(findById(recommend.getId()));
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return recommendDao.softDelete(id, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<Void> deleteByCourseId(Long courseId) {
+        return recommendDao.softDeleteByCourseId(courseId, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive) {
+        return recommendDao.updateActiveStatus(id, isActive, LocalDateTime.now())
+                .flatMap(updated -> {
+                    if (updated > 0) {
+                        return findById(id);
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    private GroupCourseRecommend toDomain(GroupCourseRecommendEntity entity) {
+        if (entity == null) {
+            return null;
+        }
+        GroupCourseRecommend recommend = new GroupCourseRecommend();
+        BeanUtil.copyProperties(entity, recommend);
+        return recommend;
+    }
+
+    private GroupCourseRecommendEntity toEntity(GroupCourseRecommend domain) {
+        if (domain == null) {
+            return null;
+        }
+        GroupCourseRecommendEntity entity = new GroupCourseRecommendEntity();
+        BeanUtil.copyProperties(domain, entity);
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        return entity;
+    }
+}
@@ -6,6 +6,7 @@ import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import org.springframework.data.domain.Sort;
@@ -96,37 +97,19 @@ public class GroupCourseRepository implements IGroupCourseRepository {
    public Mono<PageResponse<GroupCourse>> findByPageAndNotDeleted(PageRequest pageRequest) {
        int page = pageRequest.getPage();
        int size = pageRequest.getSize();
-        String sort = pageRequest.getSort();
-        String order = pageRequest.getOrder();

-        Sort sortObj = Sort.unsorted();
-        if (sort != null && !sort.isEmpty()) {
-            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
-        }
-
-        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
-
-        return groupCourseDao.findAllByDeletedAtIsNull(sortObj)
-                .collectList()
-                .zipWith(groupCourseDao.findAllByDeletedAtIsNull().count())
-                .map(tuple -> {
-                    List<GroupCourseEntity> allEntities = tuple.getT1();
-                    long total = tuple.getT2();
-                    
-                    int fromIndex = page * size;
-                    int toIndex = Math.min(fromIndex + size, allEntities.size());
-                    
-                    List<GroupCourse> courseList;
-                    if (fromIndex < allEntities.size()) {
-                        courseList = allEntities.subList(fromIndex, toIndex).stream()
-                                .map(groupCourseConverter::toDomain)
-                                .toList();
-                    } else {
-                        courseList = List.of();
+        return groupCourseDao.countByPageFiltered(r2dbcEntityTemplate.getDatabaseClient(), pageRequest)
+                .flatMap(total -> {
+                    if (total == 0) {
+                        return Mono.just(new PageResponse<>(List.of(), 0, 0L, page, size));
                    }
-                    
-                    int totalPages = (int) Math.ceil((double) total / size);
-                    return new PageResponse<>(courseList, totalPages, total, page, size);
+                    return groupCourseDao.findByPageFiltered(r2dbcEntityTemplate.getDatabaseClient(), pageRequest)
+                            .map(groupCourseConverter::toDomain)
+                            .collectList()
+                            .map(courseList -> {
+                                int totalPages = (int) Math.ceil((double) total / size);
+                                return new PageResponse<>(courseList, totalPages, total, page, size);
+                            });
                });
    }

@@ -136,7 +119,6 @@ public class GroupCourseRepository implements IGroupCourseRepository {
        entity.setCreatedAt(LocalDateTime.now());
        entity.setUpdatedAt(LocalDateTime.now());
        entity.setStatus(0L);
-        entity.setCurrentMembers(0);
        
        return groupCourseDao.save(entity)
                .map(groupCourseConverter::toDomain);
@@ -168,20 +150,56 @@ public class GroupCourseRepository implements IGroupCourseRepository {
                .then();
    }

-    @Override
-    public Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta) {
-        return groupCourseDao.updateCurrentMembers(id, delta, LocalDateTime.now())
-                .flatMap(updated -> {
-                    if (updated > 0) {
-                        return findByIdAndDeletedAtIsNull(id);
-                    }
-                    return Mono.empty();
-                });
-    }
-
    @Override
    public Flux<GroupCourse> findByCourseType(Long courseType) {
        return groupCourseDao.findByCourseTypeAndDeletedAtIsNull(courseType)
                .map(groupCourseConverter::toDomain);
    }
+
+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        return groupCourseDao.countSearchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                .flatMap(total -> {
+                    if (total == 0) {
+                        return Mono.just(new PageResponse<>(
+                                List.of(), 0, 0L,
+                                query.getPage() != null ? query.getPage() : 0,
+                                query.getSize() != null ? query.getSize() : 10));
+                    }
+                    return groupCourseDao.searchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                            .map(groupCourseConverter::toDomain)
+                            .collectList()
+                            .map(courseList -> {
+                                int size = query.getSize() != null ? query.getSize() : 10;
+                                int totalPages = (int) Math.ceil((double) total / size);
+                                return new PageResponse<>(
+                                        courseList, totalPages, total,
+                                        query.getPage() != null ? query.getPage() : 0, size);
+                            });
+                });
+    }
+
+    // ==================== 教练相关 ====================
+
+    @Override
+    public Flux<GroupCourse> findByCoachId(Long coachId) {
+        return groupCourseDao.findByCoachIdAndDeletedAtIsNull(coachId)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourse> findByCoachId(Long coachId, Sort sort) {
+        return groupCourseDao.findByCoachIdAndDeletedAtIsNull(coachId, sort)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Mono<Long> countByCoachIdAndStatus(Long coachId, Long status) {
+        return groupCourseDao.countByCoachIdAndStatus(coachId, String.valueOf(status));
+    }
+
+    @Override
+    public Mono<Integer> cancelCoursesByCoachIdExceptStatus(Long coachId, Long excludeStatus) {
+        return groupCourseDao.cancelCoursesByCoachIdExceptStatus(coachId, String.valueOf(excludeStatus), LocalDateTime.now());
+    }
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository.impl;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.GroupCourseTypeDao;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
@@ -7,12 +9,18 @@ import cn.novalon.gym.manage.groupcourse.entity.GroupCourseTypeEntity;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.query.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;

@Repository
@Transactional
@@ -22,10 +30,13 @@ public class GroupCourseTypeRepository implements IGroupCourseTypeRepository {

    private final GroupCourseTypeDao groupCourseTypeDao;
    private final GroupCourseConverter converter;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;

-    public GroupCourseTypeRepository(GroupCourseTypeDao groupCourseTypeDao, GroupCourseConverter converter) {
+    public GroupCourseTypeRepository(GroupCourseTypeDao groupCourseTypeDao, GroupCourseConverter converter,
+                                      R2dbcEntityTemplate r2dbcEntityTemplate) {
        this.groupCourseTypeDao = groupCourseTypeDao;
        this.converter = converter;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
    }

    @Override
@@ -129,4 +140,46 @@ public class GroupCourseTypeRepository implements IGroupCourseTypeRepository {
        return groupCourseTypeDao.softDelete(id, LocalDateTime.now())
                .then();
    }
+
+    @Override
+    public Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String order = pageRequest.getOrder();
+        String sort = pageRequest.getSort();
+        String keyword = pageRequest.getKeyword();
+        String category = pageRequest.getCategory();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        // Build dynamic criteria
+        List<Criteria> criteriaList = new ArrayList<>();
+        criteriaList.add(Criteria.where("deleted_at").isNull());
+        if (keyword != null && !keyword.isEmpty()) {
+            criteriaList.add(Criteria.where("type_name").like("%" + keyword + "%").ignoreCase(true));
+        }
+        if (category != null && !category.isEmpty()) {
+            criteriaList.add(Criteria.where("category").is(category));
+        }
+
+        Criteria criteria = criteriaList.isEmpty() ? Criteria.empty() : Criteria.from(criteriaList);
+        Query query = Query.query(criteria).with(org.springframework.data.domain.PageRequest.of(page, size, sortObj));
+
+        return r2dbcEntityTemplate.select(GroupCourseTypeEntity.class)
+                .matching(query)
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(Query.query(criteria), GroupCourseTypeEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<GroupCourseType> list = tuple.getT1().stream()
+                            .map(converter::toGroupCourseType)
+                            .toList();
+                    return new PageResponse<>(list, totalPages, total, page, size);
+                });
+    }
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -27,4 +29,6 @@ public interface ICourseLabelService {
    Mono<Void> removeLabelFromType(Long typeId, Long labelId);

    Mono<Void> clearLabelsFromType(Long typeId);
+
+    Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest);
 }
@@ -17,10 +17,9 @@ public interface IGroupCourseBookingService {
     *
     * @param courseId 团课ID
     * @param memberId 会员ID
-     * @param memberCardRecordId 会员卡记录ID
     * @return 预约记录
     */
-    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardRecordId);
+    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId);

    /**
     * 取消预约
@@ -0,0 +1,28 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendService {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend);
+
+    Mono<Void> delete(Long id);
+
+    Mono<GroupCourseRecommend> enable(Long id);
+
+    Mono<GroupCourseRecommend> disable(Long id);
+}
@@ -5,14 +5,21 @@ import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
+import cn.novalon.gym.manage.groupcourse.vo.GroupCourseVO;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

+import java.time.LocalDateTime;
+import java.util.List;
+
 public interface IGroupCourseService {
    Mono<GroupCourse> findById(Long id);
    Mono<GroupCourseDetail> findDetailById(Long id);
    Flux<GroupCourse> findAll();
    Flux<GroupCourse> findAll(boolean includeDeleted);
+    Flux<GroupCourseVO> findAllAsVO(boolean includeDeleted);
+    Mono<PageResponse<GroupCourseVO>> findByPageAsVO(PageRequest pageRequest, boolean includeDeleted);
    
    Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted);
    
@@ -25,4 +32,16 @@ public interface IGroupCourseService {
    Mono<GroupCourse> signIn(Long courseId, Long memberId);
    
    Mono<Void> delete(Long id);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
+
+    /**
+     * 检查教练在指定时间段内是否有时间冲突的团课
+     * @param coachId 教练ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param excludeCourseId 排除的课程ID（编辑时排除自身）
+     * @return 冲突的课程列表
+     */
+    Mono<List<GroupCourse>> checkCoachConflict(Long coachId, LocalDateTime startTime, LocalDateTime endTime, Long excludeCourseId);
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,4 +31,6 @@ public interface IGroupCourseTypeService {
     * @return 分类名称列表
     */
    Flux<String> findCategories();
+
+    Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest);
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service.impl;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
@@ -109,4 +111,12 @@ public class CourseLabelService implements ICourseLabelService {
                .doOnSuccess(v -> logger.info("清空类型标签成功 - typeId={}", typeId))
                .doOnError(error -> logger.error("清空类型标签失败 - typeId={}, error: {}", typeId, error.getMessage()));
    }
+
+    @Override
+    public Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest) {
+        return courseLabelRepository.findByPage(pageRequest)
+                .doOnSuccess(result -> logger.info("分页查询标签成功 - page={}, size={}, total={}",
+                        pageRequest.getPage(), pageRequest.getSize(), result.getTotalElements()))
+                .doOnError(error -> logger.error("分页查询标签失败 - error: {}", error.getMessage()));
+    }
 }
@@ -3,7 +3,6 @@ package cn.novalon.gym.manage.groupcourse.service.impl;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
 import cn.novalon.gym.manage.groupcourse.event.BookingReminderEventPublisher;
-import cn.novalon.gym.manage.groupcourse.handler.BookingSagaHandler;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
@@ -25,7 +24,6 @@ import java.util.UUID;
 * - 取消预约需在课程开始前至少2小时
 * - 每节课最多20人
 * - 预约成功后发送提醒
- * - 预约成功后扣减权益
 * 
 * 技术要点：
 * - 使用Redis缓存团课信息
@@ -44,7 +42,6 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
    private final IGroupCourseRepository courseRepository;
    private final GroupCourseRedisService redisService;
    private final BookingReminderEventPublisher bookingReminderEventPublisher;
-    private final BookingSagaHandler bookingSagaHandler;

    // 预约提前时间限制（分钟）
    private static final long BOOKING_MIN_ADVANCE_MINUTES = 30;
@@ -54,18 +51,16 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
    public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository,
                                     IGroupCourseRepository courseRepository,
                                     GroupCourseRedisService redisService,
-                                     BookingReminderEventPublisher bookingReminderEventPublisher,
-                                     BookingSagaHandler bookingSagaHandler) {
+                                     BookingReminderEventPublisher bookingReminderEventPublisher) {
        this.bookingRepository = bookingRepository;
        this.courseRepository = courseRepository;
        this.redisService = redisService;
        this.bookingReminderEventPublisher = bookingReminderEventPublisher;
-        this.bookingSagaHandler = bookingSagaHandler;
    }

    @Override
-    public Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardRecordId) {
-        logger.info("开始预约团课：courseId={}, memberId={}, memberCardRecordId={}", courseId, memberId, memberCardRecordId);
+    public Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId) {
+        logger.info("开始预约团课：courseId={}, memberId={}", courseId, memberId);

        // 生成唯一请求ID用于分布式锁
        String requestId = UUID.randomUUID().toString();
@@ -77,18 +72,26 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                        return Mono.error(new RuntimeException("系统繁忙，请稍后重试"));
                    }

-                    // 2. 尝试从缓存获取课程信息，如果缓存不存在则从数据库获取
+                    // 2. 从缓存或数据库获取课程信息，并用实时预约数覆盖currentMembers
                    return getCourseWithCache(courseId)
+                            .flatMap(course ->
+                                bookingRepository.countValidBookings(courseId)
+                                        .map(count -> {
+                                            course.setCurrentMembers(count.intValue());
+                                            return course;
+                                        })
+                                        .defaultIfEmpty(course)
+                            )
                            .flatMap(course -> {
                                // 3. 验证课程状态
-                                Long status = course.getStatus();
-                                if (status == null || status != 0L) {
+                                Long courseStatus = course.getStatus();
+                                if (courseStatus == null || courseStatus != 0L) {
                                    String errorMessage;
-                                    if (status == null) {
+                                    if (courseStatus == null) {
                                        errorMessage = "课程状态异常";
-                                    } else if (status == 1L) {
+                                    } else if (courseStatus == 1L) {
                                        errorMessage = "课程已取消，无法预约";
-                                    } else if (status == 2L) {
+                                    } else if (courseStatus == 2L) {
                                        errorMessage = "课程已结束，无法预约";
                                    } else {
                                        errorMessage = "课程状态不可预约";
@@ -131,56 +134,46 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {

                                            // 7. 验证是否已预约
                                            return bookingRepository.findValidBooking(courseId, memberId)
-                                                    .flatMap(existingBooking -> {
-                                                        return releaseLockAndError(courseId, requestId, "您已预约该课程");
-                                                    })
+                                                    .flatMap(existingBooking -> 
+                                                        releaseLockAndError(courseId, requestId, "您已预约该课程")
+                                                    )
                                                    .switchIfEmpty(
-                                                        // 8. 使用Redis原子操作验证课程人数是否已满
-                                                        validateAndIncrementBookingCount(courseId, course.getMaxMembers())
-                                                            .flatMap(countValid -> {
-                                                                if (countValid > course.getMaxMembers()) {
-                                                                    return releaseLockAndError(courseId, requestId, "课程已满");
-                                                                }
+                                                        // 8. 创建预约记录
+                                                        Mono.defer(() -> {
+                                                            GroupCourseBooking booking = new GroupCourseBooking();
+                                                            booking.setCourseId(courseId);
+                                                            booking.setMemberId(memberId);
+                                                            booking.setBookingTime(LocalDateTime.now());
+                                                            booking.setStatus("0"); // 0-已预约

-                                                                // 9. 创建预约记录
-                                                                GroupCourseBooking booking = new GroupCourseBooking();
-                                                                booking.setCourseId(courseId);
-                                                                booking.setMemberId(memberId);
-                                                                booking.setMemberCardRecordId(memberCardRecordId);
-                                                                booking.setBookingTime(LocalDateTime.now());
-                                                                booking.setStatus("0"); // 0-已预约
+                                                            // 添加课程信息到预约记录
+                                                            booking.setCourseName(course.getCourseName());
+                                                            booking.setCourseStartTime(course.getStartTime());
+                                                            booking.setCourseEndTime(course.getEndTime());
+                                                            booking.setLocation(course.getLocation());

-                                                                // 添加课程信息到预约记录
-                                                                booking.setCourseName(course.getCourseName());
-                                                                booking.setCourseStartTime(course.getStartTime());
-                                                                booking.setCourseEndTime(course.getEndTime());
-                                                                booking.setLocation(course.getLocation());
-
-                                                                // 10. 使用Saga事务执行预约（包含权益扣减）
-                                                                return bookingSagaHandler.executeBooking(booking, memberCardRecordId)
-                                                                    .flatMap(savedBooking -> {
-                                                                        // 11. 释放锁
-                                                                        return redisService.releaseLock(courseId, requestId)
-                                                                            .then(Mono.just(savedBooking));
-                                                                    })
-                                                                    .doOnSuccess(savedBooking -> {
-                                                                        logger.info("预约成功：bookingId={}, courseId={}, memberId={}",
-                                                                                savedBooking.getId(), courseId, memberId);
-                                                                        // 发布预约成功事件
-                                                                        bookingReminderEventPublisher.publishBookingSuccessEvent(
-                                                                                savedBooking.getId(),
-                                                                                savedBooking.getMemberId(),
-                                                                                savedBooking.getCourseName(),
-                                                                                savedBooking.getCourseStartTime().toString()
-                                                                        );
-                                                                    })
-                                                                    .doOnError(error -> {
-                                                                        // 回滚Redis计数
-                                                                        redisService.decrementBookingCount(courseId).subscribe();
-                                                                        logger.error("预约失败：courseId={}, memberId={}, error={}",
-                                                                                courseId, memberId, error.getMessage());
-                                                                    });
-                                                            })
+                                                            // 9. 保存预约记录
+                                                            return bookingRepository.save(booking)
+                                                                .flatMap(saved -> {
+                                                                    if (saved.getId() == null) {
+                                                                        return Mono.error(new RuntimeException("保存预约记录失败"));
+                                                                    }
+                                                                    // 10. 释放锁
+                                                                    return redisService.releaseLock(courseId, requestId)
+                                                                        .then(Mono.just(saved));
+                                                                })
+                                                                .doOnSuccess(savedBooking -> {
+                                                                    logger.info("预约成功：bookingId={}, courseId={}, memberId={}",
+                                                                            savedBooking.getId(), courseId, memberId);
+                                                                    // 发布预约成功事件
+                                                                    bookingReminderEventPublisher.publishBookingSuccessEvent(
+                                                                            savedBooking.getId(),
+                                                                            savedBooking.getMemberId(),
+                                                                            savedBooking.getCourseName(),
+                                                                            savedBooking.getCourseStartTime().toString()
+                                                                    );
+                                                                });
+                                                        })
                                                    );
                                        });
                            })
@@ -208,29 +201,6 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                );
    }

-    /**
-     * 验证并增加预约人数（使用Redis原子操作）
-     */
-    private Mono<Integer> validateAndIncrementBookingCount(Long courseId, Integer maxMembers) {
-        // 先获取当前Redis中的预约计数
-        return redisService.getBookingCount(courseId)
-                .flatMap(currentCount -> {
-                    // 如果Redis中计数为0，可能是首次访问，需要从数据库同步
-                    if (currentCount == 0) {
-                        // 从数据库查询实际预约人数
-                        return bookingRepository.countValidBookings(courseId)
-                                .flatMap(dbCount -> {
-                                    // 将数据库中的实际预约人数同步到Redis
-                                    return redisService.setBookingCount(courseId, dbCount.intValue())
-                                            .then(Mono.just(dbCount.intValue()));
-                                });
-                    }
-                    return Mono.just(currentCount);
-                })
-                // 递增预约计数
-                .flatMap(count -> redisService.incrementBookingCount(courseId).map(Long::intValue));
-    }
-
    /**
     * 释放锁并返回错误
     */
@@ -290,26 +260,29 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                                            "需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消");
                                }

-                                // 5. 使用Saga事务执行取消预约（包含权益恢复）
-                                return bookingSagaHandler.executeCancelBooking(bookingId, booking.getCourseId(), booking.getMemberCardRecordId(), memberId)
-                                    .flatMap(updatedBooking -> {
-                                        // 6. 释放锁
-                                        return redisService.releaseLock(bookingId, requestId)
-                                            .then(Mono.just(updatedBooking));
-                                    })
-                                    .doOnSuccess(updatedBooking -> {
-                                        logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId);
-                                        // 发布预约取消事件
-                                        bookingReminderEventPublisher.publishBookingCancelEvent(
-                                                updatedBooking.getId(),
-                                                updatedBooking.getMemberId(),
-                                                updatedBooking.getCourseName()
-                                        );
-                                    })
-                                    .doOnError(error -> {
-                                        logger.error("取消预约失败：bookingId={}, memberId={}, error={}",
-                                                bookingId, memberId, error.getMessage());
-                                    });
+                                // 5. 更新预约状态为已取消
+                                return bookingRepository.updateStatus(bookingId, "1")
+                                        .flatMap(rows -> {
+                                            if (rows == 0) {
+                                                return Mono.error(new RuntimeException("更新预约状态失败"));
+                                            }
+                                            // 6. 释放锁
+                                            return redisService.releaseLock(bookingId, requestId)
+                                                .then(bookingRepository.findById(bookingId));
+                                        })
+                                        .doOnSuccess(updatedBooking -> {
+                                            logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId);
+                                            // 发布预约取消事件
+                                            bookingReminderEventPublisher.publishBookingCancelEvent(
+                                                    updatedBooking.getId(),
+                                                    updatedBooking.getMemberId(),
+                                                    updatedBooking.getCourseName()
+                                            );
+                                        })
+                                        .doOnError(error -> {
+                                            logger.error("取消预约失败：bookingId={}, memberId={}, error={}",
+                                                    bookingId, memberId, error.getMessage());
+                                        });
                            })
                            .onErrorResume(error -> {
                                redisService.releaseLock(bookingId, requestId).subscribe();
@@ -0,0 +1,142 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Service
+public class GroupCourseRecommendService implements IGroupCourseRecommendService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseRecommendService.class);
+
+    private final IGroupCourseRecommendRepository recommendRepository;
+    private final IGroupCourseRepository groupCourseRepository;
+
+    public GroupCourseRecommendService(IGroupCourseRecommendRepository recommendRepository,
+                                       IGroupCourseRepository groupCourseRepository) {
+        this.recommendRepository = recommendRepository;
+        this.groupCourseRepository = groupCourseRepository;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendRepository.findById(id)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendRepository.findAll()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        return recommendRepository.findAll(sortBy, sortOrder)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendRepository.findAllActive()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendRepository.findByCourseId(courseId)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.error(new RuntimeException("团课ID不能为空"));
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    return recommendRepository.save(recommend)
+                            .doOnSuccess(r -> logger.info("团课推荐创建成功 - id={}, courseId={}", r.getId(), r.getCourseId()))
+                            .doOnError(error -> logger.error("团课推荐创建失败 - error: {}", error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(existing -> {
+                    if (recommend.getRecommendTitle() != null) {
+                        existing.setRecommendTitle(recommend.getRecommendTitle());
+                    }
+                    if (recommend.getRecommendContent() != null) {
+                        existing.setRecommendContent(recommend.getRecommendContent());
+                    }
+                    if (recommend.getRecommendReason() != null) {
+                        existing.setRecommendReason(recommend.getRecommendReason());
+                    }
+                    if (recommend.getPriority() != null) {
+                        existing.setPriority(recommend.getPriority());
+                    }
+                    if (recommend.getIsActive() != null) {
+                        existing.setIsActive(recommend.getIsActive());
+                    }
+                    if (recommend.getCourseId() != null) {
+                        existing.setCourseId(recommend.getCourseId());
+                    }
+
+                    return recommendRepository.update(existing);
+                })
+                .doOnSuccess(r -> logger.info("团课推荐更新成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> delete(Long id) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(recommend -> {
+                    return recommendRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课推荐删除成功 - id={}", id))
+                            .doOnError(error -> logger.error("团课推荐删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> enable(Long id) {
+        return recommendRepository.updateActiveStatus(id, true)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐启用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐启用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> disable(Long id) {
+        return recommendRepository.updateActiveStatus(id, false)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐禁用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐禁用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    private Mono<GroupCourseRecommend> fillGroupCourseInfo(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.just(recommend);
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .map(course -> {
+                    recommend.setGroupCourse(course);
+                    return recommend;
+                })
+                .defaultIfEmpty(recommend);
+    }
+}
@@ -149,46 +149,4 @@ public class GroupCourseRedisService {
                })
                .defaultIfEmpty(false);
    }
-
-    /**
-     * 获取课程预约人数（缓存）
-     */
-    public Mono<Integer> getBookingCount(Long courseId) {
-        String key = "booking_count:" + courseId;
-        return reactiveRedisTemplate.opsForValue()
-                .get(key)
-                .map(obj -> (Integer) obj)
-                .defaultIfEmpty(0);
-    }
-
-    /**
-     * 增加课程预约人数
-     */
-    public Mono<Long> incrementBookingCount(Long courseId) {
-        String key = "booking_count:" + courseId;
-        return reactiveRedisTemplate.opsForValue()
-                .increment(key)
-                .doOnSuccess(count -> logger.debug("预约人数增加：courseId={}, count={}", courseId, count));
-    }
-
-    /**
-     * 减少课程预约人数
-     */
-    public Mono<Long> decrementBookingCount(Long courseId) {
-        String key = "booking_count:" + courseId;
-        return reactiveRedisTemplate.opsForValue()
-                .decrement(key)
-                .doOnSuccess(count -> logger.debug("预约人数减少：courseId={}, count={}", courseId, count));
-    }
-
-    /**
-     * 设置课程预约人数（用于从数据库同步）
-     */
-    public Mono<Void> setBookingCount(Long courseId, Integer count) {
-        String key = "booking_count:" + courseId;
-        return reactiveRedisTemplate.opsForValue()
-                .set(key, count)
-                .doOnSuccess(result -> logger.debug("预约人数已设置：courseId={}, count={}", courseId, count))
-                .then();
-    }
 }
@@ -9,6 +9,7 @@ import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.enums.CourseEvent;
 import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseStateMachine;
@@ -17,20 +18,30 @@ import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepositor
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
+import cn.novalon.gym.manage.groupcourse.vo.GroupCourseVO;
+import cn.novalon.gym.manage.file.core.service.ISysFileService;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
+import cn.novalon.gym.manage.sys.core.domain.SysUser;
+import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

@Service
 public class GroupCourseService implements IGroupCourseService {
@@ -45,6 +56,9 @@ public class GroupCourseService implements IGroupCourseService {
    private final RedisUtil redisUtil;
    private final ObjectMapper objectMapper;
    private final GroupCourseStateMachine stateMachine;
+    private final DatabaseClient databaseClient;
+    private final ISysFileService fileService;
+    private final ISysUserRepository sysUserRepository;
    
    private static final String CACHE_KEY_PREFIX = "group_course:page:";
    private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
@@ -61,7 +75,10 @@ public class GroupCourseService implements IGroupCourseService {
                              MemberCardRepository memberCardRepository,
                              RedisUtil redisUtil,
                              ObjectMapper objectMapper,
-                              GroupCourseStateMachine stateMachine){
+                              GroupCourseStateMachine stateMachine,
+                              DatabaseClient databaseClient,
+                              ISysFileService fileService,
+                              ISysUserRepository sysUserRepository){
        this.groupCourseRepository = groupCourseRepository;
        this.bookingRepository = bookingRepository;
        this.groupCourseTypeRepository = groupCourseTypeRepository;
@@ -71,25 +88,29 @@ public class GroupCourseService implements IGroupCourseService {
        this.redisUtil = redisUtil;
        this.objectMapper = objectMapper;
        this.stateMachine = stateMachine;
+        this.databaseClient = databaseClient;
+        this.fileService = fileService;
+        this.sysUserRepository = sysUserRepository;
    }

    @Override
    public Mono<GroupCourseDetail> findDetailById(Long id) {
        String cacheKey = CACHE_KEY_DETAIL_PREFIX + id;
        
-        return redisUtil.get(cacheKey, String.class)
+        Mono<String> cachedMono = redisUtil.get(cacheKey, String.class);
+        return cachedMono
                .flatMap(cachedJson -> {
-                    if (cachedJson != null) {
+                    if (cachedJson != null && !cachedJson.isEmpty()) {
                        try {
                            GroupCourseDetail detail = objectMapper.readValue(cachedJson, GroupCourseDetail.class);
                            logger.info("缓存命中 - findDetailById: id={}", id);
-                            return Mono.just(detail);
+                            return Mono.<GroupCourseDetail>just(detail);
                        } catch (JsonProcessingException e) {
                            logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
-                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                            return redisUtil.delete(cacheKey).then(Mono.<GroupCourseDetail>empty());
                        }
                    }
-                    return Mono.empty();
+                    return Mono.<GroupCourseDetail>empty();
                })
                .switchIfEmpty(
                    groupCourseRepository.findByIdAndDeletedAtIsNull(id)
@@ -115,6 +136,8 @@ public class GroupCourseService implements IGroupCourseService {
                                        })
                                        .switchIfEmpty(Mono.just(buildDetail(course, null)));
                            })
+                            .flatMap(this::enrichCoachName)
+                            .flatMap(this::enrichCurrentMembers)
                            .flatMap(detail -> {
                                try {
                                    String jsonData = objectMapper.writeValueAsString(detail);
@@ -147,8 +170,8 @@ public class GroupCourseService implements IGroupCourseService {
        detail.setLocation(course.getLocation());
        detail.setCoverImage(course.getCoverImage());
        detail.setDescription(course.getDescription());
-        detail.setPointCardAmount(course.getPointCardAmount());
        detail.setStoredValueAmount(course.getStoredValueAmount());
+        detail.setQrCodePath(course.getQrCodePath());
        detail.setCreatedAt(course.getCreatedAt());
        detail.setUpdatedAt(course.getUpdatedAt());
        
@@ -160,23 +183,70 @@ public class GroupCourseService implements IGroupCourseService {
        return detail;
    }

+    /**
+     * 为团课详情对象填充教练名称
+     */
+    private Mono<GroupCourseDetail> enrichCoachName(GroupCourseDetail detail) {
+        Long coachId = detail.getCoachId();
+        if (coachId == null) {
+            return Mono.just(detail);
+        }
+        return sysUserRepository.findByIdIncludingDeleted(coachId)
+                .map(user -> {
+                    String name = user.getNickname() != null ? user.getNickname() : user.getUsername();
+                    detail.setCoachName(name);
+                    logger.debug("enrichCoachName: courseId={}, coachId={}, coachName={}", detail.getId(), coachId, name);
+                    return detail;
+                })
+                .doOnNext(d -> {}) // 避免空doOnNext告警
+                .defaultIfEmpty(detail)
+                .doOnDiscard(GroupCourseDetail.class, d ->
+                        logger.warn("enrichCoachName: coach not found, coachId={}, courseId={}", coachId, detail.getId())
+                );
+    }
+
+    /**
+     * 为团课详情对象填充实时预约人数
+     */
+    private Mono<GroupCourseDetail> enrichCurrentMembers(GroupCourseDetail detail) {
+        return bookingRepository.countValidBookings(detail.getId())
+                .map(count -> {
+                    detail.setCurrentMembers(count.intValue());
+                    return detail;
+                })
+                .defaultIfEmpty(detail);
+    }
+
+    /**
+     * 为团课对象填充实时预约人数
+     */
+    private Mono<GroupCourse> enrichCurrentMembers(GroupCourse course) {
+        return bookingRepository.countValidBookings(course.getId())
+                .map(count -> {
+                    course.setCurrentMembers(count.intValue());
+                    return course;
+                })
+                .defaultIfEmpty(course);
+    }
+
    @Override
    public Mono<GroupCourse> findById(Long id) {
        String cacheKey = CACHE_KEY_ID_PREFIX + id;
        
-        return redisUtil.get(cacheKey, String.class)
+        Mono<String> cachedMono = redisUtil.get(cacheKey, String.class);
+        return cachedMono
                .flatMap(cachedJson -> {
-                    if (cachedJson != null) {
+                    if (cachedJson != null && !cachedJson.isEmpty()) {
                        try {
                            GroupCourse groupCourse = objectMapper.readValue(cachedJson, GroupCourse.class);
                            logger.info("缓存命中 - findById: id={}", id);
-                            return Mono.just(groupCourse);
+                            return Mono.<GroupCourse>just(groupCourse);
                        } catch (JsonProcessingException e) {
                            logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
-                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                            return redisUtil.delete(cacheKey).then(Mono.<GroupCourse>empty());
                        }
                    }
-                    return Mono.empty();
+                    return Mono.<GroupCourse>empty();
                })
                .switchIfEmpty(
                    groupCourseRepository.findByIdAndDeletedAtIsNull(id)
@@ -192,7 +262,8 @@ public class GroupCourseService implements IGroupCourseService {
                                }
                            })
                            .doOnSubscribe(sub -> logger.debug("缓存未命中，查询数据库 - findById: id={}", id))
-                );
+                )
+                .flatMap(this::enrichCurrentMembers);
    }

    @Override
@@ -209,6 +280,47 @@ public class GroupCourseService implements IGroupCourseService {
        }
    }

+    @Override
+    public Flux<GroupCourseVO> findAllAsVO(boolean includeDeleted) {
+        return findAll(includeDeleted)
+                .flatMap(this::enrichCurrentMembers)
+                .collectList()
+                .flatMapMany(courses -> {
+                    if (courses.isEmpty()) {
+                        logger.info("findAllAsVO: no courses found");
+                        return Flux.empty();
+                    }
+                    var coachIds = courses.stream()
+                            .map(GroupCourse::getCoachId)
+                            .filter(id -> id != null)
+                            .distinct()
+                            .toList();
+
+                    logger.info("findAllAsVO: {} courses, {} unique coach IDs: {}", courses.size(), coachIds.size(), coachIds);
+
+                    if (coachIds.isEmpty()) {
+                        logger.info("findAllAsVO: no coach IDs, returning VOs with null coachName");
+                        return Flux.fromIterable(courses.stream()
+                                .map(c -> GroupCourseVO.from(c, null))
+                                .toList());
+                    }
+
+                    return Flux.fromIterable(coachIds)
+                            .flatMap(sysUserRepository::findByIdIncludingDeleted)
+                            .doOnNext(u -> logger.info("findAllAsVO: found coach id={}, nickname={}, username={}", u.getId(), u.getNickname(), u.getUsername()))
+                            .collectMap(SysUser::getId, u -> u.getNickname() != null ? u.getNickname() : u.getUsername())
+                            .doOnNext(m -> logger.info("findAllAsVO: coachNameMap size={}, keys={}", m.size(), m.keySet()))
+                            .flatMapMany(coachNameMap ->
+                                    Flux.fromIterable(courses.stream()
+                                            .map(c -> {
+                                                String name = coachNameMap.get(c.getCoachId());
+                                                logger.debug("findAllAsVO: courseId={}, coachId={}, coachName={}", c.getId(), c.getCoachId(), name);
+                                                return GroupCourseVO.from(c, name);
+                                            })
+                                            .toList()));
+                });
+    }
+
    @Override
    public Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted) {
        int page = pageRequest.getPage();
@@ -216,23 +328,25 @@ public class GroupCourseService implements IGroupCourseService {
        String sort = pageRequest.getSort();
        String order = pageRequest.getOrder();
        String keyword = pageRequest.getKeyword() != null ? pageRequest.getKeyword() : "";
+        String status = pageRequest.getStatus() != null ? pageRequest.getStatus() : "";
        
-        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword;
+        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword + ":" + status;

-        return redisUtil.get(cacheKey, String.class)
+        Mono<String> cachedMono = redisUtil.get(cacheKey, String.class);
+        return cachedMono
                .flatMap(cachedJson -> {
-                    if (cachedJson != null) {
+                    if (cachedJson != null && !cachedJson.isEmpty()) {
                        try {
                            PageResponse<GroupCourse> pageResponse = objectMapper.readValue(cachedJson, 
                                objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class));
                            logger.info("缓存命中 - findByPage: key={}", cacheKey);
-                            return Mono.just(pageResponse);
+                            return Mono.<PageResponse<GroupCourse>>just(pageResponse);
                        } catch (JsonProcessingException e) {
                            logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage());
-                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                            return redisUtil.delete(cacheKey).then(Mono.<PageResponse<GroupCourse>>empty());
                        }
                    }
-                    return Mono.empty();
+                    return Mono.<PageResponse<GroupCourse>>empty();
                })
                .switchIfEmpty(
                    Mono.defer(() -> {
@@ -259,10 +373,114 @@ public class GroupCourseService implements IGroupCourseService {
                );
    }

+    @Override
+    public Mono<PageResponse<GroupCourseVO>> findByPageAsVO(PageRequest pageRequest, boolean includeDeleted) {
+        return findByPage(pageRequest, includeDeleted)
+                .flatMap(pageResponse -> {
+                    List<GroupCourse> courses = pageResponse.getContent();
+                    if (courses.isEmpty()) {
+                        PageResponse<GroupCourseVO> voResponse = new PageResponse<>(
+                                Collections.emptyList(),
+                                pageResponse.getTotalPages(),
+                                pageResponse.getTotalElements(),
+                                pageResponse.getCurrentPage(),
+                                pageResponse.getPageSize()
+                        );
+                        return Mono.just(voResponse);
+                    }
+
+                    // 用实时预约人数覆盖缓存/DB中的currentMembers
+                    return Flux.fromIterable(courses)
+                            .flatMap(this::enrichCurrentMembers)
+                            .collectList()
+                            .flatMap(enrichedCourses -> {
+                                var coachIds = enrichedCourses.stream()
+                                        .map(GroupCourse::getCoachId)
+                                        .filter(id -> id != null)
+                                        .distinct()
+                                        .toList();
+
+                                logger.info("findByPageAsVO: {} courses, {} unique coach IDs: {}", enrichedCourses.size(), coachIds.size(), coachIds);
+
+                                if (coachIds.isEmpty()) {
+                                    List<GroupCourseVO> voList = enrichedCourses.stream()
+                                            .map(c -> GroupCourseVO.from(c, null))
+                                            .toList();
+                                    PageResponse<GroupCourseVO> voResponse = new PageResponse<>(
+                                            voList,
+                                            pageResponse.getTotalPages(),
+                                            pageResponse.getTotalElements(),
+                                            pageResponse.getCurrentPage(),
+                                            pageResponse.getPageSize()
+                                    );
+                                    return Mono.just(voResponse);
+                                }
+
+                                return Flux.fromIterable(coachIds)
+                                        .flatMap(sysUserRepository::findByIdIncludingDeleted)
+                                        .doOnNext(u -> logger.info("findByPageAsVO: found coach id={}, nickname={}", u.getId(), u.getNickname()))
+                                        .collectMap(SysUser::getId, u -> u.getNickname() != null ? u.getNickname() : u.getUsername())
+                                        .map(coachNameMap -> {
+                                            List<GroupCourseVO> voList = enrichedCourses.stream()
+                                                    .map(c -> {
+                                                        String name = coachNameMap.get(c.getCoachId());
+                                                        logger.debug("findByPageAsVO: courseId={}, coachId={}, coachName={}", c.getId(), c.getCoachId(), name);
+                                                        return GroupCourseVO.from(c, name);
+                                                    })
+                                                    .toList();
+                                            return new PageResponse<>(
+                                                    voList,
+                                                    pageResponse.getTotalPages(),
+                                                    pageResponse.getTotalElements(),
+                                                    pageResponse.getCurrentPage(),
+                                                    pageResponse.getPageSize()
+                                            );
+                                        });
+                            });
+                });
+    }
+
    @Override
    public Mono<GroupCourse> create(GroupCourse groupCourse) {
        return groupCourseRepository.save(groupCourse)
-                .doOnSuccess(course -> logger.info("团课创建成功 - id={}, name={}", course.getId(), course.getCourseName()))
+                .flatMap(course -> {
+                    try {
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime());
+                        qrCodeContent.put("endTime", course.getEndTime());
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        qrCodeContent.put("createdAt", course.getCreatedAt());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码字节数组，通过统一文件服务保存
+                        return Mono.fromCallable(() -> QRCodeUtil.generateQrCodeBytes(jsonContent))
+                                .flatMap(qrCodeBytes -> {
+                                    String fileName = "qrcode_" + course.getId() + ".png";
+                                    return fileService.saveBytes(qrCodeBytes, fileName, "image/png", "system");
+                                })
+                                .flatMap(sysFile -> {
+                                    String qrCodeUrl = "/api/files/" + sysFile.getId() + "/preview";
+                                    course.setQrCodePath(qrCodeUrl);
+                                    
+                                    logger.info("团课二维码已保存 - id={}, fileId={}, url={}", course.getId(), sysFile.getId(), qrCodeUrl);
+                                    
+                                    return groupCourseRepository.update(course)
+                                            .doOnSuccess(updatedCourse -> logger.info("团课创建成功 - id={}, name={}", updatedCourse.getId(), updatedCourse.getCourseName()));
+                                });
+                    } catch (Exception e) {
+                        logger.error("团课二维码生成失败 - id={}, error: {}", course.getId(), e.getMessage(), e);
+                        // 即使二维码生成失败，也返回成功创建的团课
+                        return Mono.just(course);
+                    }
+                })
                .flatMap(course -> clearCache().thenReturn(course))
                .doOnError(error -> logger.error("团课创建失败 - error: {}", error.getMessage()));
    }
@@ -302,12 +520,12 @@ public class GroupCourseService implements IGroupCourseService {
                    if (groupCourse.getDescription() != null) {
                        existing.setDescription(groupCourse.getDescription());
                    }
-                    if (groupCourse.getPointCardAmount() != null) {
-                        existing.setPointCardAmount(groupCourse.getPointCardAmount());
-                    }
                    if (groupCourse.getStoredValueAmount() != null) {
                        existing.setStoredValueAmount(groupCourse.getStoredValueAmount());
                    }
+                    if (groupCourse.getQrCodePath() != null) {
+                        existing.setQrCodePath(groupCourse.getQrCodePath());
+                    }
                    return groupCourseRepository.update(existing);
                })
                .doOnSuccess(course -> logger.info("团课更新成功 - id={}", id))
@@ -357,12 +575,11 @@ public class GroupCourseService implements IGroupCourseService {
        return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
                .switchIfEmpty(Mono.error(new RuntimeException("课程不存在")))
                .flatMap(course -> {
-                    Integer pointCardAmount = course.getPointCardAmount() != null ? course.getPointCardAmount() : 1;
                    Double storedValueAmount = course.getStoredValueAmount() != null ? 
                            course.getStoredValueAmount().doubleValue() : DEFAULT_GROUP_COURSE_PRICE;
                    
-                    logger.info("课程权益信息: courseId={}, pointCardAmount={}, storedValueAmount={}", 
-                            courseId, pointCardAmount, storedValueAmount);
+                    logger.info("课程权益信息: courseId={}, storedValueAmount={}", 
+                            courseId, storedValueAmount);
                    
                    return bookingRepository.findByCourseId(courseId)
                            .filter(booking -> "0".equals(booking.getStatus())) // 只处理已预约状态的记录
@@ -373,8 +590,8 @@ public class GroupCourseService implements IGroupCourseService {
                                    return Mono.empty();
                                }
                                
-                                // 根据会员卡类型返还权益
-                                return refundCardUsage(booking.getId(), memberCardRecordId, pointCardAmount, storedValueAmount)
+                                // 根据会员卡类型返还权益（仅储值卡返还金额）
+                                return refundCardUsage(booking.getId(), memberCardRecordId, storedValueAmount)
                                        .doOnSuccess(unused -> logger.info("会员权益返还成功: bookingId={}, memberId={}", 
                                                booking.getId(), booking.getMemberId()))
                                        .doOnError(error -> logger.error("会员权益返还失败: bookingId={}, memberId={}, error={}", 
@@ -390,11 +607,10 @@ public class GroupCourseService implements IGroupCourseService {
     * 
     * @param bookingId 预约ID
     * @param recordId 会员卡记录ID
-     * @param pointCardAmount 次卡返还次数
     * @param storedValueAmount 储值卡返还金额
     * @return 空Mono
     */
-    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Integer pointCardAmount, Double storedValueAmount) {
+    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Double storedValueAmount) {
        return memberCardRecordService.findById(recordId)
                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
                .flatMap(record -> {
@@ -405,10 +621,9 @@ public class GroupCourseService implements IGroupCourseService {
                                Mono<Void> refundOperation;
                                switch (cardType) {
                                    case COUNT_CARD:
-                                        // 次卡返还次数（基于课程设置的pointCardAmount）
-                                        logger.debug("返还次卡次数: recordId={}, amount={}", recordId, pointCardAmount);
-                                        refundOperation = memberCardRecordService.renewCard(recordId, pointCardAmount, 0.0, record.getExpireTime())
-                                                .then(Mono.empty());
+                                        // 次卡不再支持团课预约，无需返还
+                                        logger.debug("次卡不返还权益: bookingId={}", bookingId);
+                                        refundOperation = Mono.empty();
                                        break;
                                    case STORED_VALUE_CARD:
                                        // 储值卡返还金额（基于课程设置的storedValueAmount）
@@ -440,27 +655,49 @@ public class GroupCourseService implements IGroupCourseService {
    @Override
    public Mono<GroupCourse> signIn(Long courseId, Long memberId) {
        return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
-                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在或已删除")))
+                .flatMap(course ->
+                    // 用实时预约人数覆盖currentMembers
+                    bookingRepository.countValidBookings(courseId)
+                            .map(count -> {
+                                course.setCurrentMembers(count.intValue());
+                                return course;
+                            })
+                            .defaultIfEmpty(course)
+                )
                .flatMap(course -> {
-                    if (course.getStatus() != 0L) {
-                        return Mono.error(new RuntimeException("课程状态不允许签到"));
+                    // 校验1：团课已取消
+                    if (course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已取消，无法签到"));
                    }
                    
+                    // 校验2：团课已结束
+                    if (course.getStatus().equals(CourseStatus.ENDED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验3：签到时间校验（开课前2小时内才能签到）
+                    LocalDateTime now = LocalDateTime.now();
+                    LocalDateTime signInStart = course.getStartTime().minusHours(2);
+                    if (now.isBefore(signInStart)) {
+                        return Mono.error(new RuntimeException("未到签到时间，请在开课前2小时内签到"));
+                    }
+                    if (now.isAfter(course.getEndTime())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验4：课程已满员
                    if (course.getCurrentMembers() >= course.getMaxMembers()) {
-                        return Mono.error(new RuntimeException("课程已满员"));
+                        return Mono.error(new RuntimeException("课程已满员，无法签到"));
                    }
                    
-                    // 检查会员是否已预约此课程
+                    // 校验5：用户已预约此课程（有效预约，状态为0-已预约）
                    return bookingRepository.findValidBooking(courseId, memberId)
-                            .switchIfEmpty(Mono.error(new RuntimeException("会员未预约此课程")))
+                            .switchIfEmpty(Mono.error(new RuntimeException("您未预约此团课")))
                            .flatMap(booking -> {
-                                // 更新课程当前人数
-                                return groupCourseRepository.updateCurrentMembers(courseId, 1)
-                                        .flatMap(updatedCourse -> {
-                                            // 更新预约状态为已出席
-                                            return bookingRepository.updateStatus(booking.getId(), "2")
-                                                    .thenReturn(updatedCourse);
-                                        });
+                                // 更新预约状态为已出席（2），不再手动计数
+                                return bookingRepository.updateStatus(booking.getId(), "2")
+                                        .thenReturn(course);
                            });
                })
                .doOnSuccess(course -> logger.info("团课签到成功 - courseId={}, memberId={}", courseId, memberId))
@@ -470,14 +707,15 @@ public class GroupCourseService implements IGroupCourseService {

    @Override
    public Mono<Void> delete(Long id) {
-        // 先查询课程状态，只有已取消的课程才能删除
+        // 只有已取消或已结束的课程才能删除
        return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
                .flatMap(course -> {
-                    // 检查课程状态是否为已取消（状态码1）
-                    if (course.getStatus() == null || !course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
-                        return Mono.error(new RuntimeException("只有已取消的课程才能删除，当前状态: " + 
-                                (course.getStatus() != null ? course.getStatus() : "未知")));
+                    // 检查课程状态是否为已取消（状态码1）或已结束（状态码2）
+                    Long status = course.getStatus();
+                    if (status == null || (!status.equals(CourseStatus.CANCELLED.getValue()) && !status.equals(CourseStatus.ENDED.getValue()))) {
+                        return Mono.error(new RuntimeException("只有已取消或已结束的课程才能删除，当前状态: " + 
+                                (status != null ? status : "未知")));
                    }
                    
                    // 删除课程
@@ -488,9 +726,52 @@ public class GroupCourseService implements IGroupCourseService {
                });
    }

+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        logger.info("多条件查询团课 - courseName={}, courseType={}, startDate={}, endDate={}, timePeriod={}, priceSort={}, remainingMost={}", 
+                query.getCourseName(), query.getCourseType(), query.getStartDate(), query.getEndDate(), 
+                query.getTimePeriod(), query.getPriceSort(), query.getRemainingMost());
+        
+        return groupCourseRepository.searchGroupCourses(query)
+                .doOnSuccess(result -> logger.info("多条件查询结果 - total={}, page={}, size={}", 
+                        result.getTotalElements(), result.getCurrentPage(), result.getPageSize()))
+                .doOnError(error -> logger.error("多条件查询失败 - error: {}", error.getMessage()));
+    }
+
    private Mono<Void> clearCache() {
        return redisUtil.deleteByPattern(CACHE_KEY_PREFIX + "*")
                .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*"))
-                .then(redisUtil.deleteByPattern(CACHE_KEY_DETAIL_PREFIX + "*")).then();
+                .then(redisUtil.deleteByPattern(CACHE_KEY_DETAIL_PREFIX + "*"))
+                .then(redisUtil.deleteByPattern("datacount:statistics:*"))
+                .then();
+    }
+
+    @Override
+    public Mono<List<GroupCourse>> checkCoachConflict(Long coachId, LocalDateTime startTime, LocalDateTime endTime, Long excludeCourseId) {
+        if (coachId == null || startTime == null || endTime == null) {
+            return Mono.just(Collections.emptyList());
+        }
+        return groupCourseRepository.findByCoachId(coachId)
+                .filter(course -> {
+                    // 排除已取消的课程
+                    if (course.getStatus() != null && course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
+                        return false;
+                    }
+                    // 排除自身（编辑时）
+                    if (excludeCourseId != null && course.getId() != null && course.getId().equals(excludeCourseId)) {
+                        return false;
+                    }
+                    // 检查时间是否重叠：startTime < course.endTime AND course.startTime < endTime
+                    if (course.getStartTime() == null || course.getEndTime() == null) {
+                        return false;
+                    }
+                    return startTime.isBefore(course.getEndTime()) && course.getStartTime().isBefore(endTime);
+                })
+                .collectList()
+                .doOnNext(conflicts -> {
+                    if (!conflicts.isEmpty()) {
+                        logger.info("checkCoachConflict: coachId={}, conflicts={} courses", coachId, conflicts.size());
+                    }
+                });
    }
 }
@@ -1,6 +1,9 @@
 package cn.novalon.gym.manage.groupcourse.service.impl;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
 import org.slf4j.Logger;
@@ -9,18 +12,18 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

-import java.util.HashSet;
-import java.util.Set;
-
@Service
 public class GroupCourseTypeService implements IGroupCourseTypeService {

    private static final Logger logger = LoggerFactory.getLogger(GroupCourseTypeService.class);

    private final IGroupCourseTypeRepository groupCourseTypeRepository;
+    private final IGroupCourseRepository groupCourseRepository;

-    public GroupCourseTypeService(IGroupCourseTypeRepository groupCourseTypeRepository) {
+    public GroupCourseTypeService(IGroupCourseTypeRepository groupCourseTypeRepository,
+                                  IGroupCourseRepository groupCourseRepository) {
        this.groupCourseTypeRepository = groupCourseTypeRepository;
+        this.groupCourseRepository = groupCourseRepository;
    }

    @Override
@@ -71,9 +74,17 @@ public class GroupCourseTypeService implements IGroupCourseTypeService {

    @Override
    public Mono<Void> delete(Long id) {
-        return groupCourseTypeRepository.deleteById(id)
-                .doOnSuccess(v -> logger.info("团课类型删除成功 - id={}", id))
-                .doOnError(error -> logger.error("团课类型删除失败 - id={}, error: {}", id, error.getMessage()));
+        // 检查是否有团课依赖该类型
+        return groupCourseRepository.findByCourseType(id)
+                .hasElements()
+                .flatMap(hasDependents -> {
+                    if (hasDependents) {
+                        return Mono.<Void>error(new RuntimeException("该类型下存在团课，无法删除"));
+                    }
+                    return groupCourseTypeRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课类型删除成功 - id={}", id))
+                            .doOnError(error -> logger.error("团课类型删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
    }

    @Override
@@ -83,4 +94,12 @@ public class GroupCourseTypeService implements IGroupCourseTypeService {
                .filter(category -> category != null && !category.isEmpty())
                .distinct();
    }
+
+    @Override
+    public Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest) {
+        return groupCourseTypeRepository.findByPage(pageRequest)
+                .doOnSuccess(result -> logger.info("分页查询团课类型成功 - page={}, size={}, total={}",
+                        pageRequest.getPage(), pageRequest.getSize(), result.getTotalElements()))
+                .doOnError(error -> logger.error("分页查询团课类型失败 - error: {}", error.getMessage()));
+    }
 }
@@ -0,0 +1,65 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 二维码生成工具类
+ * 生成二维码的字节数组，由调用方统一通过文件服务保存
+ */
+public class QRCodeUtil {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
+    
+    // 二维码尺寸
+    private static final int QR_CODE_WIDTH = 300;
+    private static final int QR_CODE_HEIGHT = 300;
+    
+    /**
+     * 生成二维码图片的字节数组
+     * 
+     * @param content 二维码内容
+     * @return PNG格式的二维码图片字节数组
+     */
+    public static byte[] generateQrCodeBytes(String content) {
+        try {
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.MARGIN, 1);
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
+            
+            BufferedImage image = MatrixToImageWriter.toBufferedImage(bitMatrix);
+            
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(image, "PNG", baos);
+            byte[] bytes = baos.toByteArray();
+            baos.close();
+            
+            logger.info("二维码字节数组生成成功, size={} bytes", bytes.length);
+            return bytes;
+        } catch (WriterException e) {
+            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("二维码输出失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码输出失败: " + e.getMessage(), e);
+        }
+    }
+}
@@ -0,0 +1,134 @@
+package cn.novalon.gym.manage.groupcourse.vo;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 团课视图对象（含教练昵称）
+ *
+ * @author 张翔
+ * @date 2026-07-19
+ */
+public class GroupCourseVO {
+
+    private Long id;
+    private String courseName;
+    private Long coachId;
+    private String coachName;
+    private Long courseType;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private LocalDateTime actualStartTime;
+    private LocalDateTime actualEndTime;
+    private Integer maxMembers;
+    private Integer currentMembers;
+    private Long status;
+    private String location;
+    private String coverImage;
+    private String description;
+    private BigDecimal storedValueAmount;
+    private String qrCodePath;
+    private String createBy;
+    private String updateBy;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    public GroupCourseVO() {}
+
+    /**
+     * 从领域对象和教练名称构建 VO
+     */
+    public static GroupCourseVO from(GroupCourse course, String coachName) {
+        GroupCourseVO vo = new GroupCourseVO();
+        vo.setId(course.getId());
+        vo.setCourseName(course.getCourseName());
+        vo.setCoachId(course.getCoachId());
+        vo.setCoachName(coachName);
+        vo.setCourseType(course.getCourseType());
+        vo.setStartTime(course.getStartTime());
+        vo.setEndTime(course.getEndTime());
+        vo.setActualStartTime(course.getActualStartTime());
+        vo.setActualEndTime(course.getActualEndTime());
+        vo.setMaxMembers(course.getMaxMembers());
+        vo.setCurrentMembers(course.getCurrentMembers());
+        vo.setStatus(course.getStatus());
+        vo.setLocation(course.getLocation());
+        vo.setCoverImage(course.getCoverImage());
+        vo.setDescription(course.getDescription());
+        vo.setStoredValueAmount(course.getStoredValueAmount());
+        vo.setQrCodePath(course.getQrCodePath());
+        vo.setCreateBy(course.getCreateBy());
+        vo.setUpdateBy(course.getUpdateBy());
+        vo.setCreatedAt(course.getCreatedAt());
+        vo.setUpdatedAt(course.getUpdatedAt());
+        return vo;
+    }
+
+    // -- getters / setters --
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+
+    public String getCourseName() { return courseName; }
+    public void setCourseName(String courseName) { this.courseName = courseName; }
+
+    public Long getCoachId() { return coachId; }
+    public void setCoachId(Long coachId) { this.coachId = coachId; }
+
+    public String getCoachName() { return coachName; }
+    public void setCoachName(String coachName) { this.coachName = coachName; }
+
+    public Long getCourseType() { return courseType; }
+    public void setCourseType(Long courseType) { this.courseType = courseType; }
+
+    public LocalDateTime getStartTime() { return startTime; }
+    public void setStartTime(LocalDateTime startTime) { this.startTime = startTime; }
+
+    public LocalDateTime getEndTime() { return endTime; }
+    public void setEndTime(LocalDateTime endTime) { this.endTime = endTime; }
+
+    public LocalDateTime getActualStartTime() { return actualStartTime; }
+    public void setActualStartTime(LocalDateTime actualStartTime) { this.actualStartTime = actualStartTime; }
+
+    public LocalDateTime getActualEndTime() { return actualEndTime; }
+    public void setActualEndTime(LocalDateTime actualEndTime) { this.actualEndTime = actualEndTime; }
+
+    public Integer getMaxMembers() { return maxMembers; }
+    public void setMaxMembers(Integer maxMembers) { this.maxMembers = maxMembers; }
+
+    public Integer getCurrentMembers() { return currentMembers; }
+    public void setCurrentMembers(Integer currentMembers) { this.currentMembers = currentMembers; }
+
+    public Long getStatus() { return status; }
+    public void setStatus(Long status) { this.status = status; }
+
+    public String getLocation() { return location; }
+    public void setLocation(String location) { this.location = location; }
+
+    public String getCoverImage() { return coverImage; }
+    public void setCoverImage(String coverImage) { this.coverImage = coverImage; }
+
+    public String getDescription() { return description; }
+    public void setDescription(String description) { this.description = description; }
+
+    public BigDecimal getStoredValueAmount() { return storedValueAmount; }
+    public void setStoredValueAmount(BigDecimal storedValueAmount) { this.storedValueAmount = storedValueAmount; }
+
+    public String getQrCodePath() { return qrCodePath; }
+    public void setQrCodePath(String qrCodePath) { this.qrCodePath = qrCodePath; }
+
+    public String getCreateBy() { return createBy; }
+    public void setCreateBy(String createBy) { this.createBy = createBy; }
+
+    public String getUpdateBy() { return updateBy; }
+    public void setUpdateBy(String updateBy) { this.updateBy = updateBy; }
+
+    public LocalDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
+
+    public LocalDateTime getUpdatedAt() { return updatedAt; }
+    public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
+}
@@ -1,13 +0,0 @@
-package cn.novalon.gym.manage.groupcourse;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class GymGroupCourseApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
@@ -0,0 +1,49 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * QRCodeUtil测试类
+ */
+class QRCodeUtilTest {
+
+    @Test
+    void testGenerateQrCodeBytes() {
+        String content = "测试二维码内容";
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(content);
+        
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "二维码字节数组应包含数据");
+        
+        System.out.println("生成的二维码字节大小: " + bytes.length + " bytes");
+    }
+
+    @Test
+    void testGenerateQrCodeBytesWithJsonContent() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-07-14T10:00:00\"}";
+        
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(jsonContent);
+        
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "二维码字节数组应包含数据");
+        
+        System.out.println("JSON内容二维码字节大小: " + bytes.length + " bytes");
+    }
+
+    @Test
+    void testGenerateQrCodeBytesWithLongContent() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 5; i++) {
+            sb.append("这是第").append(i).append("行测试数据\n");
+        }
+        
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(sb.toString());
+        
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "长内容二维码应正常生成");
+        
+        System.out.println("长内容二维码字节大小: " + bytes.length + " bytes");
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
liwentao	4c07ec5455	新增e2e测试脚本，修复部分问题	2026-07-22 20:00:13 +08:00
liwentao	53d1ce6fb2	更新会员端个人页面中团课签到记录显示	2026-07-20 17:27:22 +08:00
liwentao	4a4697c816	新增教练端，实现业务闭环：会员登录注册→查询团课→预约团课→扫码签到→教练端开课→记录实际开课时间→教练端结课→记录实际结课时间→后台查询数据	2026-07-20 17:21:28 +08:00
liwentao	df0e68469b	新增教练管理，优化预约人数计数方式	2026-07-19 19:02:10 +08:00
liwentao	97a5eff678	完善业务闭环，实现对轮播图的管理，优化数据库表文件	2026-07-18 16:21:40 +08:00
liwentao	feaf014b4a	补充缺失的文件	2026-07-17 16:37:59 +08:00
liwentao	ff899f491e	实现用户登录→查询团课→预约团课→扫码签到→后台查看数据闭环	2026-07-17 16:36:25 +08:00
liwentao	922c5850b5	补充缺失的文件	2026-07-17 15:57:05 +08:00
liwentao	2e7c2ced43	实现大部分页面前后端互通	2026-07-17 15:48:36 +08:00
liwentao	a9ccdab421	实现部分页面前后端相通	2026-07-16 17:29:27 +08:00
liwentao	7e45ecd144	重写会员端，初步完善首页	2026-07-15 17:26:07 +08:00
liwentao	cacc8997ec	移除流程中的支付相关和会员卡相关	2026-07-14 18:49:15 +08:00
liwentao	593f6f13e7	新增数据统计页面	2026-07-10 13:56:16 +08:00
liwentao	8ee326b43a	修补缺失文件	2026-07-09 15:34:50 +08:00
liwentao	8fb4e714d8	新增会员卡管理	2026-07-09 15:33:05 +08:00
liwentao	a8e69e0850	新增会员管理	2026-07-09 14:45:45 +08:00
liwentao	f5b5724e92	完善团课相关管理	2026-07-08 17:02:04 +08:00
liwentao	1e41f31271	更新后台管理系统，实现团课管理基础显示	2026-07-06 16:44:27 +08:00
liwentao	efd4d03037	修复多处问题	2026-06-29 02:56:13 +08:00
liwentao	80759f6793	修复一次支付发放两张会员卡的问题	2026-06-28 17:56:31 +08:00
liwentao	f8279129be	修复编译时错误	2026-06-28 16:42:24 +08:00
future	fc48db071e	完成一键登录和支付功能	2026-06-28 14:47:42 +08:00
future	35e7532f1b	解决bom字符	2026-06-25 01:22:33 +08:00
future	0d143be7b3	与dev重组登录	2026-06-25 01:12:42 +08:00
future	2ffd1aa7d6	修复项目构建	2026-06-24 23:08:53 +08:00
liwentao	581cc995c6	修复后端bug，更新测试数据	2026-06-24 07:27:44 +08:00
liwentao	2251f31524	新增支付宝连接沙箱模拟支付（暂不可用	2026-06-24 04:59:32 +08:00
futureandfujia	4481819eba	修复丢失文件	2026-06-24 00:46:47 +08:00
futureandfujia	79eb07599e	feat: 添加签到模块和数据库表结构 - 新增gym-checkIn签到模块 - 创建sign_in_record签到记录表(V13迁移脚本) - 添加签到相关路由配置 - 更新应用配置以支持签到模块 - 添加Redis密钥常量	2026-06-24 00:46:47 +08:00
futureandfujia	a7f31083cf	签到模块	2026-06-24 00:46:47 +08:00
futureandfujia	524182c478	修复项目构建	2026-06-24 00:46:47 +08:00
future	3586a7d74b	登录	2026-06-23 22:47:35 +08:00
liwentao	8da58a8f51	新增功能：团课签到前验证是否到店签到	2026-06-18 10:48:23 +08:00
liwentao	0b2146f237	新增团课扫码签到功能，文档已更新	2026-06-18 10:11:47 +08:00
liwentao	7cc9a68144	新增团课推荐功能	2026-06-15 16:43:12 +08:00
liwentao	b5c8a087dd	新增团课多条件查询	2026-06-15 14:09:19 +08:00
				`@@ -0,0 +1 @@`
				`{"code":404,"message":"No static resource files/30/preview.","timestamp":"2026-07-22T18:27:23.0606736"}`