修改主题色

# Conflicts:
#	gym-manage-uniapp/pages.json

gym-manage-api/docs/V10-booking-test-data.md

@@ -0,0 +1,272 @@
+# V10 团课预约业务场景测试数据
+
+## 概述
+
+本文档描述了 V10 版本新增的团课预约功能测试数据，覆盖了7种典型的预约业务场景，用于验证系统在不同会员卡状态下的正确处理逻辑。
+
+**当前日期**: 2026-06-02
+
+---
+
+## 一、测试场景总览
+
+| 场景 | 会员 | 会员卡状态 | 预约课程 | 预期结果 |
+|-----|------|----------|---------|---------|
+| 1 | 用户A | 无会员卡 | 次数卡团课 | 提示无可用会员卡 |
+| 2 | 用户B | 时长卡已过期 | 次数卡团课 | 提示会员卡已过期 |
+| 3 | 会员C | 时长卡有效 | 次数卡团课 | 预约成功 |
+| 4 | 会员D | 次数卡次数=0 | 次数卡团课 | 提示剩余次数不足 |
+| 5 | 会员E | 次数卡次数=5 | 次数卡团课 | 预约成功 |
+| 6 | 会员F | 储值卡余额=30元 | 储值卡团课(需50元) | 提示余额不足 |
+| 7 | 会员G | 储值卡余额=200元 | 储值卡团课(需50元) | 预约成功 |
+
+---
+
+## 二、测试会员数据
+
+### 2.1 会员列表
+
+| 会员编号 | 昵称 | 手机号 | 性别 | 创建时间 |
+|---------|------|--------|------|---------|
+| MEM_TEST_A | 用户A_无卡新用户 | 13800001001 | 男 | 2026-06-02 10:00:00 |
+| MEM_TEST_B | 用户B_过期时长卡 | 13800001002 | 男 | 2026-05-01 10:00:00 |
+| MEM_TEST_C | 会员C_有效时长卡 | 13800001003 | 女 | 2026-05-01 10:00:00 |
+| MEM_TEST_D | 会员D_次数用尽 | 13800001004 | 男 | 2026-05-01 10:00:00 |
+| MEM_TEST_E | 会员E_次数充足 | 13800001005 | 女 | 2026-05-01 10:00:00 |
+| MEM_TEST_F | 会员F_储值卡余额不足 | 13800001006 | 男 | 2026-05-01 10:00:00 |
+| MEM_TEST_G | 会员G_储值卡余额充足 | 13800001007 | 女 | 2026-05-01 10:00:00 |
+
+### 2.2 会员场景说明
+
+#### 场景1: 用户A - 无会员卡新用户
+- **会员编号**: MEM_TEST_A
+- **状态**: 2026-06-02 刚注册，尚未购买任何会员卡
+- **测试目标**: 验证无会员卡用户申请团课预约时的错误提示
+
+#### 场景2: 用户B - 时长卡已过期
+- **会员编号**: MEM_TEST_B
+- **状态**: 持有30天时长卡，于 2026-05-31 23:59:59 到期
+- **测试目标**: 验证会员卡过期后的预约行为
+
+#### 场景3: 会员C - 时长卡有效
+- **会员编号**: MEM_TEST_C
+- **状态**: 持有30天时长卡，到期时间 2026-07-02
+- **测试目标**: 验证有效期内的时长卡可以正常预约次数卡团课
+
+#### 场景4: 会员D - 次数卡耗尽
+- **会员编号**: MEM_TEST_D
+- **状态**: 持有10次卡，剩余次数 = 0
+- **测试目标**: 验证次数耗尽后无法预约团课
+
+#### 场景5: 会员E - 次数卡充足
+- **会员编号**: MEM_TEST_E
+- **状态**: 持有10次卡，剩余次数 = 5
+- **测试目标**: 验证次数充足时正常预约
+
+#### 场景6: 会员F - 储值卡余额不足
+- **会员编号**: MEM_TEST_F
+- **状态**: 持有储值卡，余额 = 30.00 元
+- **测试目标**: 验证预约储值卡团课（需50元）时提示余额不足
+
+#### 场景7: 会员G - 储值卡余额充足
+- **会员编号**: MEM_TEST_G
+- **状态**: 持有储值卡，余额 = 200.00 元
+- **测试目标**: 验证余额充足时正常预约储值卡团课
+
+---
+
+## 三、团课课程数据
+
+### 3.1 团课列表
+
+| 课程名称 | 教练ID | 课程类型 | 开始时间 | 结束时间 | 最大人数 | 当前人数 | 状态 | 点卡额度 | 储值额度 |
+|---------|-------|---------|---------|---------|---------|---------|------|---------|---------|
+| 燃脂搏击_次数卡课程 | 102 | 2 | 2026-06-10 19:30:00 | 2026-06-10 20:30:00 | 20 | 0 | 正常 | 1 | 0.00 |
+| 高端普拉提_储值卡课程 | 103 | 1 | 2026-06-11 19:00:00 | 2026-06-11 20:00:00 | 15 | 0 | 正常 | 0 | 50.00 |
+
+### 3.2 课程说明
+
+**燃脂搏击_次数卡课程**
+- **收费类型**: 次数卡
+- **消耗点数**: 1次
+- **适用会员**: 时长卡、次数卡用户
+- **课程描述**: 高强度间歇训练，配合音乐快速燃脂
+
+**高端普拉提_储值卡课程**
+- **收费类型**: 储值卡
+- **消耗金额**: 50.00 元
+- **适用会员**: 储值卡用户
+- **课程描述**: 精准训练核心肌群
+
+---
+
+## 四、会员卡类型数据
+
+| 卡名称 | 卡类型 | 价格 | 有效天数 | 总次数 | 面额 | 状态 |
+|-------|-------|------|---------|-------|------|------|
+| 30天时长卡 | TIME_CARD | 299.00 | 30 | - | - | 上架 |
+| 10次卡 | COUNT_CARD | 499.00 | - | 10 | - | 上架 |
+| 储值卡500 | STORED_VALUE_CARD | 500.00 | - | - | 500.00 | 上架 |
+
+---
+
+## 五、会员卡记录数据
+
+### 5.1 记录列表
+
+| 会员编号 | 卡名称 | 状态 | 剩余次数 | 剩余金额 | 过期时间 | 购买时间 |
+|---------|-------|------|---------|---------|---------|---------|
+| MEM_TEST_B | 30天时长卡 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 |
+| MEM_TEST_C | 30天时长卡 | ACTIVE | 0 | 0.00 | 2026-07-02 | 2026-06-02 |
+| MEM_TEST_D | 10次卡 | ACTIVE | 0 | 0.00 | 2026-12-31 | 2026-05-01 |
+| MEM_TEST_E | 10次卡 | ACTIVE | 5 | 0.00 | 2026-12-31 | 2026-05-01 |
+| MEM_TEST_F | 储值卡500 | ACTIVE | 0 | 30.00 | 2027-06-02 | 2026-05-01 |
+| MEM_TEST_G | 储值卡500 | ACTIVE | 0 | 200.00 | 2027-06-02 | 2026-05-01 |
+
+### 5.2 详细说明
+
+**用户B - 时长卡已过期**
+```
+会员ID: MEM_TEST_B
+卡名称: 30天时长卡
+状态: EXPIRED (已过期)
+有效期: 2026-05-01 至 2026-05-31
+剩余次数: 0
+剩余金额: 0.00
+```
+
+**会员C - 时长卡有效**
+```
+会员ID: MEM_TEST_C
+卡名称: 30天时长卡
+状态: ACTIVE (有效)
+有效期: 2026-06-02 至 2026-07-02
+剩余次数: 0
+剩余金额: 0.00
+```
+
+**会员D - 次数卡耗尽**
+```
+会员ID: MEM_TEST_D
+卡名称: 10次卡
+状态: ACTIVE (有效)
+有效期: 2026-05-01 至 2026-12-31
+剩余次数: 0 (已用尽)
+剩余金额: 0.00
+```
+
+**会员E - 次数卡充足**
+```
+会员ID: MEM_TEST_E
+卡名称: 10次卡
+状态: ACTIVE (有效)
+有效期: 2026-05-01 至 2026-12-31
+剩余次数: 5
+剩余金额: 0.00
+```
+
+**会员F - 储值卡余额不足**
+```
+会员ID: MEM_TEST_F
+卡名称: 储值卡500
+状态: ACTIVE (有效)
+有效期: 2026-05-01 至 2027-06-02
+剩余次数: 0
+剩余金额: 30.00 (不足50.00)
+```
+
+**会员G - 储值卡余额充足**
+```
+会员ID: MEM_TEST_G
+卡名称: 储值卡500
+状态: ACTIVE (有效)
+有效期: 2026-05-01 至 2027-06-02
+剩余次数: 0
+剩余金额: 200.00 (充足)
+```
+
+---
+
+## 六、SQL数据插入顺序
+
+```sql
+-- 1. 先插入会员用户 (A-G)
+INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES
+    ('MEM_TEST_A', '用户A_无卡新用户', '13800001001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'),
+    ('MEM_TEST_B', '用户B_过期时长卡', '13800001002', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_C', '会员C_有效时长卡', '13800001003', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_D', '会员D_次数用尽', '13800001004', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_E', '会员E_次数充足', '13800001005', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_F', '会员F_储值卡余额不足', '13800001006', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_G', '会员G_储值卡余额充足', '13800001007', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00');
+
+-- 2. 插入团课课程
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('燃脂搏击_次数卡课程', 102, 2, '2026-06-10 19:30:00', '2026-06-10 20:30:00', 20, 0, '0', '综合训练区', '高强度间歇训练，配合音乐快速燃脂，消耗1次', 1, 0.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
+
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('高端普拉提_储值卡课程', 103, 1, '2026-06-11 19:00:00', '2026-06-11 20:00:00', 15, 0, '0', '普拉提教室', '精准训练核心肌群，消耗储值50元', 0, 50.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
+
+-- 3. 插入会员卡类型
+INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) VALUES
+    ('30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
+    ('10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
+    ('储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00');
+
+-- 4. 插入会员卡记录
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_B'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'EXPIRED', 0, 0.00, '2026-05-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_C'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_D'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 0, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_E'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_F'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 30.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_G'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+```
+
+---
+
+## 七、预期测试结果
+
+### 7.1 成功场景
+
+| 场景 | 会员 | 操作 | 预期结果 |
+|-----|------|-----|---------|
+| 3 | 会员C | 预约次数卡团课 | 预约成功，消耗时长卡1次 |
+| 5 | 会员E | 预约次数卡团课 | 预约成功，次数减1 (5→4) |
+| 7 | 会员G | 预约储值卡团课 | 预约成功，余额减50 (200→150) |
+
+### 7.2 失败场景
+
+| 场景 | 会员 | 操作 | 预期错误码 | 预期提示信息 |
+|-----|------|-----|----------|------------|
+| 1 | 用户A | 预约次数卡团课 | NO_CARD | 无可用会员卡 |
+| 2 | 用户B | 预约次数卡团课 | CARD_EXPIRED | 会员卡已过期 |
+| 4 | 会员D | 预约次数卡团课 | INSUFFICIENT_TIMES | 剩余次数不足 |
+| 6 | 会员F | 预约储值卡团课 | INSUFFICIENT_BALANCE | 余额不足，当前余额30.00元，需50.00元 |
+
+---
+
+## 八、数据清理
+
+测试完成后，可通过以下 SQL 清理测试数据：
+
+```sql
+-- 删除测试会员（会级联删除相关会员卡记录）
+DELETE FROM member_user WHERE member_no LIKE 'MEM_TEST_%';
+
+-- 删除测试团课
+DELETE FROM group_course WHERE course_name LIKE '%_次数卡课程' OR course_name LIKE '%_储值卡课程';
+
+-- 删除测试会员卡类型
+DELETE FROM member_card WHERE member_card_name IN ('30天时长卡', '10次卡', '储值卡500');
+```

gym-manage-api/docs/V11-cancel-booking-test-data.md

@@ -0,0 +1,204 @@
+# V11 团课预约取消测试数据文档
+
+## 文档说明
+
+本文档描述了用于测试团课预约取消功能的测试数据，包含三种会员卡类型的取消预约场景。
+
+## 测试场景概览
+
+| 序号 | 场景描述 | 用户 | 会员卡类型 |
+| :--- | :--- | :--- | :--- |
+| 1 | 使用时长卡预约后取消 | 张三 | 时长卡（30天） |
+| 2 | 使用次数卡预约后取消 | 李四 | 次数卡（10次） |
+| 3 | 使用储值卡预约后取消 | 王五 | 储值卡（500元） |
+
+## 测试用户数据
+
+### 1. 张三（时长卡用户）
+
+| 字段 | 值 |
+| :--- | :--- |
+| 会员编号 | `MEM_TEST_ZHANG` |
+| 昵称 | 张三_时长卡用户 |
+| 手机号 | 13800002001 |
+| 性别 | 男（1） |
+
+#### 会员卡信息
+
+| 字段 | 值 |
+| :--- | :--- |
+| 卡类型 | 时长卡（TIME_CARD） |
+| 卡名称 | 30天时长卡 |
+| 状态 | ACTIVE（有效） |
+| 到期时间 | 2026-07-02 23:59:59 |
+| 购买时间 | 2026-06-02 10:00:00 |
+
+---
+
+### 2. 李四（次数卡用户）
+
+| 字段 | 值 |
+| :--- | :--- |
+| 会员编号 | `MEM_TEST_LI` |
+| 昵称 | 李四_次数卡用户 |
+| 手机号 | 13800002002 |
+| 性别 | 男（1） |
+
+#### 会员卡信息
+
+| 字段 | 值 |
+| :--- | :--- |
+| 卡类型 | 次数卡（COUNT_CARD） |
+| 卡名称 | 10次卡 |
+| 状态 | ACTIVE（有效） |
+| 剩余次数 | 5次 |
+| 到期时间 | 2026-12-31 23:59:59 |
+
+---
+
+### 3. 王五（储值卡用户）
+
+| 字段 | 值 |
+| :--- | :--- |
+| 会员编号 | `MEM_TEST_WANG` |
+| 昵称 | 王五_储值卡用户 |
+| 手机号 | 13800002003 |
+| 性别 | 女（2） |
+
+#### 会员卡信息
+
+| 字段 | 值 |
+| :--- | :--- |
+| 卡类型 | 储值卡（STORED_VALUE_CARD） |
+| 卡名称 | 储值卡500 |
+| 状态 | ACTIVE（有效） |
+| 剩余金额 | 200.00元 |
+| 到期时间 | 2027-06-02 23:59:59 |
+
+---
+
+## 测试课程数据
+
+### 晚间瑜伽_取消测试
+
+| 字段 | 值 |
+| :--- | :--- |
+| 课程名称 | 晚间瑜伽_取消测试 |
+| 教练ID | 101 |
+| 课程类型 | 1 |
+| 开始时间 | 2026-06-15 19:00:00 |
+| 结束时间 | 2026-06-15 20:00:00 |
+| 上课地点 | 瑜伽教室 |
+| 最大人数 | 20人 |
+| 当前人数 | 3人（三位测试用户） |
+| 状态 | 0（正常） |
+| 次数消耗 | 1次 |
+| 储值消耗 | 30.00元 |
+
+---
+
+## 预约记录数据
+
+### 预约状态说明
+
+| 状态码 | 含义 |
+| :--- | :--- |
+| `0` | 已预约（等待取消） |
+| `1` | 已取消 |
+| `2` | 已出席 |
+| `3` | 缺席 |
+
+### 预约记录详情
+
+| 用户 | 预约时间 | 状态 | 课程名称 |
+| :--- | :--- | :--- | :--- |
+| 张三 | 2026-06-02 11:00:00 | 0（已预约） | 晚间瑜伽_取消测试 |
+| 李四 | 2026-06-02 11:30:00 | 0（已预约） | 晚间瑜伽_取消测试 |
+| 王五 | 2026-06-02 12:00:00 | 0（已预约） | 晚间瑜伽_取消测试 |
+
+---
+
+## 测试用例设计
+
+### 场景1：时长卡用户取消预约
+
+**前置条件：**
+- 张三持有有效时长卡
+- 张三已成功预约课程
+- 当前时间 < 课程开始时间
+
+**测试步骤：**
+1. 调用取消预约接口，传入张三的预约记录ID
+2. 验证预约状态变为 `1`（已取消）
+3. 验证课程当前人数减1
+4. 验证时长卡状态保持不变（时长卡取消预约不影响卡状态）
+
+**预期结果：**
+- 预约记录状态更新为已取消
+- 课程剩余名额增加1
+- 时长卡有效期不受影响
+
+---
+
+### 场景2：次数卡用户取消预约
+
+**前置条件：**
+- 李四持有次数卡，剩余5次
+- 李四已成功预约课程（已扣除1次）
+- 当前时间 < 课程开始时间
+
+**测试步骤：**
+1. 调用取消预约接口，传入李四的预约记录ID
+2. 验证预约状态变为 `1`（已取消）
+3. 验证课程当前人数减1
+4. 验证次数卡剩余次数恢复为5次（返还1次）
+
+**预期结果：**
+- 预约记录状态更新为已取消
+- 课程剩余名额增加1
+- 次数卡返还1次，剩余次数恢复为5次
+
+---
+
+### 场景3：储值卡用户取消预约
+
+**前置条件：**
+- 王五持有储值卡，余额200元
+- 王五已成功预约课程（已扣除30元）
+- 当前时间 < 课程开始时间
+
+**测试步骤：**
+1. 调用取消预约接口，传入王五的预约记录ID
+2. 验证预约状态变为 `1`（已取消）
+3. 验证课程当前人数减1
+4. 验证储值卡余额恢复为200元（返还30元）
+
+**预期结果：**
+- 预约记录状态更新为已取消
+- 课程剩余名额增加1
+- 储值卡返还30元，余额恢复为200元
+
+---
+
+## 数据文件位置
+
+```
+manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql
+```
+
+## 数据依赖
+
+| 依赖文件 | 说明 |
+| :--- | :--- |
+| `V6__Create_GroupCourse_table.sql` | 团课相关表结构 |
+| `V8__Create_Member_And_MemberCard.sql` | 会员和会员卡表结构 |
+| `V9__Add_GroupCourse_Booking_Snapshot_Fields.sql` | 预约快照字段 |
+
+---
+
+## 注意事项
+
+1. 测试数据中使用的日期均为未来日期，确保测试时课程尚未开始
+2. 会员卡状态均为 ACTIVE，确保可以正常预约
+3. 取消预约功能应在课程开始前24小时内允许操作（具体时间限制由业务逻辑决定）
+4. 取消预约后应记录操作日志和交易流水

gym-manage-api/docs/booking-test-scenarios.md

@@ -0,0 +1,400 @@
+# 团课预约场景测试数据文档
+
+## 概述
+
+本文档描述了团课预约功能的测试数据，覆盖了各种预约场景，用于验证系统在不同业务条件下的正确性和健壮性。
+
+---
+
+## 一、测试数据概览
+
+| 数据类别 | 数量 | 说明 |
+|---------|------|------|
+| 测试会员 | 5个 | 覆盖不同会员卡状态 |
+| 会员卡类型 | 8种 | 次卡/时长卡/储值卡 |
+| 会员卡记录 | 5条 | 会员持有的实际卡 |
+| 团课预约记录 | 4条 | 不同状态的预约 |
+| 交易流水 | 27条 | 完整的消费记录 |
+
+---
+
+## 二、会员测试数据
+
+### 2.1 会员列表
+
+| 会员ID | 会员编号 | 昵称 | 手机号 | 性别 | 会员卡状态 |
+|--------|---------|------|--------|------|-----------|
+| 1001 | MEM202606001 | 新用户小张 | 13800138001 | 男 | 无会员卡 |
+| 1002 | MEM202606002 | 额度耗尽用户 | 13800138002 | 女 | 次卡已用完 |
+| 1003 | MEM202606003 | 额度充足用户 | 13800138003 | 男 | 次卡剩余8次 |
+| 1004 | MEM202606004 | 过期卡用户 | 13800138004 | 女 | 月卡已过期 |
+| 1005 | MEM202606005 | 多卡用户小李 | 13800138005 | 男 | 次卡+储值卡 |
+
+### 2.2 会员详情
+
+**会员1001 - 新用户小张**
+- 状态：新注册用户，尚未购买任何会员卡
+- 用途：测试无会员卡情况下的预约行为
+
+**会员1002 - 额度耗尽用户**
+- 状态：持有10次团课卡，已全部用完
+- 用途：测试会员卡额度耗尽时的预约行为
+
+**会员1003 - 额度充足用户**
+- 状态：持有20次团课卡，剩余8次
+- 用途：测试正常预约流程
+
+**会员1004 - 过期卡用户**
+- 状态：持有月卡，已于2026-05-31过期
+- 用途：测试过期会员卡的预约行为
+
+**会员1005 - 多卡用户小李**
+- 状态：持有50次团课卡(剩余45次) + 500元储值卡(剩余350元)
+- 用途：测试多会员卡用户选择支付方式的场景
+
+---
+
+## 三、会员卡类型数据
+
+### 3.1 次卡类型
+
+| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 总次数 | 状态 |
+|---------|-------|------|------|---------|-------|------|
+| 101 | 10次团课卡 | COUNT_CARD | 299.00 | 90 | 10 | 上架 |
+| 102 | 20次团课卡 | COUNT_CARD | 499.00 | 180 | 20 | 上架 |
+| 103 | 50次团课卡 | COUNT_CARD | 999.00 | 365 | 50 | 上架 |
+
+### 3.2 时长卡类型
+
+| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 状态 |
+|---------|-------|------|------|---------|------|
+| 201 | 月卡 | TIME_CARD | 399.00 | 30 | 上架 |
+| 202 | 季卡 | TIME_CARD | 899.00 | 90 | 上架 |
+| 203 | 年卡 | TIME_CARD | 2999.00 | 365 | 上架 |
+
+### 3.3 储值卡类型
+
+| 卡类型ID | 卡名称 | 类型 | 价格 | 面额 | 有效天数 | 状态 |
+|---------|-------|------|------|------|---------|------|
+| 301 | 500元储值卡 | STORED_VALUE_CARD | 500.00 | 500.00 | 365 | 上架 |
+| 302 | 1000元储值卡 | STORED_VALUE_CARD | 1000.00 | 1000.00 | 365 | 上架 |
+
+---
+
+## 四、会员卡记录数据（会员持有的卡）
+
+| 记录ID | 会员ID | 卡类型ID | 状态 | 剩余次数 | 剩余金额 | 到期时间 | 购买时间 |
+|-------|--------|---------|------|---------|---------|---------|---------|
+| 2001 | 1002 | 101 | USED_UP | 0 | 0.00 | 2026-09-01 | 2026-06-01 |
+| 2002 | 1003 | 102 | ACTIVE | 8 | 0.00 | 2026-12-01 | 2026-06-01 |
+| 2003 | 1004 | 201 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 |
+| 2004 | 1005 | 103 | ACTIVE | 45 | 0.00 | 2027-06-01 | 2026-06-01 |
+| 2005 | 1005 | 301 | ACTIVE | 0 | 350.00 | 2027-06-01 | 2026-05-15 |
+
+---
+
+## 五、团课预约记录数据
+
+| 预约ID | 课程ID | 会员ID | 会员卡记录ID | 预约时间 | 状态 | 课程名称 |
+|-------|-------|--------|-------------|---------|------|---------|
+| 3001 | 1 | 1003 | 2002 | 2026-06-01 15:30 | 已预约(0) | 极速燃脂单车 |
+| 3002 | 2 | 1003 | 2002 | 2026-06-01 10:00 | 已取消(1) | 清晨流瑜伽 |
+| 3003 | 6 | 1003 | 2002 | 2026-05-28 19:00 | 已出席(2) | 蜜桃臀塑造 |
+| 3004 | 7 | 1002 | 2001 | 2026-05-30 10:00 | 缺席(3) | 午间冥想放松 |
+
+### 状态说明
+
+| 状态码 | 状态名称 | 说明 |
+|-------|---------|------|
+| 0 | 已预约 | 用户已成功预约，等待上课 |
+| 1 | 已取消 | 用户主动取消预约 |
+| 2 | 已出席 | 用户已按时参加课程 |
+| 3 | 缺席 | 用户预约后未出席 |
+
+---
+
+## 六、测试场景详解
+
+### 场景1：新注册用户无会员卡预约
+
+**测试目标**：验证系统对无会员卡用户的预约拦截
+
+**测试数据**：
+- 用户ID：1001（新用户小张）
+- 目标课程：任意课程
+
+**预期结果**：
+- 返回错误信息："未绑定会员卡，请先购买会员卡"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景2：会员卡额度耗尽预约
+
+**测试目标**：验证系统对额度耗尽会员卡的预约拦截
+
+**测试数据**：
+- 用户ID：1002（额度耗尽用户）
+- 会员卡记录ID：2001
+- 剩余次数：0
+
+**预期结果**：
+- 返回错误信息："会员卡余额不足"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景3：会员卡额度充足预约
+
+**测试目标**：验证正常预约流程
+
+**测试数据**：
+- 用户ID：1003（额度充足用户）
+- 会员卡记录ID：2002
+- 剩余次数：8
+- 目标课程：课程ID=1（极速燃脂单车）
+
+**预期结果**：
+- 预约成功
+- 会员卡剩余次数减1（变为7次）
+- 生成预约记录
+- HTTP状态码：200 OK
+
+---
+
+### 场景4：会员卡已过期预约
+
+**测试目标**：验证系统对过期会员卡的预约拦截
+
+**测试数据**：
+- 用户ID：1004（过期卡用户）
+- 会员卡记录ID：2003
+- 状态：EXPIRED
+- 到期时间：2026-05-31
+
+**预期结果**：
+- 返回错误信息："会员卡已过期"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景5：课程已满员预约---------------
+
+**测试目标**：验证系统对满员课程的预约拦截
+
+**测试数据**：
+- 课程ID：3（燃脂搏击）
+- 当前人数：20/20
+
+**预期结果**：
+- 返回错误信息："课程已满员"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景6：课程已取消预约
+
+**测试目标**：验证系统对已取消课程的预约拦截
+
+**测试数据**：
+- 课程ID：5（周末冥想修复）
+- 状态：1（已取消）
+
+**预期结果**：
+- 返回错误信息："课程已取消"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景7：课程已结束预约
+
+**测试目标**：验证系统对已结束课程的预约拦截
+
+**测试数据**：
+- 课程ID：6（蜜桃臀塑造）或 7（午间冥想放松）
+- 状态：2（已结束）
+
+**预期结果**：
+- 返回错误信息："课程已结束"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景8：超出预约时间预约
+
+**测试目标**：验证系统对预约时间窗口的控制
+
+**测试数据**：
+- 课程ID：4（哈他瑜伽）
+- 开始时间：2026-06-01 15:20:00
+- 测试时间：课程开始前30分钟内
+
+**预期结果**：
+- 返回错误信息："已过预约时间"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景9：重复预约同一课程
+
+**测试目标**：验证系统对重复预约的拦截
+
+**测试数据**：
+- 用户ID：1003（额度充足用户）
+- 课程ID：1（极速燃脂单车）
+- 已有预约记录：booking_id=3001
+
+**预期结果**：
+- 返回错误信息："已预约该课程"
+- HTTP状态码：400 Bad Request
+
+---
+
+### 场景10：多会员卡用户选择支付方式
+
+**测试目标**：验证多卡用户的支付方式选择功能
+
+**测试数据**：
+- 用户ID：1005（多卡用户小李）
+- 可用卡1：次卡（记录ID=2004，剩余45次）
+- 可用卡2：储值卡（记录ID=2005，剩余350元）
+
+**预期结果**：
+- 系统列出用户所有可用会员卡
+- 用户可选择使用次卡或储值卡支付
+- 根据选择的卡类型扣减相应额度
+
+---
+
+## 七、交易流水说明
+
+### 7.1 会员1002（额度耗尽用户）消费记录
+
+| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 |
+|---------|---------|---------|---------|------|
+| 1 | PURCHASE | +10 | 10 | 购买10次团课卡 |
+| 2-11 | DEDUCT | -1×10 | 0 | 10次课程消费 |
+
+### 7.2 会员1003（额度充足用户）消费记录
+
+| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 |
+|---------|---------|---------|---------|------|
+| 1 | PURCHASE | +20 | 20 | 购买20次团课卡 |
+| 2-12 | DEDUCT | -12 | 8 | 12次课程消费 |
+
+### 7.3 会员1005（多卡用户）消费记录
+
+| 会员卡记录ID | 操作类型 | 变动次数 | 变动金额 | 备注 |
+|-------------|---------|---------|---------|------|
+| 2004 | PURCHASE | +50 | 0 | 购买50次团课卡 |
+| 2004 | DEDUCT | -5 | 0 | 预约5节课程 |
+| 2005 | PURCHASE | 0 | +500 | 购买500元储值卡 |
+| 2005 | DEDUCT | 0 | -150 | 私教课消费150元 |
+
+---
+
+## 八、API测试示例
+
+### 8.1 预约接口
+
+```http
+POST /api/group-course/bookings
+Content-Type: application/json
+
+{
+  "courseId": 1,
+  "memberCardRecordId": 2002
+}
+```
+
+### 8.2 取消预约接口
+
+```http
+PUT /api/group-course/bookings/{bookingId}/cancel
+Content-Type: application/json
+
+{
+  "reason": "临时有事无法参加"
+}
+```
+
+### 8.3 查询用户预约列表
+
+```http
+GET /api/group-course/bookings?memberId=1003
+```
+
+---
+
+## 九、测试数据对应关系图
+
+```
+会员表 (member_user)
+    │
+    ├── 1001 ──→ (无会员卡)
+    ├── 1002 ──→ 会员卡记录 2001 (USED_UP)
+    ├── 1003 ──→ 会员卡记录 2002 (ACTIVE, 8次)
+    ├── 1004 ──→ 会员卡记录 2003 (EXPIRED)
+    └── 1005 ──→ 会员卡记录 2004 (ACTIVE, 45次)
+              └── 会员卡记录 2005 (ACTIVE, 350元)
+                          │
+                          ↓
+                  预约记录表 (group_course_booking)
+                          │
+                          ├── 3001: 已预约
+                          ├── 3002: 已取消
+                          ├── 3003: 已出席
+                          └── 3004: 缺席
+```
+
+---
+
+## 十、数据初始化
+
+测试数据通过 Flyway 迁移脚本 `V10__Insert_Booking_Test_Data.sql` 初始化，需在数据库初始化时执行。
+
+**执行顺序**：
+1. V1__Create_all_tables.sql - 创建基础表结构
+2. V2__Insert_initial_data.sql - 插入初始数据
+3. V6__Create_GroupCourse_table.sql - 创建团课表
+4. V7__Insert_GroupCourse_test_data.sql - 插入团课测试数据
+5. V8__Create_Member_And_MemberCard.sql - 创建会员和会员卡表
+6. V9__Add_GroupCourse_Booking_Snapshot_Fields.sql - 添加冗余字段
+7. V10__Insert_Booking_Test_Data.sql - 插入预约测试数据（本文件）
+
+---
+
+**文档版本**: v1.1  
+**创建时间**: 2026-06-02  
+**更新时间**: 2026-06-02  
+**适用场景**: 团课预约功能测试
+
+---
+
+## 十一、重要说明
+
+### 11.1 字段说明
+
+`member_card_record` 表包含两个ID字段：
+- `id` - 数据库主键（BIGSERIAL PRIMARY KEY）
+- `member_card_record_id` - 业务ID（BIGSERIAL），代码中使用此字段作为查询和更新条件
+
+### 11.2 测试数据修复记录
+
+**v1.1 修复内容**：
+- 修复了 `member_card_record` 表测试数据缺失 `member_card_record_id` 字段的问题
+- 原问题：测试数据只插入了 `id` 字段，导致 `member_card_record_id` 为 NULL
+- 影响：代码使用 `member_card_record_id` 作为WHERE条件时无法匹配到记录，导致扣减权益失败
+- 解决：在INSERT语句中添加 `member_card_record_id` 字段，值与 `id` 相同
+
+**修复前**：
+```sql
+INSERT INTO member_card_record (id, member_id, member_card_id, ...) VALUES
+(2001, 1002, 101, ...);
+```
+
+**修复后**：
+```sql
+INSERT INTO member_card_record (id, member_card_record_id, member_id, member_card_id, ...) VALUES
+(2001, 2001, 1002, 101, ...);
+```

gym-manage-api/docs/groupcourse-api.md

@@ -0,0 +1,728 @@
+# 团课管理模块 API 文档
+
+> **文档版本**: v1.0  
+> **创建日期**: 2026-06-02  
+> **作者**: 张翔  
+> **状态**: 正式发布  
+
+---
+
+## 📋 目录
+
+1. [概述](#概述)
+2. [基础路径](#基础路径)
+3. [团课管理接口](#团课管理接口)
+   - [获取所有团课](#获取所有团课)
+   - [分页获取团课](#分页获取团课)
+   - [根据ID获取团课详情](#根据ID获取团课详情)
+   - [创建团课](#创建团课)
+   - [更新团课](#更新团课)
+   - [取消团课](#取消团课)
+   - [团课签到](#团课签到)
+   - [删除团课](#删除团课)
+4. [团课预约接口](#团课预约接口)
+   - [预约团课](#预约团课)
+   - [取消预约](#取消预约)
+   - [查询会员预约记录](#查询会员预约记录)
+   - [查询预约详情](#查询预约详情)
+   - [查询课程预约记录](#查询课程预约记录)
+5. [数据模型](#数据模型)
+   - [GroupCourse（团课）](#GroupCourse团课)
+   - [GroupCourseBooking（团课预约）](#GroupCourseBooking团课预约)
+6. [状态码说明](#状态码说明)
+7. [业务规则](#业务规则)
+
+---
+
+## 概述
+
+团课管理模块提供团课的创建、编辑、查询、取消和签到功能，以及团课预约相关操作。采用 Spring WebFlux 响应式编程，支持高并发场景。
+
+## 基础路径
+
+所有接口的基础路径为: `http://{host}:{port}/api/groupCourse`
+
+---
+
+## 团课管理接口
+
+### 获取所有团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/list` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**请求参数**:
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| includeDeleted | boolean | 否 | false | 是否包含已删除的团课 |
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 1,
+    "courseName": "瑜伽入门",
+    "coachId": 1,
+    "courseType": 1,
+    "startTime": "2026-06-02T09:00:00",
+    "endTime": "2026-06-02T10:00:00",
+    "maxMembers": 20,
+    "currentMembers": 15,
+    "status": 0,
+    "location": "健身房A区",
+    "coverImage": "https://example.com/yoga.jpg",
+    "description": "适合初学者的瑜伽课程",
+    "createdAt": "2026-06-01T10:00:00",
+    "updatedAt": "2026-06-01T10:00:00"
+  }
+]
+```
+
+---
+
+### 分页获取团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/page` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**请求体**:
+
+```json
+{
+  "page": 0,
+  "size": 10,
+  "sort": "id",
+  "order": "asc",
+  "keyword": "瑜伽"
+}
+```
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| page | int | 否 | 0 | 页码，从0开始 |
+| size | int | 否 | 10 | 每页数量，最大100 |
+| sort | string | 否 | id | 排序字段 |
+| order | string | 否 | asc | 排序方式（asc/desc） |
+| keyword | string | 否 | - | 搜索关键词 |
+
+**请求参数**:
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| includeDeleted | boolean | 否 | false | 是否包含已删除的团课 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "data": [...],
+  "totalPages": 5,
+  "totalElements": 45,
+  "page": 0,
+  "size": 10
+}
+```
+
+---
+
+### 根据ID获取团课详情
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/{id}` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "id": 1,
+  "courseName": "瑜伽入门",
+  "coachId": 1,
+  "courseType": 1,
+  "startTime": "2026-06-02T09:00:00",
+  "endTime": "2026-06-02T10:00:00",
+  "maxMembers": 20,
+  "currentMembers": 15,
+  "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"
+}
+```
+
+**失败响应** (404 Not Found):
+
+```json
+{}
+```
+
+---
+
+### 创建团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**请求体**:
+
+```json
+{
+  "courseName": "动感单车",
+  "coachId": 2,
+  "courseType": 2,
+  "startTime": "2026-06-05T18:00:00",
+  "endTime": "2026-06-05T19:00:00",
+  "maxMembers": 25,
+  "location": "健身房B区",
+  "coverImage": "https://example.com/spinning.jpg",
+  "description": "高强度有氧运动课程",
+  "pointCardAmount": 1,
+  "storedValueAmount": 50.00
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseName | String | **是** | 课程名称 |
+| coachId | Long | 否 | 教练ID |
+| courseType | Long | 否 | 课程类型 |
+| startTime | LocalDateTime | 否 | 开始时间 |
+| endTime | LocalDateTime | 否 | 结束时间 |
+| maxMembers | Integer | 否 | 最大参与人数，默认20 |
+| location | String | 否 | 上课地点 |
+| coverImage | String | 否 | 封面图URL |
+| description | String | 否 | 课程描述 |
+| pointCardAmount | Integer | 否 | 点卡额度（消耗次数），默认1 |
+| storedValueAmount | BigDecimal | 否 | 储值卡额度（消耗金额），默认0 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课创建成功",
+  "data": {
+    "id": 2,
+    "courseName": "动感单车",
+    "coachId": 2,
+    "courseType": 2,
+    "startTime": "2026-06-05T18:00:00",
+    "endTime": "2026-06-05T19:00:00",
+    "maxMembers": 25,
+    "currentMembers": 0,
+    "status": 0,
+    "location": "健身房B区",
+    "coverImage": "https://example.com/spinning.jpg",
+    "description": "高强度有氧运动课程",
+    "pointCardAmount": 1,
+    "storedValueAmount": 50.00
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "课程名称不能为空"
+}
+```
+
+---
+
+### 更新团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | PUT |
+| **接口路径** | `/api/groupCourse/{id}` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课ID |
+
+**请求体**:
+
+```json
+{
+  "courseName": "动感单车升级版",
+  "coachId": 2,
+  "maxMembers": 30,
+  "description": "升级版高强度有氧运动课程",
+  "pointCardAmount": 2,
+  "storedValueAmount": 80.00
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseName | String | 否 | 课程名称 |
+| coachId | Long | 否 | 教练ID |
+| courseType | Long | 否 | 课程类型 |
+| startTime | LocalDateTime | 否 | 开始时间 |
+| endTime | LocalDateTime | 否 | 结束时间 |
+| maxMembers | Integer | 否 | 最大参与人数 |
+| location | String | 否 | 上课地点 |
+| coverImage | String | 否 | 封面图URL |
+| description | String | 否 | 课程描述 |
+| pointCardAmount | Integer | 否 | 点卡额度（消耗次数） |
+| storedValueAmount | BigDecimal | 否 | 储值卡额度（消耗金额） |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课更新成功",
+  "data": {
+    "id": 2,
+    "courseName": "动感单车升级版",
+    "coachId": 2,
+    "maxMembers": 30,
+    "description": "升级版高强度有氧运动课程",
+    "pointCardAmount": 2,
+    "storedValueAmount": 80.00
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课不存在"
+}
+```
+
+---
+
+### 取消团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/{id}/cancel` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课取消成功",
+  "data": {
+    "id": 2,
+    "status": 1
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "课程取消需提前24小时"
+}
+```
+
+---
+
+### 团课签到
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/{courseId}/signin` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseId | Long | 是 | 团课ID |
+
+**请求体**:
+
+```json
+{
+  "memberId": 1001
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| memberId | Long | **是** | 会员ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "签到成功",
+  "data": {
+    "id": 2,
+    "currentMembers": 16
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "课程已满员"
+}
+```
+
+---
+
+### 删除团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | DELETE |
+| **接口路径** | `/api/groupCourse/{id}` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课删除成功"
+}
+```
+
+---
+
+## 团课预约接口
+
+### 预约团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/book` |
+| **所属文件** | `GroupCourseBookingHandler.java` |
+
+**请求体**:
+
+```json
+{
+  "courseId": 1,
+  "memberId": 1001,
+  "memberCardRecordId": 5001
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseId | Long | **是** | 团课ID |
+| memberId | Long | **是** | 会员ID |
+| memberCardRecordId | Long | **是** | 会员卡记录ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "预约成功",
+  "data": {
+    "id": 100,
+    "courseId": 1,
+    "memberId": 1001,
+    "memberCardRecordId": 5001,
+    "bookingTime": "2026-06-02T08:00:00",
+    "status": "0"
+  }
+}
+```
+
+---
+
+### 取消预约
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/booking/{bookingId}/cancel` |
+| **所属文件** | `GroupCourseBookingHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| bookingId | Long | 是 | 预约ID |
+
+**请求体**:
+
+```json
+{
+  "memberId": 1001
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| memberId | Long | **是** | 会员ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "取消成功",
+  "data": {
+    "id": 100,
+    "status": "1",
+    "cancelTime": "2026-06-02T09:00:00"
+  }
+}
+```
+
+---
+
+### 查询会员预约记录
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/bookings/member/{memberId}` |
+| **所属文件** | `GroupCourseBookingHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| memberId | Long | 是 | 会员ID |
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 100,
+    "courseId": 1,
+    "courseName": "瑜伽入门",
+    "memberId": 1001,
+    "memberCardRecordId": 5001,
+    "bookingTime": "2026-06-02T08:00:00",
+    "status": "0",
+    "courseStartTime": "2026-06-02T09:00:00",
+    "location": "健身房A区"
+  }
+]
+```
+
+---
+
+### 查询预约详情
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/bookings/{bookingId}` |
+| **所属文件** | `GroupCourseBookingHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| bookingId | Long | 是 | 预约ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "id": 100,
+  "courseId": 1,
+  "courseName": "瑜伽入门",
+  "memberId": 1001,
+  "memberCardRecordId": 5001,
+  "bookingTime": "2026-06-02T08:00:00",
+  "status": "0",
+  "courseStartTime": "2026-06-02T09:00:00",
+  "courseEndTime": "2026-06-02T10:00:00",
+  "location": "健身房A区"
+}
+```
+
+**失败响应** (404 Not Found):
+
+```json
+{}
+```
+
+---
+
+### 查询课程预约记录
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/bookings/course/{courseId}` |
+| **所属文件** | `GroupCourseBookingHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseId | Long | 是 | 团课ID |
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 100,
+    "courseId": 1,
+    "courseName": "瑜伽入门",
+    "memberId": 1001,
+    "bookingTime": "2026-06-02T08:00:00",
+    "status": "0"
+  }
+]
+```
+
+---
+
+## 数据模型
+
+### GroupCourse（团课）
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | Long | 主键ID |
+| courseName | String | 课程名称 |
+| coachId | Long | 教练ID |
+| courseType | Long | 课程类型 |
+| startTime | LocalDateTime | 开始时间 |
+| endTime | LocalDateTime | 结束时间 |
+| maxMembers | Integer | 最大参与人数 |
+| currentMembers | Integer | 当前参与人数 |
+| status | Long | 状态（0-正常，1-已取消，2-已结束） |
+| location | String | 上课地点 |
+| coverImage | String | 封面图URL |
+| description | String | 课程描述 |
+| pointCardAmount | Integer | 点卡额度（消耗次数），默认1 |
+| storedValueAmount | BigDecimal | 储值卡额度（消耗金额），默认0 |
+| createdBy | String | 创建人 |
+| updatedBy | String | 更新人 |
+| createdAt | LocalDateTime | 创建时间 |
+| updatedAt | LocalDateTime | 更新时间 |
+| deletedAt | LocalDateTime | 删除时间（软删除） |
+
+### GroupCourseBooking（团课预约）
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | Long | 主键ID |
+| courseId | Long | 团课ID |
+| courseName | String | 团课名称 |
+| memberId | Long | 会员ID |
+| memberCardRecordId | Long | 会员卡记录ID |
+| bookingTime | LocalDateTime | 预约时间 |
+| status | String | 状态（0-已预约，1-已取消，2-已出席，3-缺席） |
+| cancelTime | LocalDateTime | 取消时间 |
+| courseStartTime | LocalDateTime | 课程开始时间 |
+| courseEndTime | LocalDateTime | 课程结束时间 |
+| location | String | 上课地点 |
+| createdBy | String | 创建人 |
+| updatedBy | String | 更新人 |
+| createdAt | LocalDateTime | 创建时间 |
+| updatedAt | LocalDateTime | 更新时间 |
+| deletedAt | LocalDateTime | 删除时间（软删除） |
+
+---
+
+## 状态码说明
+
+### 团课状态
+
+| 状态码 | 含义 |
+|--------|------|
+| 0 | 正常 |
+| 1 | 已取消 |
+| 2 | 已结束 |
+
+### 预约状态
+
+| 状态码 | 含义 |
+|--------|------|
+| 0 | 已预约 |
+| 1 | 已取消 |
+| 2 | 已出席 |
+| 3 | 缺席 |
+
+---
+
+## 业务规则
+
+### 团课管理
+1. **创建团课**：课程名称为必填项
+2. **取消团课**：需提前24小时通知，否则拒绝操作
+3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制
+4. **删除团课**：采用软删除机制，数据保留可恢复
+
+### 团课预约
+1. **预约团课**：需验证会员卡有效性和课程名额
+2. **取消预约**：需在课程开始前至少2小时取消
+
+---
+
+## 附录：错误响应格式
+
+所有接口的错误响应统一格式：
+
+```json
+{
+  "success": false,
+  "message": "错误描述信息"
+}
+```
+
+---
+
+*文档结束*

gym-manage-api/gym-groupCourse/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip

gym-manage-api/gym-groupCourse/pom.xml

@@ -0,0 +1,95 @@
+<?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 https://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>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <groupId>cn.novalon.gym.manage</groupId>
+    <artifactId>gym-groupCourse</artifactId>
+    <version>1.0.0</version>
+    <name>gym-groupCourse</name>
+    <description>Group Course Management Module</description>
+    <url/>
+    <licenses>
+        <license/>
+    </licenses>
+    <developers>
+        <developer/>
+    </developers>
+    <scm>
+        <connection/>
+        <developerConnection/>
+        <tag/>
+        <url/>
+    </scm>
+    <properties>
+        <java.version>21</java.version>
+    </properties>
+    <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>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</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-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
+            <version>2.2.43</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+<!--        Redis依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        
+        <!-- 会员模块依赖 -->
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java

@@ -0,0 +1,127 @@
+
+package cn.novalon.gym.manage.groupcourse.converter;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 团课相关转换器
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Component
+@Slf4j
+public class GroupCourseConverter {
+
+    /**
+     * 将团课实体转换为领域模型
+     */
+    public GroupCourse toDomain(GroupCourseEntity entity){
+        if(entity == null){
+            return null;
+        }
+        GroupCourse groupCourse = new GroupCourse();
+        BeanUtil.copyProperties(entity,groupCourse);
+        log.info("转换bean，entity-domain：",groupCourse);
+        return groupCourse;
+    }
+
+    /**
+     * 将团课领域模型转换为实体
+     */
+    public GroupCourseEntity toEntity(GroupCourse domain){
+        if(domain == null){
+            return null;
+        }
+        GroupCourseEntity entity = new GroupCourseEntity();
+        BeanUtil.copyProperties(domain,entity);
+        log.info("转换bean，domain-entity：",entity);
+        return entity;
+    }
+
+    /**
+     * 将团课实体列表转换为领域模型列表
+     */
+    public List<GroupCourse> toDomainList(List<GroupCourseEntity> entities){
+        if (entities == null) {
+            return null;
+        }
+        return entities.stream()
+                .map(this::toDomain)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 将团课领域模型列表转换为实体列表
+     */
+    public List<GroupCourseEntity> toEntityList(List<GroupCourse> domains){
+        if (domains == null) {
+            return null;
+        }
+        return domains.stream()
+                .map(this::toEntity)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 将团课预约实体转换为领域模型
+     */
+    public GroupCourseBooking toBookingDomain(GroupCourseBookingEntity entity){
+        if(entity == null){
+            return null;
+        }
+        GroupCourseBooking booking = new GroupCourseBooking();
+        BeanUtil.copyProperties(entity, booking);
+        log.debug("转换预约记录实体到领域模型：bookingId={}", entity.getId());
+        return booking;
+    }
+
+    /**
+     * 将团课预约领域模型转换为实体
+     */
+    public GroupCourseBookingEntity toBookingEntity(GroupCourseBooking domain){
+        if(domain == null){
+            return null;
+        }
+        GroupCourseBookingEntity entity = new GroupCourseBookingEntity();
+        BeanUtil.copyProperties(domain, entity);
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        log.debug("转换预约记录领域模型到实体：bookingId={}", domain.getId());
+        return entity;
+    }
+
+    /**
+     * 将团课预约实体列表转换为领域模型列表
+     */
+    public List<GroupCourseBooking> toBookingDomainList(List<GroupCourseBookingEntity> entities){
+        if (entities == null) {
+            return null;
+        }
+        return entities.stream()
+                .map(this::toBookingDomain)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 将团课预约领域模型列表转换为实体列表
+     */
+    public List<GroupCourseBookingEntity> toBookingEntityList(List<GroupCourseBooking> domains){
+        if (domains == null) {
+            return null;
+        }
+        return domains.stream()
+                .map(this::toBookingEntity)
+                .collect(Collectors.toList());
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java

@@ -0,0 +1,111 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 团课预约记录DAO接口
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Repository
+public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookingEntity, Long> {
+
+    /**
+     * 根据ID查询未删除的预约记录
+     */
+    Mono<GroupCourseBookingEntity> findByIdIsAndDeletedAtIsNull(Long id);
+
+    /**
+     * 根据会员ID查询所有预约记录
+     */
+    Flux<GroupCourseBookingEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
+
+    /**
+     * 根据会员ID查询所有预约记录（带排序）
+     */
+    Flux<GroupCourseBookingEntity> findByMemberIdAndDeletedAtIsNull(Long memberId, Sort sort);
+
+    /**
+     * 根据团课ID查询所有预约记录
+     */
+    Flux<GroupCourseBookingEntity> findByCourseIdAndDeletedAtIsNull(Long courseId);
+
+    /**
+     * 根据团课ID和会员ID查询预约记录
+     */
+    Mono<GroupCourseBookingEntity> findByCourseIdAndMemberIdAndDeletedAtIsNull(Long courseId, Long memberId);
+
+    /**
+     * 根据团课ID和状态查询预约记录
+     */
+    Flux<GroupCourseBookingEntity> findByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
+
+    /**
+     * 查询会员在指定课程的有效预约（状态为已预约且未取消）
+     */
+    Mono<GroupCourseBookingEntity> findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(Long courseId, Long memberId, String status);
+
+    /**
+     * 根据会员卡记录ID查询预约记录
+     */
+    Flux<GroupCourseBookingEntity> findByMemberCardRecordIdAndDeletedAtIsNull(Long memberCardRecordId);
+
+    /**
+     * 统计团课已预约人数
+     */
+    Mono<Long> countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
+
+    /**
+     * 查询会员是否有时间冲突的预约（状态为已预约且未取消）
+     * 时间冲突条件：新课程的开始时间 < 已预约课程的结束时间 且 新课程的结束时间 > 已预约课程的开始时间
+     */
+    @org.springframework.data.r2dbc.repository.Query("SELECT * FROM group_course_booking b " +
+            "JOIN group_course c ON b.course_id = c.id " +
+            "WHERE b.member_id = :memberId " +
+            "AND b.status = '0' " +
+            "AND b.deleted_at IS NULL " +
+            "AND c.deleted_at IS NULL " +
+            "AND :newStartTime < c.end_time " +
+            "AND :newEndTime > c.start_time")
+    Flux<GroupCourseBookingEntity> findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime);
+
+    /**
+     * 更新预约状态
+     */
+    @org.springframework.data.r2dbc.repository.Modifying
+    @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET status = :status, cancel_time = :cancelTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateStatus(Long id, String status, java.time.LocalDateTime cancelTime, java.time.LocalDateTime updatedAt);
+
+    /**
+     * 软删除预约记录
+     */
+    @org.springframework.data.r2dbc.repository.Modifying
+    @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET deleted_at = :deletedAt WHERE id = :id")
+    Mono<Integer> softDelete(Long id, java.time.LocalDateTime deletedAt);
+
+    /**
+     * 查询已开始课程但未到场会员的预约记录
+     * 条件：课程开始时间早于当前时间，预约状态为已预约(0)
+     */
+    @org.springframework.data.r2dbc.repository.Query("SELECT b.* FROM group_course_booking b " +
+            "JOIN group_course c ON b.course_id = c.id " +
+            "WHERE b.status = '0' " +
+            "AND b.deleted_at IS NULL " +
+            "AND c.deleted_at IS NULL " +
+            "AND c.status = '0' " +
+            "AND c.start_time < CURRENT_TIMESTAMP")
+    Flux<GroupCourseBookingEntity> findAbsentMembers();
+
+    /**
+     * 批量更新预约状态为缺席
+     */
+    @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);
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java

@@ -0,0 +1,39 @@
+
+package cn.novalon.gym.manage.groupcourse.dao;
+
+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.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long> {
+
+    Mono<GroupCourseEntity> findByIdIsAndDeletedAtIsNull(Long id);
+
+    Flux<GroupCourseEntity> findAll();
+
+    Flux<GroupCourseEntity> findAll(Sort sort);
+
+    Flux<GroupCourseEntity> findAllByDeletedAtIsNull();
+
+    Flux<GroupCourseEntity> findAllByDeletedAtIsNull(Sort sort);
+
+    @Modifying
+    @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);
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java

@@ -0,0 +1,166 @@
+
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+public class GroupCourse extends BaseDomain{
+
+    //课程名称
+    @Schema(description = "团课名", example = "Push-up")
+    private String courseName;
+
+    //教练id
+    @Schema(description = "教练id", example = "1")
+    private Long coachId;
+
+    //课程类型
+    @Schema(description = "课程类型", example = "1")
+    private Long courseType;
+
+    //开始时间
+    @Schema(description = "开始时间", example = "2026-01-01")
+    private LocalDateTime startTime;
+
+    //结束时间
+    @Schema(description = "结束时间", example = "2026-01-02")
+    private LocalDateTime endTime;
+
+    //最大参与人数
+    @Schema(description = "最大参与人数", example = "20")
+    private Integer maxMembers;
+
+    //当前参与人数
+    @Schema(description = "当前参与人数", example = "2")
+    private Integer currentMembers;
+
+    //课程状态：0-正常，1-已取消，2-已结束
+    @Schema(description = "课程状态", example = "0")
+    private Long status;
+
+    //上课地点
+    @Schema(description = "上课地点", example = "龙泉驿区幸福路")
+    private String location;
+
+    //封面图URL
+    @Schema(description = "封面图URL", example = "https://12345.com")
+    private String coverImage;
+
+    //课程描述
+    @Schema(description = "课程描述", example = "从入门到入土")
+    private String description;
+
+    //点卡额度（消耗次数）
+    @Schema(description = "点卡额度（消耗次数）", example = "1")
+    private Integer pointCardAmount;
+
+    //储值卡额度（消耗金额）
+    @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
+    private java.math.BigDecimal storedValueAmount;
+
+    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 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 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 Integer getPointCardAmount() {
+        return pointCardAmount;
+    }
+
+    public void setPointCardAmount(Integer pointCardAmount) {
+        this.pointCardAmount = pointCardAmount;
+    }
+
+    public java.math.BigDecimal getStoredValueAmount() {
+        return storedValueAmount;
+    }
+
+    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
+        this.storedValueAmount = storedValueAmount;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java

@@ -0,0 +1,135 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+/**
+ * 团课预约记录领域模型
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+public class GroupCourseBooking extends BaseDomain {
+
+    //团课ID
+    @Schema(description = "团课ID", example = "1")
+    private Long courseId;
+
+    //团课名称（关联查询）
+    @Schema(description = "团课名称", example = "瑜伽入门")
+    private String courseName;
+
+    //会员ID
+    @Schema(description = "会员ID", example = "1")
+    private Long memberId;
+
+    //会员卡记录ID
+    @Schema(description = "会员卡记录ID", example = "1")
+    private Long memberCardRecordId;
+
+    //预约时间
+    @Schema(description = "预约时间", example = "2026-06-01 10:00:00")
+    private LocalDateTime bookingTime;
+
+    //状态：0-已预约，1-已取消，2-已出席，3-缺席
+    @Schema(description = "状态：0-已预约，1-已取消，2-已出席，3-缺席", example = "0")
+    private String status;
+
+    //取消时间
+    @Schema(description = "取消时间", example = "2026-06-01 11:00:00")
+    private LocalDateTime cancelTime;
+
+    //课程开始时间
+    @Schema(description = "课程开始时间", example = "2026-06-02 09:00:00")
+    private LocalDateTime courseStartTime;
+
+    //课程结束时间
+    @Schema(description = "课程结束时间", example = "2026-06-02 10:00:00")
+    private LocalDateTime courseEndTime;
+
+    //上课地点
+    @Schema(description = "上课地点", example = "健身房A区")
+    private String location;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberCardRecordId() {
+        return memberCardRecordId;
+    }
+
+    public void setMemberCardRecordId(Long memberCardRecordId) {
+        this.memberCardRecordId = memberCardRecordId;
+    }
+
+    public LocalDateTime getBookingTime() {
+        return bookingTime;
+    }
+
+    public void setBookingTime(LocalDateTime bookingTime) {
+        this.bookingTime = bookingTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public LocalDateTime getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(LocalDateTime cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public LocalDateTime getCourseStartTime() {
+        return courseStartTime;
+    }
+
+    public void setCourseStartTime(LocalDateTime courseStartTime) {
+        this.courseStartTime = courseStartTime;
+    }
+
+    public LocalDateTime getCourseEndTime() {
+        return courseEndTime;
+    }
+
+    public void setCourseEndTime(LocalDateTime courseEndTime) {
+        this.courseEndTime = courseEndTime;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java

@@ -0,0 +1,137 @@
+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;
+
+/**
+ * 团课预约记录实体类 - 对应 group_course_booking 表
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Table("group_course_booking")
+public class GroupCourseBookingEntity extends BaseEntity {
+
+    //团课ID
+    @Column("course_id")
+    private Long courseId;
+
+    //会员ID
+    @Column("member_id")
+    private Long memberId;
+
+    //会员卡记录ID
+    @Column("member_card_id")
+    private Long memberCardRecordId;
+
+    //预约时间
+    @Column("booking_time")
+    private LocalDateTime bookingTime;
+
+    //状态：0-已预约，1-已取消，2-已出席，3-缺席
+    @Column("status")
+    private String status;
+
+    //取消时间
+    @Column("cancel_time")
+    private LocalDateTime cancelTime;
+
+    //课程名称（冗余字段，保存预约时的课程快照）
+    @Column("course_name")
+    private String courseName;
+
+    //课程开始时间（冗余字段，保存预约时的课程快照）
+    @Column("course_start_time")
+    private LocalDateTime courseStartTime;
+
+    //课程结束时间（冗余字段，保存预约时的课程快照）
+    @Column("course_end_time")
+    private LocalDateTime courseEndTime;
+
+    //上课地点（冗余字段，保存预约时的课程快照）
+    @Column("location")
+    private String location;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getMemberCardRecordId() {
+        return memberCardRecordId;
+    }
+
+    public void setMemberCardRecordId(Long memberCardRecordId) {
+        this.memberCardRecordId = memberCardRecordId;
+    }
+
+    public LocalDateTime getBookingTime() {
+        return bookingTime;
+    }
+
+    public void setBookingTime(LocalDateTime bookingTime) {
+        this.bookingTime = bookingTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public LocalDateTime getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(LocalDateTime cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public LocalDateTime getCourseStartTime() {
+        return courseStartTime;
+    }
+
+    public void setCourseStartTime(LocalDateTime courseStartTime) {
+        this.courseStartTime = courseStartTime;
+    }
+
+    public LocalDateTime getCourseEndTime() {
+        return courseEndTime;
+    }
+
+    public void setCourseEndTime(LocalDateTime courseEndTime) {
+        this.courseEndTime = courseEndTime;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java

@@ -0,0 +1,168 @@
+
+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")
+public class GroupCourseEntity extends BaseEntity {
+
+    //课程名称
+    @Column("course_name")
+    private String courseName;
+
+    //教练id
+    @Column("coach_id")
+    private Long coachId;
+
+    //课程类型
+    @Column("course_type")
+    private Long courseType;
+
+    //开始时间
+    @Column("start_time")
+    private LocalDateTime startTime;
+
+    //结束时间
+    @Column("end_time")
+    private LocalDateTime endTime;
+
+    //最大参与人数
+    @Column("max_members")
+    private Integer maxMembers;
+
+    //当前参与人数
+    @Column("current_members")
+    private Integer currentMembers;
+
+    //课程状态：0-正常，1-已取消，2-已结束
+    @Column("status")
+    private Long status;
+
+    //上课地点
+    @Column("location")
+    private String location;
+
+    //封面图URL
+    @Column("cover_image")
+    private String coverImage;
+
+    //课程描述
+    @Column("description")
+    private String description;
+
+    //点卡额度（消耗次数）
+    @Column("point_card_amount")
+    private Integer pointCardAmount;
+
+    //储值卡额度（消耗金额）
+    @Column("stored_value_amount")
+    private java.math.BigDecimal storedValueAmount;
+
+    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 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 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 Integer getPointCardAmount() {
+        return pointCardAmount;
+    }
+
+    public void setPointCardAmount(Integer pointCardAmount) {
+        this.pointCardAmount = pointCardAmount;
+    }
+
+    public java.math.BigDecimal getStoredValueAmount() {
+        return storedValueAmount;
+    }
+
+    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
+        this.storedValueAmount = storedValueAmount;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseEvent.java

@@ -0,0 +1,24 @@
+package cn.novalon.gym.manage.groupcourse.enums;
+
+/**
+ * 团课状态机事件枚举
+ * 
+ * @author 张翔
+ * @date 2026-06-02
+ */
+public enum CourseEvent {
+    
+    CANCEL("取消课程"),
+    END("结束课程"),
+    START("开始课程");
+
+    private final String desc;
+
+    CourseEvent(String desc) {
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseStatus.java

@@ -0,0 +1,43 @@
+package cn.novalon.gym.manage.groupcourse.enums;
+
+/**
+ * 团课状态枚举
+ * 
+ * @author 张翔
+ * @date 2026-06-02
+ */
+public enum CourseStatus {
+    
+    NORMAL(0L, "正常"),
+    CANCELLED(1L, "已取消"),
+    ENDED(2L, "已结束"),
+    IN_PROGRESS(3L, "进行中");
+
+    private final Long value;
+    private final String desc;
+
+    CourseStatus(Long value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Long getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 根据值获取枚举
+     */
+    public static CourseStatus fromValue(Long value) {
+        for (CourseStatus status : values()) {
+            if (status.value.equals(value)) {
+                return status;
+            }
+        }
+        return NORMAL;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEvent.java

@@ -0,0 +1,57 @@
+package cn.novalon.gym.manage.groupcourse.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 预约提醒事件
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+public class BookingReminderEvent extends ApplicationEvent {
+
+    /**
+     * 消息类型枚举
+     */
+    public enum ReminderType {
+        BOOKING_SUCCESS,  // 预约成功
+        COURSE_REMINDER,  // 课程即将开始提醒
+        BOOKING_CANCEL    // 预约取消
+    }
+
+    private final Long bookingId;
+    private final Long memberId;
+    private final String courseName;
+    private final String courseTime;
+    private final ReminderType type;
+
+    public BookingReminderEvent(Object source, Long bookingId, Long memberId, 
+                                String courseName, String courseTime, ReminderType type) {
+        super(source);
+        this.bookingId = bookingId;
+        this.memberId = memberId;
+        this.courseName = courseName;
+        this.courseTime = courseTime;
+        this.type = type;
+    }
+
+    public Long getBookingId() {
+        return bookingId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public String getCourseTime() {
+        return courseTime;
+    }
+
+    public ReminderType getType() {
+        return type;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventListener.java

@@ -0,0 +1,98 @@
+package cn.novalon.gym.manage.groupcourse.event;
+
+import cn.novalon.gym.manage.groupcourse.event.BookingReminderEvent.ReminderType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 预约提醒事件监听器
+ * 
+ * 监听预约相关事件，处理提醒业务
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Component
+public class BookingReminderEventListener {
+
+    private static final Logger logger = LoggerFactory.getLogger(BookingReminderEventListener.class);
+
+    /**
+     * 处理预约提醒事件
+     * 
+     * @param event 预约提醒事件
+     */
+    @EventListener
+    public void handleBookingReminderEvent(BookingReminderEvent event) {
+        logger.info("收到预约提醒事件：type={}, bookingId={}, memberId={}", 
+                event.getType(), event.getBookingId(), event.getMemberId());
+        
+        try {
+            processReminderEvent(event);
+        } catch (Exception e) {
+            logger.error("处理预约提醒事件失败：bookingId={}, error={}", 
+                    event.getBookingId(), e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 处理提醒事件
+     * 
+     * 根据事件类型执行不同的提醒逻辑
+     */
+    private void processReminderEvent(BookingReminderEvent event) {
+        switch (event.getType()) {
+            case BOOKING_SUCCESS:
+                handleBookingSuccess(event);
+                break;
+            case COURSE_REMINDER:
+                handleCourseReminder(event);
+                break;
+            case BOOKING_CANCEL:
+                handleBookingCancel(event);
+                break;
+            default:
+                logger.warn("未知的提醒事件类型：{}", event.getType());
+        }
+        
+        logger.info("预约提醒事件处理完成：bookingId={}", event.getBookingId());
+    }
+
+    /**
+     * 处理预约成功事件
+     */
+    private void handleBookingSuccess(BookingReminderEvent event) {
+        logger.info("处理预约成功提醒：会员ID={}, 课程={}, 时间={}", 
+                event.getMemberId(), event.getCourseName(), event.getCourseTime());
+        
+        // 实际业务中会调用通知服务发送短信、APP推送等
+        // sendNotification(event.getMemberId(), "预约成功", 
+        //     "您已成功预约课程：" + event.getCourseName() + "，时间：" + event.getCourseTime());
+    }
+
+    /**
+     * 处理课程即将开始提醒事件
+     */
+    private void handleCourseReminder(BookingReminderEvent event) {
+        logger.info("处理课程提醒：会员ID={}, 课程={}, 时间={}", 
+                event.getMemberId(), event.getCourseName(), event.getCourseTime());
+        
+        // 实际业务中会调用通知服务发送课程开始前提醒
+        // sendNotification(event.getMemberId(), "课程提醒", 
+        //     "您预约的课程" + event.getCourseName() + "即将开始，时间：" + event.getCourseTime());
+    }
+
+    /**
+     * 处理预约取消事件
+     */
+    private void handleBookingCancel(BookingReminderEvent event) {
+        logger.info("处理预约取消提醒：会员ID={}, 课程={}", 
+                event.getMemberId(), event.getCourseName());
+        
+        // 实际业务中会调用通知服务发送预约取消通知
+        // sendNotification(event.getMemberId(), "预约取消", 
+        //     "您已取消课程：" + event.getCourseName() + "的预约");
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventPublisher.java

@@ -0,0 +1,74 @@
+package cn.novalon.gym.manage.groupcourse.event;
+
+import cn.novalon.gym.manage.groupcourse.event.BookingReminderEvent.ReminderType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+
+/**
+ * 预约提醒事件发布器
+ * 
+ * 使用Spring事件机制发布预约相关事件
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Component
+public class BookingReminderEventPublisher {
+
+    private static final Logger logger = LoggerFactory.getLogger(BookingReminderEventPublisher.class);
+
+    private final ApplicationEventPublisher eventPublisher;
+
+    public BookingReminderEventPublisher(ApplicationEventPublisher eventPublisher) {
+        this.eventPublisher = eventPublisher;
+    }
+
+    /**
+     * 发布预约成功事件
+     * 
+     * @param bookingId 预约ID
+     * @param memberId 会员ID
+     * @param courseName 课程名称
+     * @param courseTime 课程时间
+     */
+    public void publishBookingSuccessEvent(Long bookingId, Long memberId, String courseName, String courseTime) {
+        BookingReminderEvent event = new BookingReminderEvent(
+                this, bookingId, memberId, courseName, courseTime, ReminderType.BOOKING_SUCCESS);
+        
+        logger.info("发布预约成功事件：bookingId={}, memberId={}", bookingId, memberId);
+        eventPublisher.publishEvent(event);
+    }
+
+    /**
+     * 发布课程即将开始提醒事件
+     * 
+     * @param bookingId 预约ID
+     * @param memberId 会员ID
+     * @param courseName 课程名称
+     * @param courseTime 课程时间
+     */
+    public void publishCourseReminderEvent(Long bookingId, Long memberId, String courseName, String courseTime) {
+        BookingReminderEvent event = new BookingReminderEvent(
+                this, bookingId, memberId, courseName, courseTime, ReminderType.COURSE_REMINDER);
+        
+        logger.info("发布课程提醒事件：bookingId={}, memberId={}", bookingId, memberId);
+        eventPublisher.publishEvent(event);
+    }
+
+    /**
+     * 发布预约取消事件
+     * 
+     * @param bookingId 预约ID
+     * @param memberId 会员ID
+     * @param courseName 课程名称
+     */
+    public void publishBookingCancelEvent(Long bookingId, Long memberId, String courseName) {
+        BookingReminderEvent event = new BookingReminderEvent(
+                this, bookingId, memberId, courseName, null, ReminderType.BOOKING_CANCEL);
+        
+        logger.info("发布预约取消事件：bookingId={}, memberId={}", bookingId, memberId);
+        eventPublisher.publishEvent(event);
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java

@@ -0,0 +1,369 @@
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 预约 Saga 处理器
+ *
+ * 实现预约和取消预约的分布式事务处理
+ *
+ * @author 张翔
+ * @date 2026-06-02
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class BookingSagaHandler {
+
+    private final IGroupCourseBookingRepository bookingRepository;
+    private final IGroupCourseRepository courseRepository;
+    private final IMemberCardRecordService memberCardRecordService;
+    private final MemberCardRepository memberCardRepository;
+    private final GroupCourseRedisService redisService;
+
+    private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0;
+
+    /**
+     * 执行预约事务
+     *
+     * 步骤：
+     * 1. 保存预约记录
+     * 2. 扣减会员卡权益
+     * 3. 更新课程当前人数
+     */
+    public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId) {
+        List<SagaStep> steps = new ArrayList<>();
+        List<SagaStep> rollbackSteps = new ArrayList<>();
+
+        // 步骤1：保存预约记录
+        SagaStep step1 = new SagaStep(
+                "保存预约记录",
+                saveBooking(booking),
+                Mono.defer(() -> deleteBooking(booking.getId()))
+        );
+        steps.add(step1);
+        rollbackSteps.add(0, step1);
+
+        // 步骤2：扣减会员卡权益（根据卡类型决定扣除次数还是金额）
+        SagaStep step2 = new SagaStep(
+                "扣减会员卡权益",
+                deductCardUsageByCardType(booking.getMemberId(), recordId),
+                Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId))
+        );
+        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));
+    }
+
+    /**
+     * 根据会员卡类型扣减权益
+     */
+    private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId) {
+        return memberCardRecordService.findById(recordId)
+                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
+                .flatMap(record -> {
+                    // 验证会员卡归属
+                    if (!record.getMemberId().equals(memberId)) {
+                        return Mono.error(new RuntimeException("会员卡不归属当前用户"));
+                    }
+
+                    return memberCardRepository.findById(record.getMemberCardId())
+                            .flatMap(card -> {
+                                MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
+
+                                switch (cardType) {
+                                    case COUNT_CARD:
+                                        // 次卡扣除次数
+                                        return deductCardUsage(recordId, 1, 0.0);
+                                    case STORED_VALUE_CARD:
+                                        // 储值卡扣除金额
+                                        return deductCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
+                                    case TIME_CARD:
+                                        // 时长卡不扣除，但需验证有效期
+                                        return validateTimeCard(record);
+                                    default:
+                                        return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
+                                }
+                            });
+                });
+    }
+
+    /**
+     * 验证时长卡有效期
+     * 
+     * @param record 会员卡记录
+     * @return 验证通过返回Mono.empty()，否则返回Mono.error()
+     */
+    private Mono<Void> validateTimeCard(MemberCardRecord 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() : "未知")));
+        }
+        
+        // 验证有效期
+        java.time.LocalDateTime expireTime = record.getExpireTime();
+        if (expireTime == null) {
+            return Mono.error(new RuntimeException("会员卡有效期未设置"));
+        }
+        if (expireTime.isBefore(java.time.LocalDateTime.now())) {
+            return Mono.error(new RuntimeException("会员卡已过期，有效期至: " + expireTime));
+        }
+        
+        log.debug("时长卡验证通过: recordId={}, expireTime={}", record.getId(), expireTime);
+        return Mono.empty();
+    }
+
+    /**
+     * 根据会员卡类型恢复权益
+     */
+    private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId) {
+        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("会员卡不归属当前用户"));
+                    }
+
+                    return memberCardRepository.findById(record.getMemberCardId())
+                            .flatMap(card -> {
+                                MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
+
+                                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();
+                                    default:
+                                        return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
+                                }
+                            });
+                });
+    }
+
+    /**
+     * 执行取消预约事务
+     */
+    public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId) {
+        List<SagaStep> steps = new ArrayList<>();
+        List<SagaStep> rollbackSteps = new ArrayList<>();
+
+        // 步骤1：更新预约状态为已取消
+        SagaStep step1 = new SagaStep(
+                "更新预约状态为已取消",
+                updateBookingStatus(bookingId, "1"),
+                Mono.defer(() -> updateBookingStatus(bookingId, "0"))
+        );
+        steps.add(step1);
+        rollbackSteps.add(0, step1);
+
+        // 步骤2：恢复会员卡权益
+        SagaStep step2 = new SagaStep(
+                "恢复会员卡权益",
+                restoreCardUsageByCardType(memberId, recordId),
+                Mono.defer(() -> deductCardUsageByCardType(memberId, recordId))
+        );
+        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));
+    }
+
+    private Mono<Void> updateBookingStatus(Long bookingId, String status) {
+        return bookingRepository.updateStatus(bookingId, status)
+                .flatMap(rows -> {
+                    if (rows == 0) {
+                        return Mono.error(new RuntimeException("更新预约状态失败"));
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    private Mono<Void> saveBooking(GroupCourseBooking booking) {
+        return bookingRepository.save(booking)
+                .flatMap(saved -> {
+                    if (saved.getId() == null) {
+                        return Mono.error(new RuntimeException("保存预约记录失败"));
+                    }
+                    booking.setId(saved.getId());
+                    return Mono.empty();
+                });
+    }
+
+    private Mono<Void> deleteBooking(Long bookingId) {
+        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() : "未知")));
+                    }
+                    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();
+                            });
+                });
+    }
+
+    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> 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);
+    }
+
+    private Mono<Void> executeStep(List<SagaStep> steps, int index, List<SagaStep> completedSteps) {
+        if (index >= steps.size()) {
+            return Mono.empty();
+        }
+
+        SagaStep currentStep = steps.get(index);
+
+        return currentStep.operation()
+                .doOnSuccess(unused -> completedSteps.add(currentStep))
+                .then(Mono.defer(() -> executeStep(steps, index + 1, completedSteps)))
+                .onErrorResume(error -> {
+                    log.error("Saga步骤执行失败: step={}, error={}", currentStep.description(), error.getMessage());
+                    return rollbackCompletedSteps(completedSteps).then(Mono.error(error));
+                });
+    }
+
+    private Mono<Void> rollbackCompletedSteps(List<SagaStep> completedSteps) {
+        if (completedSteps.isEmpty()) {
+            return Mono.empty();
+        }
+        
+        // 反转已完成的步骤，按逆序回滚
+        List<SagaStep> reversed = new ArrayList<>(completedSteps);
+        Collections.reverse(reversed);
+        
+        return rollbackSteps(reversed, 0);
+    }
+
+    private Mono<Void> rollbackSteps(List<SagaStep> rollbackSteps, int index) {
+        if (index >= rollbackSteps.size()) {
+            return Mono.empty();
+        }
+
+        SagaStep currentStep = rollbackSteps.get(index);
+
+        return currentStep.rollbackOperation()
+                .then(Mono.defer(() -> rollbackSteps(rollbackSteps, index + 1)))
+                .doOnError(error -> log.error("Saga回滚失败: step={}, error={}", currentStep.description(), error.getMessage()))
+                .onErrorResume(e -> Mono.empty());
+    }
+
+    private record SagaStep(String description, Mono<Void> operation, Mono<Void> rollbackOperation) {}
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java

@@ -0,0 +1,141 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
+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;
+
+/**
+ * 团课预约Handler
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Component
+@Tag(name = "团课预约", description = "团课预约相关操作")
+public class GroupCourseBookingHandler {
+
+    private final IGroupCourseBookingService bookingService;
+
+    public GroupCourseBookingHandler(IGroupCourseBookingService bookingService) {
+        this.bookingService = bookingService;
+    }
+
+    /**
+     * 预约团课
+     */
+    @Operation(summary = "预约团课", description = "会员预约指定团课")
+    public Mono<ServerResponse> bookCourse(ServerRequest request) {
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    // 验证必填参数
+                    if (body.get("courseId") == null) {
+                        return buildErrorResponse("请提供课程ID");
+                    }
+                    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();
+
+                    return bookingService.bookCourse(courseId, memberId, memberCardRecordId)
+                            .flatMap(booking -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "预约成功");
+                                response.put("data", booking);
+                                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> cancelBooking(ServerRequest request) {
+        Long bookingId = Long.valueOf(request.pathVariable("bookingId"));
+
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    Long memberId = ((Number) body.get("memberId")).longValue();
+
+                    return bookingService.cancelBooking(bookingId, memberId)
+                            .flatMap(booking -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "取消成功");
+                                response.put("data", booking);
+                                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 = "根据会员ID查询所有预约记录")
+    public Mono<ServerResponse> getBookingsByMemberId(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+
+        return ServerResponse.ok()
+                .body(bookingService.getBookingsByMemberId(memberId), GroupCourseBooking.class);
+    }
+
+    /**
+     * 查询预约详情
+     */
+    @Operation(summary = "查询预约详情", description = "根据预约ID查询预约详情")
+    public Mono<ServerResponse> getBookingById(ServerRequest request) {
+        Long bookingId = Long.valueOf(request.pathVariable("bookingId"));
+
+        return bookingService.getBookingById(bookingId)
+                .flatMap(booking -> ServerResponse.ok().bodyValue(booking))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    /**
+     * 查询课程预约记录
+     */
+    @Operation(summary = "查询课程预约记录", description = "根据团课ID查询所有预约记录")
+    public Mono<ServerResponse> getBookingsByCourseId(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+
+        return ServerResponse.ok()
+                .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class);
+    }
+
+    /**
+     * 构建错误响应
+     */
+    private Mono<ServerResponse> buildErrorResponse(String message) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("success", false);
+        response.put("message", message);
+        return ServerResponse.badRequest().bodyValue(response);
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java

@@ -0,0 +1,261 @@
+
+package cn.novalon.gym.manage.groupcourse.handler;
+
+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.service.IGroupCourseService;
+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.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 GroupCourseHandler {
+    private final IGroupCourseService groupCourseService;
+    private final Validator validator;
+    private final RedisUtil redisUtil;
+    private final ObjectMapper objectMapper;
+    
+    public GroupCourseHandler(IGroupCourseService groupCourseService, 
+                              Validator validator,
+                              RedisUtil redisUtil,
+                              ObjectMapper objectMapper){
+        this.groupCourseService = groupCourseService;
+        this.validator = validator;
+        this.redisUtil = redisUtil;
+        this.objectMapper = objectMapper;
+    }
+
+    @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);
+    }
+
+    @Operation(summary = "分页获取团课", description = "根据分页参数获取团课列表")
+    public Mono<ServerResponse> getGroupCoursesByPage(ServerRequest request) {
+        return request.bodyToMono(PageRequest.class)
+                .flatMap(pageRequest -> {
+                    boolean includeDeleted = request.queryParam("includeDeleted")
+                            .map(Boolean::parseBoolean)
+                            .orElse(false);
+                    
+                    if (pageRequest.getPage() < 0) {
+                        pageRequest.setPage(0);
+                    }
+                    if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
+                        pageRequest.setSize(10);
+                    }
+                    if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
+                        pageRequest.setSort("id");
+                    }
+                    if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
+                        pageRequest.setOrder("asc");
+                    }
+
+                    return groupCourseService.findByPage(pageRequest, includeDeleted)
+                            .flatMap(response -> ServerResponse.ok().bodyValue(response));
+                });
+    }
+
+    @Operation(summary = "根据ID获取团课", description = "根据ID获取团课详情")
+    public Mono<ServerResponse> getGroupCourseById(ServerRequest request){
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return groupCourseService.findById(id)
+                .flatMap(course -> ServerResponse.ok().bodyValue(course))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "创建团课", description = "创建新的团课")
+    public Mono<ServerResponse> createGroupCourse(ServerRequest request) {
+        return request.bodyToMono(GroupCourse.class)
+                .flatMap(groupCourse -> {
+                    if (groupCourse.getCourseName() == null || groupCourse.getCourseName().isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "课程名称不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    return groupCourseService.create(groupCourse)
+                            .flatMap(course -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课创建成功");
+                                response.put("data", course);
+                                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> updateGroupCourse(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return request.bodyToMono(GroupCourse.class)
+                .flatMap(groupCourse -> {
+                    return groupCourseService.update(id, groupCourse)
+                            .flatMap(course -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课更新成功");
+                                response.put("data", course);
+                                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 = "取消指定团课（需提前24小时）")
+    public Mono<ServerResponse> cancelGroupCourse(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return groupCourseService.cancel(id)
+                .flatMap(course -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课取消成功");
+                    response.put("data", course);
+                    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> signIn(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    if (body == null || body.isEmpty()) {
+                        Map<String, Object> response = new HashMap<>();
+                        response.put("success", false);
+                        response.put("message", "请求体不能为空");
+                        return ServerResponse.badRequest().bodyValue(response);
+                    }
+                    
+                    Object memberIdObj = body.get("memberId");
+                    if (memberIdObj == null) {
+                        Map<String, Object> response = new HashMap<>();
+                        response.put("success", false);
+                        response.put("message", "memberId不能为空");
+                        return ServerResponse.badRequest().bodyValue(response);
+                    }
+                    
+                    Long memberId = ((Number) memberIdObj).longValue();
+                    
+                    return groupCourseService.signIn(courseId, memberId)
+                            .flatMap(course -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "签到成功");
+                                response.put("data", course);
+                                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> deleteGroupCourse(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return groupCourseService.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 = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据")
+    public Mono<ServerResponse> getCacheByKey(ServerRequest request) {
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String key = (String) body.get("key");
+                    
+                    if (key == null || key.isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "key参数不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    return redisUtil.get(key)
+                            .map(cachedValue -> {
+                                Map<String, Object> result = new HashMap<>();
+                                if (cachedValue != null) {
+                                    result.put("success", true);
+                                    result.put("key", key);
+                                    result.put("value", cachedValue);
+                                    result.put("message", "缓存命中");
+                                    
+                                    try {
+                                        if (cachedValue instanceof String) {
+                                            Object jsonObject = objectMapper.readValue((String) cachedValue, Object.class);
+                                            result.put("parsedValue", jsonObject);
+                                            result.put("valueType", "JSON字符串");
+                                        } else {
+                                            result.put("valueType", cachedValue.getClass().getSimpleName());
+                                        }
+                                    } catch (Exception e) {
+                                        result.put("parsedValue", null);
+                                        result.put("valueType", "无法解析");
+                                    }
+                                } else {
+                                    result.put("success", false);
+                                    result.put("key", key);
+                                    result.put("value", null);
+                                    result.put("message", "缓存未命中");
+                                }
+                                
+                                return result;
+                            })
+                            .flatMap(result -> ServerResponse.ok().bodyValue(result))
+                            .onErrorResume(error -> {
+                                Map<String, Object> errorResponse = new HashMap<>();
+                                errorResponse.put("success", false);
+                                errorResponse.put("message", "请求处理失败: " + error.getMessage());
+                                return ServerResponse.status(500).bodyValue(errorResponse);
+                            });
+                });
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseStateMachine.java

@@ -0,0 +1,139 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.enums.CourseEvent;
+import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 团课状态机处理器
+ * 
+ * 管理团课的状态转换逻辑
+ * 
+ * @author 张翔
+ * @date 2026-06-02
+ */
+@Slf4j
+@Component
+public class GroupCourseStateMachine {
+
+    private final Map<CourseStatus, Map<CourseEvent, CourseStatus>> stateTransitionMap;
+
+    public GroupCourseStateMachine() {
+        this.stateTransitionMap = buildStateTransitionMap();
+    }
+
+    private Map<CourseStatus, Map<CourseEvent, CourseStatus>> buildStateTransitionMap() {
+        Map<CourseStatus, Map<CourseEvent, CourseStatus>> map = new HashMap<>();
+
+        // NORMAL 状态可以转换的事件
+        Map<CourseEvent, CourseStatus> normalTransitions = new HashMap<>();
+        normalTransitions.put(CourseEvent.CANCEL, CourseStatus.CANCELLED);
+        normalTransitions.put(CourseEvent.END, CourseStatus.ENDED);
+        normalTransitions.put(CourseEvent.START, CourseStatus.IN_PROGRESS);
+        map.put(CourseStatus.NORMAL, normalTransitions);
+
+        // IN_PROGRESS 状态可以转换的事件
+        Map<CourseEvent, CourseStatus> inProgressTransitions = new HashMap<>();
+        inProgressTransitions.put(CourseEvent.END, CourseStatus.ENDED);
+        map.put(CourseStatus.IN_PROGRESS, inProgressTransitions);
+
+        // CANCELLED 状态是终态，不允许任何转换
+
+        // ENDED 状态是终态，不允许任何转换
+
+        return map;
+    }
+
+    /**
+     * 检查是否可以转换状态
+     */
+    public Mono<Boolean> canTransition(CourseStatus currentState, CourseEvent event) {
+        return Mono.fromSupplier(() -> {
+            Map<CourseEvent, CourseStatus> transitions = stateTransitionMap.get(currentState);
+            if (transitions == null) {
+                return false;
+            }
+            return transitions.containsKey(event);
+        });
+    }
+
+    /**
+     * 执行状态转换
+     */
+    public Mono<CourseStatus> transition(CourseStatus currentState, CourseEvent event) {
+        return Mono.fromSupplier(() -> {
+            Map<CourseEvent, CourseStatus> transitions = stateTransitionMap.get(currentState);
+            if (transitions == null || !transitions.containsKey(event)) {
+                log.error("Invalid state transition: currentState={}, event={}", currentState, event);
+                throw new IllegalStateException(
+                        String.format("不允许的状态转换: 当前状态=%s, 事件=%s", currentState, event));
+            }
+            CourseStatus newState = transitions.get(event);
+            log.info("State transition: {} --({})--> {}", currentState, event, newState);
+            return newState;
+        });
+    }
+
+    /**
+     * 验证状态转换是否允许
+     */
+    public Mono<Void> validateTransition(GroupCourse course, CourseEvent event) {
+        Long statusValue = course.getStatus();
+        CourseStatus currentState = CourseStatus.fromValue(statusValue != null ? statusValue : 0L);
+        
+        return canTransition(currentState, event)
+                .flatMap(canTransition -> {
+                    if (!canTransition) {
+                        String errorMessage = buildErrorMessage(course.getId(), currentState, event);
+                        return Mono.error(new IllegalStateException(errorMessage));
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    /**
+     * 构建状态转换错误信息
+     */
+    private String buildErrorMessage(Long courseId, CourseStatus currentState, CourseEvent event) {
+        String currentStateDesc = currentState.getDesc();
+        String eventDesc = event.getDesc();
+        
+        String advice = "";
+        switch (currentState) {
+            case CANCELLED:
+                advice = "（课程已取消，无法进行此操作）";
+                break;
+            case ENDED:
+                advice = "（课程已结束，无法进行此操作）";
+                break;
+            case IN_PROGRESS:
+                if (event == CourseEvent.CANCEL) {
+                    advice = "（课程正在进行中，无法取消）";
+                }
+                break;
+            default:
+                break;
+        }
+        
+        return String.format("团课ID=%d 不允许的状态转换: 当前状态=%s(%s), 操作=%s%s",
+                courseId, currentState, currentStateDesc, eventDesc, advice);
+    }
+
+    /**
+     * 执行状态转换并更新课程对象
+     */
+    public Mono<GroupCourse> applyTransition(GroupCourse course, CourseEvent event) {
+        return validateTransition(course, event)
+                .then(transition(CourseStatus.fromValue(course.getStatus()), event))
+                .map(newStatus -> {
+                    course.setStatus(newStatus.getValue());
+                    return course;
+                });
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java

@@ -0,0 +1,92 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 团课预约记录Repository接口
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+public interface IGroupCourseBookingRepository {
+
+    /**
+     * 根据ID查询预约记录
+     */
+    Mono<GroupCourseBooking> findById(Long id);
+
+    /**
+     * 根据会员ID查询预约记录列表
+     */
+    Flux<GroupCourseBooking> findByMemberId(Long memberId);
+
+    /**
+     * 根据团课ID查询预约记录列表
+     */
+    Flux<GroupCourseBooking> findByCourseId(Long courseId);
+
+    /**
+     * 查询会员是否已预约某课程
+     */
+    Mono<GroupCourseBooking> findByCourseIdAndMemberId(Long courseId, Long memberId);
+
+    /**
+     * 查询会员在指定课程的有效预约
+     */
+    Mono<GroupCourseBooking> findValidBooking(Long courseId, Long memberId);
+
+    /**
+     * 统计课程有效预约人数
+     */
+    Mono<Long> countValidBookings(Long courseId);
+
+    /**
+     * 保存预约记录
+     */
+    Mono<GroupCourseBooking> save(GroupCourseBooking booking);
+
+    /**
+     * 更新预约记录
+     */
+    Mono<GroupCourseBooking> update(GroupCourseBooking booking);
+
+    /**
+     * 更新预约状态
+     */
+    Mono<Integer> updateStatus(Long bookingId, String status);
+
+    /**
+     * 删除预约记录
+     */
+    Mono<Void> deleteById(Long bookingId);
+
+    /**
+     * 根据会员卡记录ID查询预约记录
+     */
+    Flux<GroupCourseBooking> findByMemberCardRecordId(Long memberCardRecordId);
+
+    /**
+     * 查询会员是否有时间冲突的预约
+     * 
+     * @param memberId 会员ID
+     * @param newStartTime 新课程开始时间
+     * @param newEndTime 新课程结束时间
+     * @return 冲突的预约记录列表
+     */
+    Flux<GroupCourseBooking> findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime);
+
+    /**
+     * 查询已开始课程但未到场会员的预约记录
+     * @return 缺席会员的预约记录列表
+     */
+    Flux<GroupCourseBooking> findAbsentMembers();
+
+    /**
+     * 更新预约状态为缺席(3)
+     * @param bookingId 预约ID
+     * @return 更新记录数
+     */
+    Mono<Integer> updateToAbsent(Long bookingId);
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java

@@ -0,0 +1,30 @@
+
+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 org.springframework.data.domain.Sort;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRepository {
+    Mono<GroupCourse> findByIdAndDeletedAtIsNull(Long id);
+    Flux<GroupCourse> findAll();
+    Flux<GroupCourse> findAll(Sort sort);
+    Flux<GroupCourse> findByDeletedAtIsNull();
+    Flux<GroupCourse> findByDeletedAtIsNull(Sort sort);
+    
+    Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest);
+    Mono<PageResponse<GroupCourse>> findByPageAndNotDeleted(PageRequest pageRequest);
+    
+    Mono<GroupCourse> save(GroupCourse groupCourse);
+    
+    Mono<GroupCourse> update(GroupCourse groupCourse);
+    
+    Mono<GroupCourse> cancel(Long id);
+    
+    Mono<Void> deleteById(Long id);
+    
+    Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta);
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java

@@ -0,0 +1,115 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 团课预约记录Repository实现类
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Repository
+public class GroupCourseBookingRepository implements IGroupCourseBookingRepository {
+
+    private final GroupCourseBookingDao groupCourseBookingDao;
+    private final GroupCourseConverter groupCourseConverter;
+
+    public GroupCourseBookingRepository(GroupCourseBookingDao groupCourseBookingDao,
+                                        GroupCourseConverter groupCourseConverter) {
+        this.groupCourseBookingDao = groupCourseBookingDao;
+        this.groupCourseConverter = groupCourseConverter;
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> findById(Long id) {
+        return groupCourseBookingDao.findByIdIsAndDeletedAtIsNull(id)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> findByMemberId(Long memberId) {
+        return groupCourseBookingDao.findByMemberIdAndDeletedAtIsNull(memberId, Sort.by(Sort.Direction.DESC, "bookingTime"))
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> findByCourseId(Long courseId) {
+        return groupCourseBookingDao.findByCourseIdAndDeletedAtIsNull(courseId)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> findByCourseIdAndMemberId(Long courseId, Long memberId) {
+        return groupCourseBookingDao.findByCourseIdAndMemberIdAndDeletedAtIsNull(courseId, memberId)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> findValidBooking(Long courseId, Long memberId) {
+        return groupCourseBookingDao.findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(courseId, memberId, "0")
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<Long> countValidBookings(Long courseId) {
+        return groupCourseBookingDao.countByCourseIdAndStatusAndDeletedAtIsNull(courseId, "0");
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> save(GroupCourseBooking booking) {
+        GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking);
+        return groupCourseBookingDao.save(entity)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> update(GroupCourseBooking booking) {
+        GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking);
+        return groupCourseBookingDao.save(entity)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<Integer> updateStatus(Long bookingId, String status) {
+        java.time.LocalDateTime now = java.time.LocalDateTime.now();
+        java.time.LocalDateTime cancelTime = "1".equals(status) ? now : null;
+        return groupCourseBookingDao.updateStatus(bookingId, status, cancelTime, now);
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long bookingId) {
+        return groupCourseBookingDao.softDelete(bookingId, java.time.LocalDateTime.now()).then();
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> findByMemberCardRecordId(Long memberCardRecordId) {
+        return groupCourseBookingDao.findByMemberCardRecordIdAndDeletedAtIsNull(memberCardRecordId)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime) {
+        return groupCourseBookingDao.findConflictingBookings(memberId, newStartTime, newEndTime)
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> findAbsentMembers() {
+        return groupCourseBookingDao.findAbsentMembers()
+                .map(groupCourseConverter::toBookingDomain);
+    }
+
+    @Override
+    public Mono<Integer> updateToAbsent(Long bookingId) {
+        java.time.LocalDateTime now = java.time.LocalDateTime.now();
+        return groupCourseBookingDao.updateToAbsent(bookingId, now);
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java

@@ -0,0 +1,181 @@
+
+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.GroupCourseDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.relational.core.query.Query;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Repository
+public class GroupCourseRepository implements IGroupCourseRepository {
+    private final GroupCourseDao groupCourseDao;
+    private final GroupCourseConverter groupCourseConverter;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
+
+    public GroupCourseRepository(GroupCourseDao groupCourseDao, GroupCourseConverter groupCourseConverter,
+                                  R2dbcEntityTemplate r2dbcEntityTemplate){
+        this.groupCourseDao = groupCourseDao;
+        this.groupCourseConverter = groupCourseConverter;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
+    }
+
+    @Override
+    public Mono<GroupCourse> findByIdAndDeletedAtIsNull(Long id) {
+        return groupCourseDao.findByIdIsAndDeletedAtIsNull(id)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourse> findAll() {
+        return groupCourseDao.findAll()
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourse> findAll(Sort sort) {
+        return groupCourseDao.findAll(sort)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourse> findByDeletedAtIsNull() {
+        return groupCourseDao.findAllByDeletedAtIsNull()
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourse> findByDeletedAtIsNull(Sort sort) {
+        return groupCourseDao.findAllByDeletedAtIsNull(sort)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Mono<PageResponse<GroupCourse>> findByPage(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);
+
+        Query query = Query.empty();
+
+        return r2dbcEntityTemplate.select(GroupCourseEntity.class)
+                .matching(query.with(pageable))
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(query, GroupCourseEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<GroupCourse> courseList = tuple.getT1().stream()
+                            .map(groupCourseConverter::toDomain)
+                            .toList();
+                    return new PageResponse<>(courseList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    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();
+                    }
+                    
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    return new PageResponse<>(courseList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    public Mono<GroupCourse> save(GroupCourse groupCourse) {
+        GroupCourseEntity entity = groupCourseConverter.toEntity(groupCourse);
+        entity.setCreatedAt(LocalDateTime.now());
+        entity.setUpdatedAt(LocalDateTime.now());
+        entity.setStatus(0L);
+        entity.setCurrentMembers(0);
+        
+        return groupCourseDao.save(entity)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourse> update(GroupCourse groupCourse) {
+        GroupCourseEntity entity = groupCourseConverter.toEntity(groupCourse);
+        entity.setUpdatedAt(LocalDateTime.now());
+        
+        return r2dbcEntityTemplate.update(entity)
+                .then(findByIdAndDeletedAtIsNull(groupCourse.getId()));
+    }
+
+    @Override
+    public Mono<GroupCourse> cancel(Long id) {
+        return groupCourseDao.cancelCourse(id, LocalDateTime.now())
+                .flatMap(updated -> {
+                    if (updated > 0) {
+                        return findByIdAndDeletedAtIsNull(id);
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return groupCourseDao.softDelete(id, LocalDateTime.now())
+                .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();
+                });
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/scheduler/GroupCourseAbsentScheduler.java

@@ -0,0 +1,42 @@
+package cn.novalon.gym.manage.groupcourse.scheduler;
+
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 团课缺席会员定时任务
+ * 
+ * 功能：定期检查已开始但会员未到场的课程，自动更新预约记录状态为缺席
+ * 
+ * @author 张翔
+ * @date 2026-06-02
+ */
+@Component
+public class GroupCourseAbsentScheduler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseAbsentScheduler.class);
+
+    private final IGroupCourseBookingService bookingService;
+
+    public GroupCourseAbsentScheduler(IGroupCourseBookingService bookingService) {
+        this.bookingService = bookingService;
+    }
+
+    /**
+     * 每分钟检查一次已开始课程但未到场会员的预约记录
+     * 使用fixedRate保证任务间隔稳定执行
+     */
+    @Scheduled(fixedRate = 60000)
+    public void checkAndUpdateAbsentMembers() {
+        logger.debug("定时任务开始检查已开始课程但未到场会员的预约记录");
+        
+        bookingService.processAbsentMembers()
+                .subscribe(
+                        count -> logger.debug("定时任务完成，更新了 {} 条缺席记录", count),
+                        error -> logger.error("定时任务执行失败：{}", error.getMessage(), error)
+                );
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java

@@ -0,0 +1,65 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 团课预约服务接口
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+public interface IGroupCourseBookingService {
+
+    /**
+     * 预约团课
+     *
+     * @param courseId 团课ID
+     * @param memberId 会员ID
+     * @param memberCardRecordId 会员卡记录ID
+     * @return 预约记录
+     */
+    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardRecordId);
+
+    /**
+     * 取消预约
+     * 
+     * @param bookingId 预约ID
+     * @param memberId 会员ID
+     * @return 取消后的预约记录
+     */
+    Mono<GroupCourseBooking> cancelBooking(Long bookingId, Long memberId);
+
+    /**
+     * 根据会员ID查询预约记录列表
+     * 
+     * @param memberId 会员ID
+     * @return 预约记录列表
+     */
+    Flux<GroupCourseBooking> getBookingsByMemberId(Long memberId);
+
+    /**
+     * 根据预约ID查询预约详情
+     * 
+     * @param bookingId 预约ID
+     * @return 预约记录
+     */
+    Mono<GroupCourseBooking> getBookingById(Long bookingId);
+
+    /**
+     * 根据团课ID查询预约记录列表
+     * 
+     * @param courseId 团课ID
+     * @return 预约记录列表
+     */
+    Flux<GroupCourseBooking> getBookingsByCourseId(Long courseId);
+
+    /**
+     * 处理已开始课程但未到场会员的预约记录
+     * 将状态更新为缺席(3)
+     * 
+     * @return 处理的记录数
+     */
+    Mono<Integer> processAbsentMembers();
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java

@@ -0,0 +1,26 @@
+
+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.GroupCourse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseService {
+    Mono<GroupCourse> findById(Long id);
+    Flux<GroupCourse> findAll();
+    Flux<GroupCourse> findAll(boolean includeDeleted);
+    
+    Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted);
+    
+    Mono<GroupCourse> create(GroupCourse groupCourse);
+    
+    Mono<GroupCourse> update(Long id, GroupCourse groupCourse);
+    
+    Mono<GroupCourse> cancel(Long id);
+    
+    Mono<GroupCourse> signIn(Long courseId, Long memberId);
+    
+    Mono<Void> delete(Long id);
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java

@@ -0,0 +1,372 @@
+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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.UUID;
+
+/**
+ * 团课预约服务实现类
+ * 
+ * 业务规则：
+ * - 预约需在课程开始前至少30分钟
+ * - 取消预约需在课程开始前至少2小时
+ * - 每节课最多20人
+ * - 预约成功后发送提醒
+ * - 预约成功后扣减权益
+ * 
+ * 技术要点：
+ * - 使用Redis缓存团课信息
+ * - 使用分布式锁防止预约冲突
+ * - 使用响应式编程实现高并发预约
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Service
+public class GroupCourseBookingService implements IGroupCourseBookingService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseBookingService.class);
+
+    private final IGroupCourseBookingRepository bookingRepository;
+    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;
+    // 取消预约提前时间限制（小时）
+    private static final long CANCEL_MIN_ADVANCE_HOURS = 2;
+
+    public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository,
+                                     IGroupCourseRepository courseRepository,
+                                     GroupCourseRedisService redisService,
+                                     BookingReminderEventPublisher bookingReminderEventPublisher,
+                                     BookingSagaHandler bookingSagaHandler) {
+        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);
+
+        // 生成唯一请求ID用于分布式锁
+        String requestId = UUID.randomUUID().toString();
+
+        // 1. 获取分布式锁
+        return redisService.acquireLock(courseId, requestId)
+                .flatMap(lockAcquired -> {
+                    if (!lockAcquired) {
+                        return Mono.error(new RuntimeException("系统繁忙，请稍后重试"));
+                    }
+
+                    // 2. 尝试从缓存获取课程信息，如果缓存不存在则从数据库获取
+                    return getCourseWithCache(courseId)
+                            .flatMap(course -> {
+                                // 3. 验证课程状态
+                                Long status = course.getStatus();
+                                if (status == null || status != 0L) {
+                                    String errorMessage;
+                                    if (status == null) {
+                                        errorMessage = "课程状态异常";
+                                    } else if (status == 1L) {
+                                        errorMessage = "课程已取消，无法预约";
+                                    } else if (status == 2L) {
+                                        errorMessage = "课程已结束，无法预约";
+                                    } else {
+                                        errorMessage = "课程状态不可预约";
+                                    }
+                                    return releaseLockAndError(courseId, requestId, errorMessage);
+                                }
+
+                                // 4. 验证预约时间
+                                LocalDateTime now = LocalDateTime.now();
+                                LocalDateTime startTime = course.getStartTime();
+                                long minutesUntilStart = ChronoUnit.MINUTES.between(now, startTime);
+                                if (minutesUntilStart < BOOKING_MIN_ADVANCE_MINUTES) {
+                                    return releaseLockAndError(courseId, requestId, 
+                                            "需在课程开始前" + BOOKING_MIN_ADVANCE_MINUTES + "分钟预约");
+                                }
+
+                                // 5. 验证课程人数是否已满（使用数据库中的current_members字段）
+                                if (course.getCurrentMembers() != null && 
+                                    course.getMaxMembers() != null &&
+                                    course.getCurrentMembers() >= course.getMaxMembers()) {
+                                    return releaseLockAndError(courseId, requestId, "课程已满");
+                                }
+
+                                // 6. 验证时间冲突（会员是否已预约时间重叠的课程）
+                                return bookingRepository.findConflictingBookings(memberId, course.getStartTime(), course.getEndTime())
+                                        .collectList()
+                                        .flatMap(conflictingBookings -> {
+                                            if (!conflictingBookings.isEmpty()) {
+                                                StringBuilder errorMsg = new StringBuilder("您已预约的课程与当前课程时间冲突：");
+                                                for (GroupCourseBooking conflict : conflictingBookings) {
+                                                    errorMsg.append(conflict.getCourseName())
+                                                            .append("(")
+                                                            .append(conflict.getCourseStartTime())
+                                                            .append(" - ")
+                                                            .append(conflict.getCourseEndTime())
+                                                            .append(") ");
+                                                }
+                                                return releaseLockAndError(courseId, requestId, errorMsg.toString());
+                                            }
+
+                                            // 7. 验证是否已预约
+                                            return bookingRepository.findValidBooking(courseId, memberId)
+                                                    .flatMap(existingBooking -> {
+                                                        return releaseLockAndError(courseId, requestId, "您已预约该课程");
+                                                    })
+                                                    .switchIfEmpty(
+                                                        // 8. 使用Redis原子操作验证课程人数是否已满
+                                                        validateAndIncrementBookingCount(courseId, course.getMaxMembers())
+                                                            .flatMap(countValid -> {
+                                                                if (countValid > course.getMaxMembers()) {
+                                                                    return releaseLockAndError(courseId, requestId, "课程已满");
+                                                                }
+
+                                                                // 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());
+
+                                                                // 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());
+                                                                    });
+                                                            })
+                                                    );
+                                        });
+                            })
+                            .onErrorResume(error -> {
+                                // 发生错误时释放锁
+                                redisService.releaseLock(courseId, requestId).subscribe();
+                                return Mono.error(error);
+                            });
+                });
+    }
+
+    /**
+     * 从缓存或数据库获取课程信息
+     */
+    private Mono<GroupCourse> getCourseWithCache(Long courseId) {
+        return redisService.getCachedCourse(courseId)
+                .switchIfEmpty(
+                    // 缓存未命中，从数据库查询
+                    courseRepository.findByIdAndDeletedAtIsNull(courseId)
+                        .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                        .flatMap(course -> {
+                            // 将课程信息存入缓存
+                            return redisService.cacheCourse(course).then(Mono.just(course));
+                        })
+                );
+    }
+
+    /**
+     * 验证并增加预约人数（使用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));
+    }
+
+    /**
+     * 释放锁并返回错误
+     */
+    private Mono<GroupCourseBooking> releaseLockAndError(Long courseId, String requestId, String errorMessage) {
+        return redisService.releaseLock(courseId, requestId)
+                .then(Mono.error(new RuntimeException(errorMessage)));
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> cancelBooking(Long bookingId, Long memberId) {
+        logger.info("开始取消预约：bookingId={}, memberId={}", bookingId, memberId);
+
+        // 生成唯一请求ID用于分布式锁
+        String requestId = UUID.randomUUID().toString();
+
+        // 获取锁防止并发取消
+        return redisService.acquireLock(bookingId, requestId)
+                .flatMap(lockAcquired -> {
+                    if (!lockAcquired) {
+                        return Mono.error(new RuntimeException("系统繁忙，请稍后重试"));
+                    }
+
+                    // 1. 查询预约记录
+                    return bookingRepository.findById(bookingId)
+                            .switchIfEmpty(Mono.error(new RuntimeException("预约记录不存在")))
+                            .flatMap(booking -> {
+                                // 2. 验证预约归属
+                                if (!booking.getMemberId().equals(memberId)) {
+                                    return releaseLockAndError(bookingId, requestId, "无权取消他人预约");
+                                }
+
+                                // 3. 验证预约状态
+                                String status = booking.getStatus();
+                                if (!"0".equals(status)) {
+                                    String errorMessage;
+                                    if ("1".equals(status)) {
+                                        errorMessage = "预约已取消，无需重复取消";
+                                    } else if ("2".equals(status)) {
+                                        errorMessage = "课程已出席，无法取消";
+                                    } else if ("3".equals(status)) {
+                                        errorMessage = "已缺席课程，无法取消";
+                                    } else {
+                                        errorMessage = "预约状态不允许取消";
+                                    }
+                                    return releaseLockAndError(bookingId, requestId, errorMessage);
+                                }
+
+                                // 4. 验证取消时间
+                                LocalDateTime now = LocalDateTime.now();
+                                LocalDateTime startTime = booking.getCourseStartTime();
+                                if (startTime == null) {
+                                    return releaseLockAndError(bookingId, requestId, "课程开始时间为空，无法取消预约");
+                                }
+                                long hoursUntilStart = ChronoUnit.HOURS.between(now, startTime);
+                                if (hoursUntilStart < CANCEL_MIN_ADVANCE_HOURS) {
+                                    return releaseLockAndError(bookingId, requestId, 
+                                            "需在课程开始前" + 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());
+                                    });
+                            })
+                            .onErrorResume(error -> {
+                                redisService.releaseLock(bookingId, requestId).subscribe();
+                                return Mono.error(error);
+                            });
+                });
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> getBookingsByMemberId(Long memberId) {
+        logger.debug("查询会员预约记录：memberId={}", memberId);
+        return bookingRepository.findByMemberId(memberId)
+                .doOnComplete(() -> logger.debug("查询完成：memberId={}", memberId));
+    }
+
+    @Override
+    public Mono<GroupCourseBooking> getBookingById(Long bookingId) {
+        logger.debug("查询预约详情：bookingId={}", bookingId);
+        return bookingRepository.findById(bookingId);
+    }
+
+    @Override
+    public Flux<GroupCourseBooking> getBookingsByCourseId(Long courseId) {
+        logger.debug("查询课程预约记录：courseId={}", courseId);
+        return bookingRepository.findByCourseId(courseId)
+                .doOnComplete(() -> logger.debug("查询完成：courseId={}", courseId));
+    }
+
+    @Override
+    public Mono<Integer> processAbsentMembers() {
+        logger.info("开始处理已开始课程但未到场会员的预约记录");
+        
+        return bookingRepository.findAbsentMembers()
+                .collectList()
+                .flatMap(absentBookings -> {
+                    if (absentBookings.isEmpty()) {
+                        logger.info("没有需要处理的缺席会员记录");
+                        return Mono.just(0);
+                    }
+                    
+                    logger.info("发现 {} 条需要更新为缺席状态的预约记录", absentBookings.size());
+                    
+                    // 批量更新状态为缺席
+                    return Flux.fromIterable(absentBookings)
+                            .flatMap(booking -> {
+                                logger.debug("更新预约记录为缺席状态：bookingId={}, memberId={}, courseId={}", 
+                                        booking.getId(), booking.getMemberId(), booking.getCourseId());
+                                return bookingRepository.updateToAbsent(booking.getId());
+                            })
+                            .reduce(Integer::sum)
+                            .defaultIfEmpty(0)
+                            .doOnSuccess(count -> {
+                                logger.info("成功更新 {} 条预约记录为缺席状态", count);
+                            })
+                            .doOnError(error -> {
+                                logger.error("处理缺席会员记录时发生错误：{}", error.getMessage(), error);
+                            });
+                });
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java

@@ -0,0 +1,194 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+
+/**
+ * 团课Redis缓存服务
+ * 
+ * 负责团课信息的缓存管理和分布式锁实现
+ * 
+ * @author 张翔
+ * @date 2026-06-01
+ */
+@Service
+public class GroupCourseRedisService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseRedisService.class);
+
+    // 团课信息缓存Key前缀
+    private static final String GROUP_COURSE_CACHE_PREFIX = "group_course:";
+    // 团课预约锁Key前缀
+    private static final String BOOKING_LOCK_PREFIX = "booking_lock:";
+    // 缓存过期时间（5分钟）
+    private static final Duration CACHE_EXPIRE_TIME = Duration.ofMinutes(5);
+    // 锁过期时间（30秒）
+    private static final Duration LOCK_EXPIRE_TIME = Duration.ofSeconds(30);
+
+    private final ReactiveRedisTemplate<String, Object> reactiveRedisTemplate;
+    private final ObjectMapper objectMapper;
+
+    public GroupCourseRedisService(ReactiveRedisTemplate<String, Object> reactiveRedisTemplate,
+                                   ObjectMapper objectMapper) {
+        this.reactiveRedisTemplate = reactiveRedisTemplate;
+        this.objectMapper = objectMapper;
+    }
+
+    /**
+     * 获取团课缓存Key
+     */
+    private String getCourseCacheKey(Long courseId) {
+        return GROUP_COURSE_CACHE_PREFIX + courseId;
+    }
+
+    /**
+     * 获取预约锁Key
+     */
+    private String getBookingLockKey(Long courseId) {
+        return BOOKING_LOCK_PREFIX + courseId;
+    }
+
+    /**
+     * 缓存团课信息
+     */
+    public Mono<Void> cacheCourse(GroupCourse course) {
+        String key = getCourseCacheKey(course.getId());
+        try {
+            String value = objectMapper.writeValueAsString(course);
+            return reactiveRedisTemplate.opsForValue()
+                    .set(key, value, CACHE_EXPIRE_TIME)
+                    .doOnSuccess(result -> logger.debug("团课信息已缓存：courseId={}", course.getId()))
+                    .then();
+        } catch (JsonProcessingException e) {
+            logger.error("序列化团课信息失败：courseId={}", course.getId(), e);
+            return Mono.error(e);
+        }
+    }
+
+    /**
+     * 获取缓存的团课信息
+     */
+    public Mono<GroupCourse> getCachedCourse(Long courseId) {
+        String key = getCourseCacheKey(courseId);
+        return reactiveRedisTemplate.opsForValue()
+                .get(key)
+                .cast(String.class)
+                .flatMap(value -> {
+                    try {
+                        GroupCourse course = objectMapper.readValue(value, GroupCourse.class);
+                        logger.debug("从缓存获取团课信息：courseId={}", courseId);
+                        return Mono.just(course);
+                    } catch (JsonProcessingException e) {
+                        logger.error("反序列化团课信息失败：courseId={}", courseId, e);
+                        return Mono.empty();
+                    }
+                })
+                .switchIfEmpty(Mono.fromRunnable(() -> logger.debug("缓存中未找到团课信息：courseId={}", courseId)));
+    }
+
+    /**
+     * 删除团课缓存
+     */
+    public Mono<Void> invalidateCourseCache(Long courseId) {
+        String key = getCourseCacheKey(courseId);
+        return reactiveRedisTemplate.delete(key)
+                .doOnSuccess(result -> logger.debug("团课缓存已删除：courseId={}", courseId))
+                .then();
+    }
+
+    /**
+     * 获取分布式锁
+     * 
+     * @param courseId 课程ID
+     * @param requestId 请求ID（用于锁的唯一性校验）
+     * @return 是否获取成功
+     */
+    public Mono<Boolean> acquireLock(Long courseId, String requestId) {
+        String key = getBookingLockKey(courseId);
+        return reactiveRedisTemplate.opsForValue()
+                .setIfAbsent(key, requestId, LOCK_EXPIRE_TIME)
+                .doOnSuccess(acquired -> {
+                    if (acquired) {
+                        logger.debug("获取预约锁成功：courseId={}, requestId={}", courseId, requestId);
+                    } else {
+                        logger.debug("获取预约锁失败：courseId={}", courseId);
+                    }
+                });
+    }
+
+    /**
+     * 释放分布式锁
+     * 
+     * @param courseId 课程ID
+     * @param requestId 请求ID（用于锁的唯一性校验）
+     * @return 是否释放成功
+     */
+    public Mono<Boolean> releaseLock(Long courseId, String requestId) {
+        String key = getBookingLockKey(courseId);
+        return reactiveRedisTemplate.opsForValue()
+                .get(key)
+                .cast(String.class)
+                .flatMap(storedRequestId -> {
+                    if (requestId.equals(storedRequestId)) {
+                        return reactiveRedisTemplate.delete(key)
+                                .map(deleted -> deleted > 0)
+                                .doOnSuccess(result -> logger.debug("释放预约锁成功：courseId={}, requestId={}", courseId, requestId));
+                    } else {
+                        logger.warn("锁归属校验失败：courseId={}, expectedRequestId={}, actualRequestId={}", 
+                                courseId, requestId, storedRequestId);
+                        return Mono.just(false);
+                    }
+                })
+                .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();
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java

@@ -0,0 +1,396 @@
+
+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.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.enums.CourseEvent;
+import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseStateMachine;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+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 com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Service
+public class GroupCourseService implements IGroupCourseService {
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class);
+    
+    private final IGroupCourseRepository groupCourseRepository;
+    private final IGroupCourseBookingRepository bookingRepository;
+    private final IMemberCardRecordService memberCardRecordService;
+    private final MemberCardRepository memberCardRepository;
+    private final RedisUtil redisUtil;
+    private final ObjectMapper objectMapper;
+    private final GroupCourseStateMachine stateMachine;
+    
+    private static final String CACHE_KEY_PREFIX = "group_course:page:";
+    private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+    
+    private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0;
+    
+    public GroupCourseService(IGroupCourseRepository groupCourseRepository, 
+                              IGroupCourseBookingRepository bookingRepository,
+                              IMemberCardRecordService memberCardRecordService,
+                              MemberCardRepository memberCardRepository,
+                              RedisUtil redisUtil,
+                              ObjectMapper objectMapper,
+                              GroupCourseStateMachine stateMachine){
+        this.groupCourseRepository = groupCourseRepository;
+        this.bookingRepository = bookingRepository;
+        this.memberCardRecordService = memberCardRecordService;
+        this.memberCardRepository = memberCardRepository;
+        this.redisUtil = redisUtil;
+        this.objectMapper = objectMapper;
+        this.stateMachine = stateMachine;
+    }
+
+    @Override
+    public Mono<GroupCourse> findById(Long id) {
+        String cacheKey = CACHE_KEY_ID_PREFIX + id;
+        
+        return redisUtil.get(cacheKey, String.class)
+                .flatMap(cachedJson -> {
+                    if (cachedJson != null) {
+                        try {
+                            GroupCourse groupCourse = objectMapper.readValue(cachedJson, GroupCourse.class);
+                            logger.info("缓存命中 - findById: id={}", id);
+                            return Mono.just(groupCourse);
+                        } catch (JsonProcessingException e) {
+                            logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
+                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                        }
+                    }
+                    return Mono.empty();
+                })
+                .switchIfEmpty(
+                    groupCourseRepository.findByIdAndDeletedAtIsNull(id)
+                            .flatMap(groupCourse -> {
+                                try {
+                                    String jsonData = objectMapper.writeValueAsString(groupCourse);
+                                    return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS)
+                                            .thenReturn(groupCourse)
+                                            .doOnSuccess(gc -> logger.debug("缓存已设置 - findById: id={}", id));
+                                } catch (JsonProcessingException e) {
+                                    logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage());
+                                    return Mono.just(groupCourse);
+                                }
+                            })
+                            .doOnSubscribe(sub -> logger.debug("缓存未命中，查询数据库 - findById: id={}", id))
+                );
+    }
+
+    @Override
+    public Flux<GroupCourse> findAll() {
+        return groupCourseRepository.findAll();
+    }
+
+    @Override
+    public Flux<GroupCourse> findAll(boolean includeDeleted) {
+        if(includeDeleted){
+            return groupCourseRepository.findAll();
+        }else{
+            return groupCourseRepository.findByDeletedAtIsNull();
+        }
+    }
+
+    @Override
+    public Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+        String keyword = pageRequest.getKeyword() != null ? pageRequest.getKeyword() : "";
+        
+        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword;
+
+        return redisUtil.get(cacheKey, String.class)
+                .flatMap(cachedJson -> {
+                    if (cachedJson != null) {
+                        try {
+                            PageResponse<GroupCourse> pageResponse = objectMapper.readValue(cachedJson, 
+                                objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class));
+                            logger.info("缓存命中 - findByPage: key={}", cacheKey);
+                            return Mono.just(pageResponse);
+                        } catch (JsonProcessingException e) {
+                            logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage());
+                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                        }
+                    }
+                    return Mono.empty();
+                })
+                .switchIfEmpty(
+                    Mono.defer(() -> {
+                        logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey);
+                        Mono<PageResponse<GroupCourse>> resultMono;
+                        if (includeDeleted) {
+                            resultMono = groupCourseRepository.findByPage(pageRequest);
+                        } else {
+                            resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest);
+                        }
+                        
+                        return resultMono.flatMap(pageResponse -> {
+                            try {
+                                String jsonData = objectMapper.writeValueAsString(pageResponse);
+                                return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS)
+                                        .thenReturn(pageResponse)
+                                        .doOnSuccess(pr -> logger.debug("缓存已设置 - findByPage: key={}", cacheKey));
+                            } catch (JsonProcessingException e) {
+                                logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage());
+                                return Mono.just(pageResponse);
+                            }
+                        });
+                    })
+                );
+    }
+
+    @Override
+    public Mono<GroupCourse> create(GroupCourse groupCourse) {
+        return groupCourseRepository.save(groupCourse)
+                .doOnSuccess(course -> logger.info("团课创建成功 - id={}, name={}", course.getId(), course.getCourseName()))
+                .flatMap(course -> clearCache().thenReturn(course))
+                .doOnError(error -> logger.error("团课创建失败 - error: {}", error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourse> update(Long id, GroupCourse groupCourse) {
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(existing -> {
+                    if (groupCourse.getCourseName() != null) {
+                        existing.setCourseName(groupCourse.getCourseName());
+                    }
+                    if (groupCourse.getCoachId() != null) {
+                        existing.setCoachId(groupCourse.getCoachId());
+                    }
+                    if (groupCourse.getCourseType() != null) {
+                        existing.setCourseType(groupCourse.getCourseType());
+                    }
+                    if (groupCourse.getStartTime() != null) {
+                        existing.setStartTime(groupCourse.getStartTime());
+                    }
+                    if (groupCourse.getEndTime() != null) {
+                        existing.setEndTime(groupCourse.getEndTime());
+                    }
+                    if (groupCourse.getMaxMembers() != null) {
+                        existing.setMaxMembers(groupCourse.getMaxMembers());
+                    }
+                    if (groupCourse.getStatus() != null) {
+                        existing.setStatus(groupCourse.getStatus());
+                    }
+                    if (groupCourse.getLocation() != null) {
+                        existing.setLocation(groupCourse.getLocation());
+                    }
+                    if (groupCourse.getCoverImage() != null) {
+                        existing.setCoverImage(groupCourse.getCoverImage());
+                    }
+                    if (groupCourse.getDescription() != null) {
+                        existing.setDescription(groupCourse.getDescription());
+                    }
+                    if (groupCourse.getPointCardAmount() != null) {
+                        existing.setPointCardAmount(groupCourse.getPointCardAmount());
+                    }
+                    if (groupCourse.getStoredValueAmount() != null) {
+                        existing.setStoredValueAmount(groupCourse.getStoredValueAmount());
+                    }
+                    return groupCourseRepository.update(existing);
+                })
+                .doOnSuccess(course -> logger.info("团课更新成功 - id={}", id))
+                .flatMap(course -> clearCache().thenReturn(course))
+                .doOnError(error -> logger.error("团课更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourse> cancel(Long id) {
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    // 使用状态机验证状态转换
+                    return stateMachine.validateTransition(course, CourseEvent.CANCEL)
+                            .then(Mono.just(course));
+                })
+                .flatMap(course -> {
+                    LocalDateTime now = LocalDateTime.now();
+                    // 检查当前时间是否超过课程开始前24小时
+                    // 如果当前时间 > (课程开始时间 - 24小时)，则不允许取消
+                    if (now.isAfter(course.getStartTime().minusHours(24))) {
+                        return Mono.error(new RuntimeException("课程取消需提前24小时"));
+                    }
+                    
+                    // 取消课程并返还权益
+                    return groupCourseRepository.cancel(id)
+                            .flatMap(canceledCourse -> {
+                                // 为所有预约该课程的会员返还权益
+                                return refundBookingMembers(canceledCourse.getId())
+                                        .then(Mono.just(canceledCourse));
+                            });
+                })
+                .doOnSuccess(course -> logger.info("团课取消成功 - id={}", id))
+                .flatMap(course -> clearCache().thenReturn(course))
+                .doOnError(error -> logger.error("团课取消失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    /**
+     * 为预约课程的所有会员返还权益
+     * 
+     * @param courseId 课程ID
+     * @return 空Mono
+     */
+    private Mono<Void> refundBookingMembers(Long courseId) {
+        logger.info("开始为课程预约会员返还权益: courseId={}", courseId);
+        
+        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);
+                    
+                    return bookingRepository.findByCourseId(courseId)
+                            .filter(booking -> "0".equals(booking.getStatus())) // 只处理已预约状态的记录
+                            .flatMap(booking -> {
+                                Long memberCardRecordId = booking.getMemberCardRecordId();
+                                if (memberCardRecordId == null) {
+                                    logger.warn("预约记录没有会员卡记录ID: bookingId={}", booking.getId());
+                                    return Mono.empty();
+                                }
+                                
+                                // 根据会员卡类型返还权益
+                                return refundCardUsage(booking.getId(), memberCardRecordId, pointCardAmount, storedValueAmount)
+                                        .doOnSuccess(unused -> logger.info("会员权益返还成功: bookingId={}, memberId={}", 
+                                                booking.getId(), booking.getMemberId()))
+                                        .doOnError(error -> logger.error("会员权益返还失败: bookingId={}, memberId={}, error={}", 
+                                                booking.getId(), booking.getMemberId(), error.getMessage()))
+                                        .onErrorResume(e -> Mono.empty()); // 单个会员返还失败不影响其他会员
+                            })
+                            .then();
+                });
+    }
+
+    /**
+     * 根据会员卡类型返还权益
+     * 
+     * @param bookingId 预约ID
+     * @param recordId 会员卡记录ID
+     * @param pointCardAmount 次卡返还次数
+     * @param storedValueAmount 储值卡返还金额
+     * @return 空Mono
+     */
+    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Integer pointCardAmount, Double storedValueAmount) {
+        return memberCardRecordService.findById(recordId)
+                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
+                .flatMap(record -> {
+                    return memberCardRepository.findById(record.getMemberCardId())
+                            .flatMap(card -> {
+                                MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
+                                
+                                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());
+                                        break;
+                                    case STORED_VALUE_CARD:
+                                        // 储值卡返还金额（基于课程设置的storedValueAmount）
+                                        logger.debug("返还储值卡金额: recordId={}, amount={}", recordId, storedValueAmount);
+                                        refundOperation = memberCardRecordService.renewCard(recordId, 0, storedValueAmount, record.getExpireTime())
+                                                .then(Mono.empty());
+                                        break;
+                                    case TIME_CARD:
+                                        // 时长卡不返还，仅修改预约记录状态
+                                        logger.debug("时长卡不返还权益，仅更新预约状态: bookingId={}", bookingId);
+                                        refundOperation = Mono.empty();
+                                        break;
+                                    default:
+                                        return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
+                                }
+                                
+                                // 无论哪种卡类型，都需要更新预约记录状态为已取消
+                                return refundOperation.then(bookingRepository.updateStatus(bookingId, "1"))
+                                        .flatMap(rows -> {
+                                            if (rows == 0) {
+                                                logger.warn("更新预约状态失败: bookingId={}", bookingId);
+                                            }
+                                            return Mono.empty();
+                                        });
+                            });
+                });
+    }
+
+    @Override
+    public Mono<GroupCourse> signIn(Long courseId, Long memberId) {
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    if (course.getStatus() != 0L) {
+                        return Mono.error(new RuntimeException("课程状态不允许签到"));
+                    }
+                    
+                    if (course.getCurrentMembers() >= course.getMaxMembers()) {
+                        return Mono.error(new RuntimeException("课程已满员"));
+                    }
+                    
+                    // 检查会员是否已预约此课程
+                    return bookingRepository.findValidBooking(courseId, memberId)
+                            .switchIfEmpty(Mono.error(new RuntimeException("会员未预约此课程")))
+                            .flatMap(booking -> {
+                                // 更新课程当前人数
+                                return groupCourseRepository.updateCurrentMembers(courseId, 1)
+                                        .flatMap(updatedCourse -> {
+                                            // 更新预约状态为已出席
+                                            return bookingRepository.updateStatus(booking.getId(), "2")
+                                                    .thenReturn(updatedCourse);
+                                        });
+                            });
+                })
+                .doOnSuccess(course -> logger.info("团课签到成功 - courseId={}, memberId={}", courseId, memberId))
+                .flatMap(course -> clearCache().thenReturn(course))
+                .doOnError(error -> logger.error("团课签到失败 - courseId={}, memberId={}, error: {}", courseId, memberId, error.getMessage()));
+    }
+
+    @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() : "未知")));
+                    }
+                    
+                    // 删除课程
+                    return groupCourseRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课删除成功 - id={}", id))
+                            .then(clearCache())
+                            .doOnError(error -> logger.error("团课删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
+    }
+
+    private Mono<Void> clearCache() {
+        return redisUtil.deleteByPattern(CACHE_KEY_PREFIX + "*")
+                .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*")).then();
+    }
+}

gym-manage-api/gym-groupCourse/src/main/resources/application.yaml

@@ -0,0 +1,3 @@
+spring:
+  application:
+    name: gym-groupCourse

gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/GymGroupCourseApplicationTests.java

@@ -0,0 +1,13 @@
+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() {
+    }
+
+}

gym-manage-api/gym-member/pom.xml

@@ -128,11 +128,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
-        <!-- Redis响应式支持（会员卡模块需要） -->
+
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/SearchMemberDto.java

@@ -12,9 +12,6 @@ public class SearchMemberDto {
     // 搜索字段 - 包括 会员号、昵称、手机号
     private String searchValue;
 
-    // 排序
-    private String filter;
-
     // 页码
     private Integer pageNum = 1;
 

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UpdateMemberInfoDto.java

@@ -1,30 +1,32 @@
 package cn.novalon.gym.manage.member.dto;
 
+import cn.novalon.gym.manage.member.enums.GenderEnum;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
  * 更新会员信息Dto
- * 
+ *
  * @author 付嘉
  * @date 2026-05-10
  */
 @Data
 public class UpdateMemberInfoDto {
-    
+
     // 昵称
     private String nickname;
-    
+
     // 性别
-    private Integer gender;
+    private GenderEnum gender;
-    
+
     // 生日
-    private Date birthday;
+    private LocalDate birthday;
-    
+
     // 头像
     private String avatar;
-    
+
     // 地址
     private String address;
-}
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/BaseEntity.java

@@ -33,6 +33,9 @@ public abstract class BaseEntity implements Persistable<Long> {
     @Column("updated_at")
     private LocalDateTime updatedAt;
 
+    @Column("deleted_at")
+    private LocalDateTime deletedAt;
+
     // 判断当前实体是否是新建的
     @Override
     public boolean isNew() {

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/Member.java

@@ -1,13 +1,10 @@
 package cn.novalon.gym.manage.member.entity;
 
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -44,7 +41,7 @@ public class Member extends BaseEntity {
 
     //生日
     @Column("birthday")
-    private Date birthday;
+    private LocalDate birthday;
 
     //地址
     @Column("address")

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/SignInRecord.java

@@ -1,38 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Table("sign_in_record")
-public class SignInRecord {
-
-    @Id
-    private Long id;
-
-    // 会员ID
-    @Column("member_id")
-    private Long memberId;
-
-    // 签到日期
-    @Column("sign_in_date")
-    private LocalDate signInDate;
-
-    // 签到时间
-    @Column("sign_in_time")
-    private LocalDateTime signInTime;
-
-    // 创建时间
-    @CreatedDate
-    @Column("created_at")
-    private LocalDateTime createdAt;
-}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/GenderEnum.java

@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.member.enums;
+
+import lombok.Getter;
+
+/**
+ * 性别枚举
+ *
+ * @author 付嘉
+ * @date 2026-05-29
+ */
+@Getter
+public enum GenderEnum {
+
+    UNKNOWN(0, "未知"),
+    MALE(1, "男"),
+    FEMALE(2, "女");
+
+    private final Integer code;
+    private final String desc;
+
+    GenderEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static GenderEnum fromCode(Integer code) {
+        if (code == null) {
+            return UNKNOWN;
+        }
+        for (GenderEnum gender : values()) {
+            if (gender.code.equals(code)) {
+                return gender;
+            }
+        }
+        return UNKNOWN;
+    }
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/es/entity/MemberES.java

@@ -1,12 +1,18 @@
 package cn.novalon.gym.manage.member.es.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
+import java.time.LocalDateTime;
+
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Document(indexName = "gym_members")
 public class MemberES {
 

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/es/repository/MemberESRepository.java

@@ -2,6 +2,7 @@ package cn.novalon.gym.manage.member.es.repository;
 
 import cn.novalon.gym.manage.member.es.entity.MemberES;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.repository.ReactiveElasticsearchRepository;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
@@ -15,6 +16,6 @@ public interface MemberESRepository extends ReactiveElasticsearchRepository<Memb
     /**
      * 前台通用搜索：会员号（精确匹配） 或 昵称（模糊匹配） 或 手机号（精确匹配）并且 性别筛选（精确匹配）
      */
-    Flux<MemberES> findByMemberNoOrPhoneOrNicknameContainingAndGender(
+    Flux<MemberES> findByMemberNoOrPhoneOrNicknameContaining(
-            String memberNo, String phone, String nickname,String gender, Pageable pageable);
+            String memberNo, String phone, String nickname, Pageable pageable);
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberHandler.java

@@ -8,8 +8,11 @@ import cn.novalon.gym.manage.member.service.MemberService;
 import cn.novalon.gym.manage.member.service.WechatAuthService;
 import cn.novalon.gym.manage.member.service.WechatOfficialService;
 import cn.novalon.gym.manage.member.util.AesUtil;
+import cn.novalon.gym.manage.member.util.WechatPhoneUtil;
 import cn.novalon.gym.manage.sys.util.AuthUtil;
 import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+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.apache.commons.lang3.math.NumberUtils;
@@ -29,21 +32,15 @@ import reactor.core.publisher.Mono;
 @Slf4j
 @Component
 @RequiredArgsConstructor
+@Tag(name = "会员管理", description = "会员信息管理、微信绑定、服务号关注等")
 public class MemberHandler {
 
     private final MemberService memberService;
     private final WechatAuthService wechatAuthService;
     private final WechatOfficialService wechatOfficialService;
-    private final JwtTokenProvider jwtTokenProvider;
-    private final WechatProperties wechatProperties;
     private final AuthUtil authUtil;
 
-    /**
+    @Operation(summary = "获取会员信息", description = "根据当前登录用户获取会员基本信息")
-     * 获取会员信息
-     *
-     * GET /api/member/info
-     * header: { "Authorization": "Bearer xxx" }
-     */
     public Mono<ServerResponse> getMemberInfo(ServerRequest request) {
 
         Long memberId = authUtil.getMemberIdOrThrow(request);
@@ -56,19 +53,7 @@ public class MemberHandler {
                             .bodyValue(info));
     }
 
-    /**
+    @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息")
-     * 更新会员信息
-     *
-     * PUT /api/member/info
-     * header: { "Authorization": "Bearer xxx" }
-     * Body: {
-     *   "nickname": "新昵称",
-     *   "gender": 1,
-     *   "birthday": "2000-01-01",
-     *   "avatar": "https://example.com/avatar.jpg",
-     *   "address": "北京市朝阳区"
-     * }
-     */
     public Mono<ServerResponse> updateMemberInfo(ServerRequest request) {
 
         Long memberId = authUtil.getMemberIdOrThrow(request);
@@ -82,11 +67,7 @@ public class MemberHandler {
                         .bodyValue(info));
     }
 
-    /**
+    @Operation(summary = "绑定手机号", description = "通过微信小程序手机号code绑定会员手机号")
-     * 绑定手机号（微信小程序）
-     * header: { "Authorization": "Bearer xxx" }
-     * POST /api/member/phone/bind?code=PHONE_CODE
-     */
     public Mono<ServerResponse> bindPhone(ServerRequest request) {
 
         Long memberId = authUtil.getMemberIdOrThrow(request);
@@ -103,12 +84,7 @@ public class MemberHandler {
                         .bodyValue(success));
     }
 
-    /**
+    @Operation(summary = "查询服务号关注状态", description = "查询会员是否关注微信服务号")
-     * 查询服务号关注状态
-     *
-     * GET /api/member/subscribe/status
-     *
-     */
     public Mono<ServerResponse> checkSubscribeStatus(ServerRequest request) {
 
         Long memberId = authUtil.getMemberIdOrThrow(request);
@@ -123,14 +99,7 @@ public class MemberHandler {
                 });
     }
 
-    /**
+    @Operation(summary = "管理员更新手机号", description = "后台管理员为会员更新手机号")
-     * 管理员更新手机号
-     *
-     * POST /api/admin/member/123/phone
-     * header: { "Authorization": "Bearer xxx" }
-     * Body: { "phone": "13800138000" }
-     *
-     */
     public Mono<ServerResponse> adminUpdatePhone(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
@@ -162,13 +131,7 @@ public class MemberHandler {
                 });
     }
 
-    /**
+    @Operation(summary = "管理员查看会员详情", description = "后台管理员查看指定会员的详细信息")
-     * 前台查看会员信息
-     *
-     * GET /api/admin/member/{id}
-     * header: { "Authorization": "xxx" }
-     *
-     */
     public Mono<ServerResponse> adminGetMemberInfo(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
@@ -179,20 +142,24 @@ public class MemberHandler {
 
         log.info("前台查看会员信息, adminId: {}, memberId: {}", adminId, memberId);
 
-        // TODO 多表查询：会员信息、团课信息、会员卡信息
+        return memberService.getMemberDetail(memberId)
-
+                .flatMap(detail -> {
-        return ServerResponse.ok()
+                    if (detail.getPhone() != null && !detail.getPhone().isEmpty()) {
-                .contentType(MediaType.APPLICATION_JSON)
+                        try {
-                .bodyValue("成功");
+                            String decryptedPhone = AesUtil.decrypt(detail.getPhone());
+                            detail.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
+                        } catch (Exception e) {
+                            log.error("手机号解密失败, memberId: {}", detail.getId(), e);
+                            detail.setPhone(null);
+                        }
+                    }
+                    return ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(detail);
+                });
     }
 
-    /**
+    @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息")
-     * 前台编辑会员信息
-     *
-     * PUT /api/admin/member/{id}
-     * header: { "Authorization": "xxx" }
-     * Body:{"字段","值"}
-     */
     public Mono<ServerResponse> adminUpdateMemberInfo(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
@@ -201,42 +168,35 @@ public class MemberHandler {
         long memberId = NumberUtils.toLong(memberIdStr, 0L);
         if(memberId <= 0L) throw new IllegalArgumentException("会员ID格式错误");
 
+        // TODO: 补充签到记录
         log.info("前台编辑会员信息, adminId: {}, memberId: {}", adminId, memberId);
 
-        // TODO 多表查询：会员信息、团课信息、会员卡信息
+        return request.bodyToMono(UpdateMemberInfoDto.class)
-
+                .flatMap(updateDto -> memberService.adminUpdateMemberInfo(memberId, updateDto))
-        return ServerResponse.ok()
+                .flatMap(detail -> ServerResponse.ok()
-                .contentType(MediaType.APPLICATION_JSON)
+                        .contentType(MediaType.APPLICATION_JSON)
-                .bodyValue("成功");
+                        .bodyValue(detail));
     }
 
-    /**
+    @Operation(summary = "搜索会员列表", description = "后台管理员按关键词搜索会员，支持性别筛选和分页")
-     * 前台搜索会员列表
-     *
-     * GET /api/admin/members?searchValue=手机号/姓名/会员号&filter=男/女&pageNum=1&pageSize=10
-     * header: { "Authorization": "Bearer xxx" }
-     */
     public Mono<ServerResponse> searchMembers(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
 
         String keyword = request.queryParam("searchValue").orElse(null);
-        String filter = request.queryParam("filter").orElse(null);
+        Integer pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
-        int pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
+        Integer pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);
-        int pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);
 
-        log.info("前台搜索会员列表, adminId: {}, keyword: {}, filter: {}, pageNum: {}, pageSize: {}",
+        log.info("前台搜索会员列表, adminId: {}, keyword: {},pageNum: {}, pageSize: {}",
-                adminId, keyword, filter, pageNum, pageSize);
+                adminId, keyword, pageNum, pageSize);
 
-        return memberService.searchMember(new SearchMemberDto(keyword, filter, pageNum, pageSize))
+        return memberService.searchMember(new SearchMemberDto(keyword, pageNum, pageSize))
                 .map(member -> {
                     // 解密手机号
                     if (member.getPhone() != null && !member.getPhone().isEmpty()) {
                         try {
-                            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
+                            String decryptedPhone = AesUtil.decrypt(member.getPhone());
-                            String iv = wechatProperties.getPhoneEncryption().getIv();
+                            member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
-                            String decryptedPhone = AesUtil.decrypt(member.getPhone(), secretKey, iv);
-                            member.setPhone(decryptedPhone);
                         } catch (Exception e) {
                             log.error("手机号解密失败, memberId: {}", member.getId(), e);
                             member.setPhone(null);
@@ -249,12 +209,7 @@ public class MemberHandler {
     }
 
 
-    /**
+    @Operation(summary = "查看会员列表", description = "后台管理员分页查看所有会员列表")
-     * 前台查看会员列表
-     *
-     * GET /api/admin/members/all?pageNum=1&pageSize=10
-     * header: { "Authorization": "Bearer xxx" }
-     */
     public Mono<ServerResponse> getAllMembers(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
@@ -263,16 +218,15 @@ public class MemberHandler {
         int pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);
 
         log.info("前台查看会员列表, adminId: {}, pageNum: {}, pageSize: {}", adminId, pageNum, pageSize);
+        // TODO: 补充签到记录
 
         return memberService.findAll(pageNum, pageSize)
                 .map(member -> {
                     // 解密手机号
                     if (member.getPhone() != null && !member.getPhone().isEmpty()) {
                         try {
-                            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
+                            String decryptedPhone = AesUtil.decrypt(member.getPhone());
-                            String iv = wechatProperties.getPhoneEncryption().getIv();
+                            member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
-                            String decryptedPhone = AesUtil.decrypt(member.getPhone(), secretKey, iv);
-                            member.setPhone(decryptedPhone);
                         } catch (Exception e) {
                             log.error("手机号解密失败, memberId: {}", member.getId(), e);
                             member.setPhone(null);

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/WechatAuthHandler.java

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.member.handler;
 
 import cn.novalon.gym.manage.member.dto.WechatLoginDto;
 import cn.novalon.gym.manage.member.service.WechatAuthService;
+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;
@@ -20,20 +22,13 @@ import reactor.core.publisher.Mono;
 @Slf4j
 @Component
 @RequiredArgsConstructor
+@Tag(name = "微信认证", description = "微信小程序登录、公众号回调等")
 public class WechatAuthHandler {
 
     private final WechatAuthService wechatAuthService;
     private final WechatOfficialEventHandler wechatOfficialEventHandler;
 
-    /**
+    @Operation(summary = "微信小程序登录", description = "通过微信小程序code获取session_key，完成会员登录或注册")
-     * 小程序更新
-     * 
-     * POST /api/member/auth/miniapp/login
-     * Body: {"code": "wx_login_code"}
-     * 
-     * @param request ServerRequest
-     * @return Mono<ServerResponse> 登录响应
-     */
     public Mono<ServerResponse> miniappLogin(ServerRequest request) {
         log.info("收到小程序登录请求");
         
@@ -50,18 +45,12 @@ public class WechatAuthHandler {
                 });
     }
 
-    /**
+    @Operation(summary = "微信公众号回调", description = "处理微信公众号事件（关注、取消关注等）")
-     * 公众号回调
-     * 
-     * POST /api/member/auth/mp/callback
-     * Body: <xml><Event>subscribe</Event><FromUserName>openid</FromUserName></xml>
-     * 
-     */
     public Mono<ServerResponse> mpCallback(ServerRequest request) {
         return wechatOfficialEventHandler.handleEvent(request);
     }
 
-    // 验证微信公众号签名
+    @Operation(summary = "验证微信公众号签名", description = "微信公众号服务器验证，返回echostr")
     public Mono<ServerResponse> verifyMpSignature(ServerRequest request) {
         return wechatOfficialEventHandler.verifySignature(request);
     }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/WechatOfficialEventHandler.java

@@ -39,9 +39,6 @@ public class WechatOfficialEventHandler {
         return request.bodyToMono(String.class)
                 .flatMap(xmlBody -> {
                     log.info("收到微信公众号事件 {}", xmlBody);
-
-                    // TODO: 将XML解析为WechatOfficialEventDto
-                    // 目前简化处理直接获取openId和event
                     
                     String openId = extractOpenId(xmlBody);
                     String event = extractEvent(xmlBody);

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/IMemberRepository.java

@@ -1,7 +1,9 @@
 package cn.novalon.gym.manage.member.repository;
 
 import cn.novalon.gym.manage.member.entity.Member;
+import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
@@ -30,7 +32,44 @@ public interface IMemberRepository extends R2dbcRepository<Member, Long> {
 
     /**
      * 分页查询所有会员
-     * 方法名 findAllBy 是 Spring Data 的约定，表示按条件查询所有
      */
     Flux<Member> findAllBy(Pageable pageable);
+
+    /**
+     * 查询会员的所有卡片
+     */
+    @Query("SELECT " +
+            "   r.id, " +
+            "   r.member_card_record_id, " +
+            "   r.member_id, " +
+            "   r.member_card_id, " +
+            "   r.status, " +
+            "   r.remaining_times, " +
+            "   r.remaining_amount, " +
+            "   r.expire_time, " +
+            "   r.purchase_time, " +
+            "   r.source_order_id, " +
+            "   r.created_at, " +
+            "   r.updated_at, " +
+            "   r.version, " +
+            "   r.card_composition, " +
+            "   c.id AS card_id, " +
+            "   c.member_card_id, " +
+            "   c.member_card_name, " +
+            "   c.member_card_type, " +
+            "   c.member_card_price, " +
+            "   c.member_card_validity_days, " +
+            "   c.member_card_total_times, " +
+            "   c.member_card_amount, " +
+            "   c.member_card_status, " +
+            "   c.extra_config, " +
+            "   c.created_at AS card_created_at, " +
+            "   c.updated_at AS card_updated_at " +
+            "FROM member_card_record r " +
+            "LEFT JOIN member_card c ON r.member_card_id = c.id " +
+            "WHERE r.member_id = :memberId " +
+            "AND r.deleted_at IS NULL " +
+            "AND c.deleted_at IS NULL " +
+            "ORDER BY r.created_at DESC")
+    Flux<MemberCardInfoVO> findCardRecordsWithCardInfoByMemberId(Long memberId);
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRecordRepository.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * 会员卡记录 Repository（会员持有的卡）
- * 
+ *
  * @author 付嘉
  * @date 2026-05-27
  */

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/MemberService.java

@@ -4,6 +4,7 @@ import cn.novalon.gym.manage.member.dto.SearchMemberDto;
 import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
 import cn.novalon.gym.manage.member.entity.Member;
 import cn.novalon.gym.manage.member.es.entity.MemberES;
+import cn.novalon.gym.manage.member.vo.MemberDetailVO;
 import cn.novalon.gym.manage.member.vo.MemberInfoVO;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -58,4 +59,21 @@ public interface MemberService {
      * @return 所有会员信息
      */
     Flux<Member> findAll(Integer pageNum, Integer pageSize);
+
+    /**
+     * 前台管理端获取会员详情（含会员卡信息）
+     *
+     * @param memberId 会员ID
+     * @return 会员详情
+     */
+    Mono<MemberDetailVO> getMemberDetail(Long memberId);
+
+    /**
+     * 前台管理端编辑会员信息
+     *
+     * @param memberId 会员ID
+     * @param updateDto 更新信息DTO
+     * @return 更新后的会员详情
+     */
+    Mono<Boolean> adminUpdateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto);
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java

@@ -3,6 +3,8 @@ package cn.novalon.gym.manage.member.service.impl;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -16,17 +18,35 @@ import java.time.LocalDateTime;
  * @author 付嘉
  * @date 2026-05-27
  */
+@Slf4j
 @Service
 public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
     private final MemberCardRecordRepository memberCardRecordRepository;
+    private final RedisUtil redisUtil;
 
-    public MemberCardRecordServiceImpl(MemberCardRecordRepository memberCardRecordRepository) {
+    private static final String MEMBER_CARD_RECORD_CACHE_PREFIX = "member:card:record:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+
+    public MemberCardRecordServiceImpl(MemberCardRecordRepository memberCardRecordRepository, RedisUtil redisUtil) {
         this.memberCardRecordRepository = memberCardRecordRepository;
+        this.redisUtil = redisUtil;
     }
 
     @Override
     public Mono<MemberCardRecord> findById(Long recordId) {
-        return memberCardRecordRepository.findById(recordId);
+        String cacheKey = MEMBER_CARD_RECORD_CACHE_PREFIX + recordId;
+        Object cached = redisUtil.get(cacheKey);
+        if (cached != null && cached instanceof MemberCardRecord) {
+            log.debug("从缓存获取会员卡记录, recordId: {}", recordId);
+            return Mono.just((MemberCardRecord) cached);
+        }
+
+        return memberCardRecordRepository.findById(recordId)
+                .doOnSuccess(record -> {
+                    if (record != null) {
+                        redisUtil.setWithExpire(cacheKey, record, CACHE_EXPIRE_SECONDS);
+                    }
+                });
     }
 
     @Override
@@ -53,17 +73,32 @@ public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
 
     @Override
     public Mono<Integer> deductUsage(Long recordId, Integer deductTimes, Double deductAmount) {
-        return memberCardRecordRepository.deductUsage(recordId, deductTimes, deductAmount);
+        return memberCardRecordRepository.deductUsage(recordId, deductTimes, deductAmount)
+                .doOnSuccess(updated -> {
+                    if (updated > 0) {
+                        clearRecordCache(recordId);
+                    }
+                });
     }
 
     @Override
     public Mono<Integer> renewCard(Long recordId, Integer addTimes, Double addAmount, LocalDateTime newExpireTime) {
-        return memberCardRecordRepository.renewCard(recordId, addTimes, addAmount, newExpireTime);
+        return memberCardRecordRepository.renewCard(recordId, addTimes, addAmount, newExpireTime)
+                .doOnSuccess(updated -> {
+                    if (updated > 0) {
+                        clearRecordCache(recordId);
+                    }
+                });
     }
 
     @Override
     public Mono<Integer> updateStatus(Long recordId, String status) {
-        return memberCardRecordRepository.updateStatus(recordId, status);
+        return memberCardRecordRepository.updateStatus(recordId, status)
+                .doOnSuccess(updated -> {
+                    if (updated > 0) {
+                        clearRecordCache(recordId);
+                    }
+                });
     }
 
     @Override
@@ -80,4 +115,10 @@ public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
     public Flux<MemberCardRecord> findExpiredCards() {
         return memberCardRecordRepository.findExpiredCards();
     }
+
+    private void clearRecordCache(Long recordId) {
+        String cacheKey = MEMBER_CARD_RECORD_CACHE_PREFIX + recordId;
+        redisUtil.delete(cacheKey);
+        log.debug("清除会员卡记录缓存, recordId: {}", recordId);
+    }
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java

@@ -15,6 +15,7 @@ import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
 import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,10 @@ public class MemberCardServiceImpl implements IMemberCardService {
     private final DistributedLockService distributedLockService;
     private final ExpirationReminderService expirationReminderService;
     private final RefundSagaHandler refundSagaHandler;
+    private final RedisUtil redisUtil;
+
+    private static final String MEMBER_CARD_CACHE_PREFIX = "member:card:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
 
     public MemberCardServiceImpl(MemberCardRepository memberCardRepository,
                                  MemberCardRecordRepository recordRepository,
@@ -46,7 +51,8 @@ public class MemberCardServiceImpl implements IMemberCardService {
                                  MemberCardStateMachine stateMachine,
                                  DistributedLockService distributedLockService,
                                  ExpirationReminderService expirationReminderService,
-                                 RefundSagaHandler refundSagaHandler) {
+                                 RefundSagaHandler refundSagaHandler,
+                                 RedisUtil redisUtil) {
         this.memberCardRepository = memberCardRepository;
         this.recordRepository = recordRepository;
         this.transactionService = transactionService;
@@ -54,11 +60,24 @@ public class MemberCardServiceImpl implements IMemberCardService {
         this.distributedLockService = distributedLockService;
         this.expirationReminderService = expirationReminderService;
         this.refundSagaHandler = refundSagaHandler;
+        this.redisUtil = redisUtil;
     }
 
     @Override
     public Mono<MemberCard> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId) {
-        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId);
+        String cacheKey = MEMBER_CARD_CACHE_PREFIX + memberCardId;
+        Object cached = redisUtil.get(cacheKey);
+        if (cached != null && cached instanceof MemberCard) {
+            log.debug("从缓存获取会员卡信息, memberCardId: {}", memberCardId);
+            return Mono.just((MemberCard) cached);
+        }
+
+        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
+                .doOnSuccess(card -> {
+                    if (card != null) {
+                        redisUtil.setWithExpire(cacheKey, card, CACHE_EXPIRE_SECONDS);
+                    }
+                });
     }
 
     @Override
@@ -95,7 +114,12 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
     @Override
     public Mono<MemberCard> save(MemberCard entity) {
-        return memberCardRepository.save(entity);
+        return memberCardRepository.save(entity)
+                .doOnSuccess(saved -> {
+                    if (saved.getMemberCardId() != null) {
+                        clearCardCache(saved.getMemberCardId());
+                    }
+                });
     }
 
     @Override
@@ -329,4 +353,10 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
         return transactionService.createTransaction(transaction);
     }
+
+    private void clearCardCache(Long memberCardId) {
+        String cacheKey = MEMBER_CARD_CACHE_PREFIX + memberCardId;
+        redisUtil.delete(cacheKey);
+        log.debug("清除会员卡缓存, memberCardId: {}", memberCardId);
+    }
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberServiceImpl.java

@@ -4,28 +4,35 @@ import cn.novalon.gym.manage.common.exception.ConflictException;
 import cn.novalon.gym.manage.common.exception.ErrorCode;
 import cn.novalon.gym.manage.common.exception.NotFoundException;
 import cn.novalon.gym.manage.common.exception.SystemException;
-import cn.novalon.gym.manage.member.config.WechatProperties;
+import cn.novalon.gym.manage.common.util.HtmlEscapeUtil;
 import cn.novalon.gym.manage.member.dto.SearchMemberDto;
 import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
 import cn.novalon.gym.manage.member.entity.Member;
+import cn.novalon.gym.manage.member.enums.GenderEnum;
+import cn.novalon.gym.manage.member.enums.MemberCardType;
 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.service.MemberService;
 import cn.novalon.gym.manage.member.util.AesUtil;
+import cn.novalon.gym.manage.member.util.BeanConvertUtil;
 import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
+import cn.novalon.gym.manage.member.vo.MemberDetailVO;
 import cn.novalon.gym.manage.member.vo.MemberInfoVO;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 会员服务实现
@@ -41,10 +48,14 @@ public class MemberServiceImpl implements MemberService {
     private final IMemberRepository memberRepository;
     private final MemberESRepository memberESRepository;
     private final EsSyncUtils esSyncUtils;
-    private final WechatProperties wechatProperties;
+    private final RedisUtil redisUtil;
 
     private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
 
+    private static final String MEMBER_INFO_CACHE_PREFIX = "member:info:";
+    private static final String MEMBER_DETAIL_CACHE_PREFIX = "member:detail:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+
     @PostConstruct
     public void init() {
         this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
@@ -52,12 +63,23 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     public Mono<MemberInfoVO> getMemberInfo(Long memberId) {
-        return memberRepository.findById(memberId)
+        String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
-                .map(this::buildMemberInfoResponse)
+
-                .switchIfEmpty(Mono.error(() -> {
+        return redisUtil.get(cacheKey, MemberInfoVO.class)
-                    log.error("会员不存在: memberId={}", memberId);
+                .flatMap(cached -> {
-                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                    if (cached != null) {
-                }));
+                        log.debug("从缓存获取会员信息, memberId: {}", memberId);
+                        return Mono.just(cached);
+                    }
+                    return memberRepository.findById(memberId)
+                            .map(this::buildMemberInfoResponse)
+                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                                    .then(Mono.just(vo)))
+                            .switchIfEmpty(Mono.error(() -> {
+                                log.error("会员不存在: memberId={}", memberId);
+                                throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                            }));
+                });
     }
 
     @Override
@@ -67,10 +89,10 @@ public class MemberServiceImpl implements MemberService {
         return memberRepository.findById(memberId)
                 .flatMap(member -> {
                     if (updateDto.getNickname() != null) {
-                        member.setNickname(updateDto.getNickname());
+                        member.setNickname(HtmlEscapeUtil.escape(updateDto.getNickname()));
                     }
                     if (updateDto.getGender() != null) {
-                        member.setGender(updateDto.getGender());
+                        member.setGender(updateDto.getGender().getCode());
                     }
                     if (updateDto.getBirthday() != null) {
                         member.setBirthday(updateDto.getBirthday());
@@ -79,12 +101,16 @@ public class MemberServiceImpl implements MemberService {
                         member.setAvatar(updateDto.getAvatar());
                     }
                     if (updateDto.getAddress() != null) {
-                        member.setAddress(updateDto.getAddress());
+                        member.setAddress(HtmlEscapeUtil.escape(updateDto.getAddress()));
                     }
 
                     return memberRepository.save(member);
                 })
-                .doOnSuccess(memberSyncer::sync)
+                .flatMap(savedMember -> {
+                    memberSyncer.sync(savedMember);
+                    return clearMemberCache(memberId)
+                            .then(Mono.just(savedMember));
+                })
                 .map(savedMember -> {
                     log.info("会员信息更新成功, memberId: {}", savedMember.getId());
                     return buildMemberInfoResponse(savedMember);
@@ -99,11 +125,14 @@ public class MemberServiceImpl implements MemberService {
         String phone = member.getPhone();
         String maskedPhone = phone != null ? phone.replace(phone.substring(3, 7), "****") : null;
 
+        GenderEnum genderEnum = GenderEnum.fromCode(member.getGender());
+
         return MemberInfoVO.builder()
                 .id(member.getId())
                 .nickname(member.getNickname())
                 .phone(maskedPhone)
-                .gender(member.getGender())
+                .gender(genderEnum)
+                .genderDesc(genderEnum.getDesc())
                 .birthday(member.getBirthday())
                 .avatar(member.getAvatar())
                 .hasPhone(phone != null)
@@ -117,9 +146,7 @@ public class MemberServiceImpl implements MemberService {
 
         String encryptedPhone;
         try {
-            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
+            encryptedPhone = AesUtil.encrypt(phone);
-            String iv = wechatProperties.getPhoneEncryption().getIv();
-            encryptedPhone = AesUtil.encrypt(phone, secretKey, iv);
             log.info("手机号加密成功");
         } catch (Exception e) {
             log.error("手机号加密失败", e);
@@ -145,32 +172,32 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     public Flux<MemberES> searchMember(SearchMemberDto searchMemberDto) {
-        log.info("搜索会员, searchValue: {}, filter: {}, pageNum: {}, pageSize: {}",
+        log.info("搜索会员, searchValue: {}, pageNum: {}, pageSize: {}",
                 searchMemberDto.getSearchValue(),
-                searchMemberDto.getFilter(),
                 searchMemberDto.getPageNum(),
                 searchMemberDto.getPageSize());
 
         String searchValue = searchMemberDto.getSearchValue();
 
-        if(searchValue != null && searchValue.matches("^1[3-9]\\d{9}$")){
+        if (searchValue != null && searchValue.matches("^1[3-9]\\d{9}$")) {
             log.debug("搜索值为手机号格式，进行加密处理");
-            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
+            searchValue = AesUtil.encrypt(searchValue);
-            String iv = wechatProperties.getPhoneEncryption().getIv();
-            searchValue = AesUtil.encrypt(searchValue,secretKey,iv);
         }
 
         Pageable pageable = PageRequest.of(
                 searchMemberDto.getPageNum() - 1,
-                searchMemberDto.getPageSize(),
+                searchMemberDto.getPageSize()
-                Sort.by(Sort.Direction.DESC, "update_at")
         );
 
-        return memberESRepository.findByMemberNoOrPhoneOrNicknameContainingAndGender(
+        if (searchValue == null) {
+            log.warn("搜索值为空，返回空结果");
+            return Flux.empty();
+        }
+
+        return memberESRepository.findByMemberNoOrPhoneOrNicknameContaining(
                 searchValue,
                 searchValue,
                 searchValue,
-                searchMemberDto.getFilter() ,
                 pageable
         );
     }
@@ -187,6 +214,99 @@ public class MemberServiceImpl implements MemberService {
         return memberRepository.findAllBy(pageable);
     }
 
+    @Override
+    public Mono<MemberDetailVO> getMemberDetail(Long memberId) {
+        log.info("查询会员详情, memberId: {}", memberId);
+
+        String cacheKey = MEMBER_DETAIL_CACHE_PREFIX + memberId;
+
+        return redisUtil.get(cacheKey, MemberDetailVO.class)
+                .flatMap(cached -> {
+                    if (cached != null) {
+                        log.debug("从缓存获取会员详情, memberId: {}", memberId);
+                        return Mono.just(cached);
+                    }
+                    return memberRepository.findById(memberId)
+                            .zipWith(
+                                    memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
+                                            .collectList(),
+                                    (baseInfo, cardList) -> {
+                                        MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
+
+                                        GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
+                                        memberDetailVO.setGenderDesc(genderEnum.getDesc());
+
+                                        List<MemberCardInfoVO> enrichedCards = cardList.stream()
+                                                .peek(vo -> {
+                                                    if (vo.getMemberCardType() != null) {
+                                                        try {
+                                                            MemberCardType cardType = MemberCardType.valueOf(vo.getMemberCardType());
+                                                            vo.setMemberCardTypeDesc(cardType.getDesc());
+                                                        } catch (IllegalArgumentException e) {
+                                                            vo.setMemberCardTypeDesc(vo.getMemberCardType());
+                                                        }
+                                                    }
+                                                    if (vo.getMemberCardStatus() != null) {
+                                                        vo.setMemberCardStatusDesc(vo.getMemberCardStatus() == 1 ? "上架" : "下架");
+                                                    }
+                                                })
+                                                .collect(Collectors.toList());
+                                        memberDetailVO.setMemberCards(enrichedCards);
+
+                                        long activeCount = enrichedCards.stream()
+                                                .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
+                                                .count();
+                                        memberDetailVO.setActiveCardCount((int) activeCount);
+                                        memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
+
+                                        return memberDetailVO;
+                                    }
+                            )
+                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                                    .then(Mono.just(vo)));
+                });
+    }
+
+
+    @Override
+    public Mono<Boolean> adminUpdateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto) {
+        log.info("前台管理端编辑会员信息, memberId: {}", memberId);
+
+        return memberRepository.findById(memberId)
+                .switchIfEmpty(Mono.error(() -> {
+                    log.error("会员不存在: memberId={}", memberId);
+                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                }))
+                .flatMap(member -> {
+                    if (updateDto.getNickname() != null) {
+                        member.setNickname(HtmlEscapeUtil.escape(updateDto.getNickname()));
+                    }
+                    if (updateDto.getGender() != null) {
+                        member.setGender(updateDto.getGender().getCode());
+                    }
+                    if (updateDto.getBirthday() != null) {
+                        member.setBirthday(updateDto.getBirthday());
+                    }
+                    if (updateDto.getAvatar() != null) {
+                        member.setAvatar(updateDto.getAvatar());
+                    }
+                    if (updateDto.getAddress() != null) {
+                        member.setAddress(HtmlEscapeUtil.escape(updateDto.getAddress()));
+                    }
+
+                    return memberRepository.save(member);
+                })
+                .flatMap(savedMember -> {
+                    memberSyncer.sync(savedMember);
+                    return clearMemberCache(memberId)
+                            .then(Mono.just(true));
+                })
+                .onErrorResume(e -> {
+                    log.error("编辑会员信息失败, memberId: {}, error: {}", memberId, e.getMessage(), e);
+                    return Mono.just(false);
+                });
+    }
+
     private Mono<Boolean> updateMemberPhone(Long memberId, String encryptedPhone) {
         return memberRepository.findById(memberId)
                 .flatMap(member -> {
@@ -194,7 +314,11 @@ public class MemberServiceImpl implements MemberService {
                     member.setLastLoginAt(LocalDateTime.now());
 
                     return memberRepository.save(member)
-                            .doOnSuccess(memberSyncer::sync)
+                            .flatMap(savedMember -> {
+                                memberSyncer.sync(savedMember);
+                                return clearMemberCache(memberId)
+                                        .then(Mono.just(savedMember));
+                            })
                             .map(savedMember -> {
                                 log.info("手机号录入成功, memberId: {}", savedMember.getId());
                                 return true;
@@ -205,4 +329,12 @@ public class MemberServiceImpl implements MemberService {
                     throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
                 }));
     }
-}
+
+    private Mono<Long> clearMemberCache(Long memberId) {
+        String infoCacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
+        String detailCacheKey = MEMBER_DETAIL_CACHE_PREFIX + memberId;
+        return redisUtil.delete(infoCacheKey)
+                .then(redisUtil.delete(detailCacheKey))
+                .doOnSuccess(result -> log.debug("清除会员缓存, memberId: {}", memberId));
+    }
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java

@@ -1,9 +1,11 @@
 package cn.novalon.gym.manage.member.service.impl;
 
+import cn.novalon.gym.manage.common.util.HtmlEscapeUtil;
 import cn.novalon.gym.manage.member.entity.RefundApplication;
 import cn.novalon.gym.manage.member.enums.RefundStatus;
 import cn.novalon.gym.manage.member.repository.RefundApplicationRepository;
 import cn.novalon.gym.manage.member.service.IRefundApplicationService;
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -21,9 +23,14 @@ import java.time.LocalDateTime;
 public class RefundApplicationServiceImpl implements IRefundApplicationService {
 
     private final RefundApplicationRepository refundApplicationRepository;
+    private final RedisUtil redisUtil;
 
-    public RefundApplicationServiceImpl(RefundApplicationRepository refundApplicationRepository) {
+    private static final String REFUND_APPLICATION_CACHE_PREFIX = "member:refund:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+
+    public RefundApplicationServiceImpl(RefundApplicationRepository refundApplicationRepository, RedisUtil redisUtil) {
         this.refundApplicationRepository = refundApplicationRepository;
+        this.redisUtil = redisUtil;
     }
 
     @Override
@@ -38,14 +45,16 @@ public class RefundApplicationServiceImpl implements IRefundApplicationService {
                 .then(Mono.defer(() -> {
                     RefundApplication application = RefundApplication.builder()
                             .recordId(recordId)
-                            .reason(reason)
+                            .reason(HtmlEscapeUtil.escape(reason))
                             .status(RefundStatus.PENDING)
                             .applyTime(LocalDateTime.now())
                             .build();
 
                     return refundApplicationRepository.save(application)
-                            .doOnSuccess(app -> log.info("创建退款申请成功: applicationId={}, recordId={}",
+                            .doOnSuccess(app -> {
-                                app.getId(), recordId));
+                                log.info("创建退款申请成功: applicationId={}, recordId={}", app.getId(), recordId);
+                                clearRefundCache(recordId);
+                            });
                 }));
     }
 
@@ -54,14 +63,19 @@ public class RefundApplicationServiceImpl implements IRefundApplicationService {
         return refundApplicationRepository.findById(applicationId)
                 .switchIfEmpty(Mono.error(new RuntimeException("退款申请不存在")))
                 .flatMap(application -> {
-                    if (!"PENDING".equals(application.getStatus())) {
+                    if (application.getStatus() != RefundStatus.PENDING) {
                         return Mono.error(new RuntimeException("退款申请状态不正确，当前状态: " + application.getStatus()));
                     }
 
-                    return refundApplicationRepository.approve(applicationId, "APPROVED", auditorId, remark)
+                    return refundApplicationRepository.approve(applicationId, "APPROVED", auditorId, HtmlEscapeUtil.escape(remark))
-                            .thenReturn(application)
+                            .flatMap(updatedRows -> {
-                            .doOnSuccess(app -> log.info("批准退款申请成功: applicationId={}, auditorId={}",
+                                if (updatedRows == 0) {
-                                applicationId, auditorId));
+                                    return Mono.error(new RuntimeException("批准退款申请失败"));
+                                }
+                                clearRefundCache(application.getRecordId());
+                                log.info("批准退款申请成功: applicationId={}, auditorId={}", applicationId, auditorId);
+                                return refundApplicationRepository.findById(applicationId);
+                            });
                 });
     }
 
@@ -70,19 +84,42 @@ public class RefundApplicationServiceImpl implements IRefundApplicationService {
         return refundApplicationRepository.findById(applicationId)
                 .switchIfEmpty(Mono.error(new RuntimeException("退款申请不存在")))
                 .flatMap(application -> {
-                    if (!"PENDING".equals(application.getStatus())) {
+                    if (application.getStatus() != RefundStatus.PENDING) {
                         return Mono.error(new RuntimeException("退款申请状态不正确，当前状态: " + application.getStatus()));
                     }
 
-                    return refundApplicationRepository.approve(applicationId, "REJECTED", auditorId, remark)
+                    return refundApplicationRepository.approve(applicationId, "REJECTED", auditorId, HtmlEscapeUtil.escape(remark))
-                            .thenReturn(application)
+                            .flatMap(updatedRows -> {
-                            .doOnSuccess(app -> log.info("拒绝退款申请成功: applicationId={}, auditorId={}",
+                                if (updatedRows == 0) {
-                                applicationId, auditorId));
+                                    return Mono.error(new RuntimeException("拒绝退款申请失败"));
+                                }
+                                clearRefundCache(application.getRecordId());
+                                log.info("拒绝退款申请成功: applicationId={}, auditorId={}", applicationId, auditorId);
+                                return refundApplicationRepository.findById(applicationId);
+                            });
                 });
     }
 
     @Override
     public Mono<RefundApplication> findByRecordId(Long recordId) {
-        return refundApplicationRepository.findByRecordId(recordId);
+        String cacheKey = REFUND_APPLICATION_CACHE_PREFIX + recordId;
+        Object cached = redisUtil.get(cacheKey);
+        if (cached != null && cached instanceof RefundApplication) {
+            log.debug("从缓存获取退款申请, recordId: {}", recordId);
+            return Mono.just((RefundApplication) cached);
+        }
+
+        return refundApplicationRepository.findByRecordId(recordId)
+                .doOnSuccess(application -> {
+                    if (application != null) {
+                        redisUtil.setWithExpire(cacheKey, application, CACHE_EXPIRE_SECONDS);
+                    }
+                });
+    }
+
+    private void clearRefundCache(Long recordId) {
+        String cacheKey = REFUND_APPLICATION_CACHE_PREFIX + recordId;
+        redisUtil.delete(cacheKey);
+        log.debug("清除退款申请缓存, recordId: {}", recordId);
     }
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatApiServiceImpl.java

@@ -4,6 +4,7 @@ import cn.novalon.gym.manage.common.exception.ErrorCode;
 import cn.novalon.gym.manage.common.exception.SystemException;
 import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.service.WechatApiService;
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -30,6 +31,10 @@ import java.util.Map;
 public class WechatApiServiceImpl implements WechatApiService {
 
     private final WechatProperties wechatProperties;
+    private final RedisUtil redisUtil;
+
+    private static final String ACCESS_TOKEN_CACHE_PREFIX = "wechat:access_token:";
+    private static final long ACCESS_TOKEN_EXPIRE_SECONDS = 7000;  // 比官方过期时间短100秒
 
     private final WebClient webClient = WebClient.builder()
             .baseUrl("https://api.weixin.qq.com")
@@ -147,35 +152,46 @@ public class WechatApiServiceImpl implements WechatApiService {
     public Mono<String> getAccessToken(String appType) {
         log.debug("获取access_token, appType: {}", appType);
 
-        String appId, appSecret;
+        String cacheKey = ACCESS_TOKEN_CACHE_PREFIX + appType;
-        if ("miniapp".equals(appType)) {
-            appId = wechatProperties.getMiniapp().getAppId();
-            appSecret = wechatProperties.getMiniapp().getAppSecret();
-        } else {
-            appId = wechatProperties.getMp().getAppId();
-            appSecret = wechatProperties.getMp().getAppSecret();
-        }
 
-        return webClient.get()
+        return redisUtil.get(cacheKey, String.class)
-                .uri(uriBuilder -> uriBuilder
+                .flatMap(cachedToken -> {
-                        .path("/cgi-bin/token")
+                    if (cachedToken != null) {
-                        .queryParam("grant_type", "client_credential")
+                        log.debug("从缓存获取access_token, appType: {}", appType);
-                        .queryParam("appid", appId)
+                        return Mono.just(cachedToken);
-                        .queryParam("secret", appSecret)
-                        .build())
-                .retrieve()
-                .bodyToMono(Map.class)
-                .map(response -> {
-                    if (response.containsKey("access_token")) {
-                        String accessToken = (String) response.get("access_token");
-                        Integer expiresIn = (Integer) response.get("expires_in");
-                        log.info("获取access_token成功, expires_in: {}s", expiresIn);
-                        return accessToken;
-                    } else {
-                        String errmsg = (String) response.get("errmsg");
-                        log.error("获取access_token失败: {}", errmsg);
-                        throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "获取access_token失败: " + errmsg);
                     }
+
+                    String appId, appSecret;
+                    if ("miniapp".equals(appType)) {
+                        appId = wechatProperties.getMiniapp().getAppId();
+                        appSecret = wechatProperties.getMiniapp().getAppSecret();
+                    } else {
+                        appId = wechatProperties.getMp().getAppId();
+                        appSecret = wechatProperties.getMp().getAppSecret();
+                    }
+
+                    return webClient.get()
+                            .uri(uriBuilder -> uriBuilder
+                                    .path("/cgi-bin/token")
+                                    .queryParam("grant_type", "client_credential")
+                                    .queryParam("appid", appId)
+                                    .queryParam("secret", appSecret)
+                                    .build())
+                            .retrieve()
+                            .bodyToMono(Map.class)
+                            .flatMap(response -> {
+                                if (response.containsKey("access_token")) {
+                                    String accessToken = (String) response.get("access_token");
+                                    Integer expiresIn = (Integer) response.get("expires_in");
+                                    log.info("获取access_token成功, expires_in: {}s", expiresIn);
+                                    return redisUtil.setWithExpire(cacheKey, accessToken, ACCESS_TOKEN_EXPIRE_SECONDS)
+                                            .then(Mono.just(accessToken));
+                                } else {
+                                    String errmsg = (String) response.get("errmsg");
+                                    log.error("获取access_token失败: {}", errmsg);
+                                    throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "获取access_token失败: " + errmsg);
+                                }
+                            });
                 });
     }
 

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatAuthServiceImpl.java

@@ -4,7 +4,6 @@ import cn.novalon.gym.manage.common.exception.ConflictException;
 import cn.novalon.gym.manage.common.exception.ErrorCode;
 import cn.novalon.gym.manage.common.exception.NotFoundException;
 import cn.novalon.gym.manage.common.exception.SystemException;
-import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.dto.WechatLoginDto;
 import cn.novalon.gym.manage.member.entity.Member;
 import cn.novalon.gym.manage.member.es.entity.MemberES;
@@ -15,6 +14,7 @@ import cn.novalon.gym.manage.member.service.WechatAuthService;
 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.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.util.WechatPhoneUtil;
 import cn.novalon.gym.manage.member.vo.WechatLoginVO;
 import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
@@ -42,14 +42,17 @@ public class WechatAuthServiceImpl implements WechatAuthService {
 
     private final WechatApiService wechatApiService;
     private final IMemberRepository memberRepository;
-    private final WechatProperties wechatProperties;
     private final WechatPhoneUtil wechatPhoneUtil;
     private final MemberESRepository memberESRepository;
     private final EsSyncUtils esSyncUtils;
     private final JwtTokenProvider jwtTokenProvider;
+    private final RedisUtil redisUtil;
 
     private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
 
+    private static final String MEMBER_INFO_CACHE_PREFIX = "member:info:";
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+
     @PostConstruct
     public void init() {
         this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
@@ -79,7 +82,10 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                                         member.setLastLoginAt(LocalDateTime.now());
 
                                         return memberRepository.save(member)
-                                                .doOnSuccess(memberSyncer::sync)
+                                                .doOnSuccess(saved -> {
+                                                    memberSyncer.sync(saved);
+                                                    clearMemberCache(saved.getId());
+                                                })
                                                 .flatMap(savedMember -> {
                                                     WechatLoginVO response = buildLoginResponse(savedMember, false, sessionKey);
                                                     return Mono.just(response);
@@ -89,7 +95,10 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                                         member.setLastLoginAt(LocalDateTime.now());
 
                                         return memberRepository.save(member)
-                                                .doOnSuccess(memberSyncer::sync)
+                                                .doOnSuccess(saved -> {
+                                                    memberSyncer.sync(saved);
+                                                    clearMemberCache(saved.getId());
+                                                })
                                                 .flatMap(savedMember -> {
                                                     WechatLoginVO response = buildLoginResponse(savedMember, false, sessionKey);
                                                     return Mono.just(response);
@@ -105,7 +114,10 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                                                 member.setLastLoginAt(LocalDateTime.now());
 
                                                 return memberRepository.save(member)
-                                                        .doOnSuccess(memberSyncer::sync)
+                                                        .doOnSuccess(saved -> {
+                                                            memberSyncer.sync(saved);
+                                                            clearMemberCache(saved.getId());
+                                                        })
                                                         .flatMap(savedMember -> {
                                                             WechatLoginVO response = buildLoginResponse(savedMember, false, sessionKey);
                                                             return Mono.just(response);
@@ -124,7 +136,10 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                                     member.setLastLoginAt(LocalDateTime.now());
 
                                     return memberRepository.save(member)
-                                            .doOnSuccess(memberSyncer::sync)
+                                            .doOnSuccess(saved -> {
+                                                memberSyncer.sync(saved);
+                                                clearMemberCache(saved.getId());
+                                            })
                                             .flatMap(savedMember -> {
                                                 WechatLoginVO response = buildLoginResponse(savedMember, false, sessionKey);
                                                 return Mono.just(response);
@@ -185,7 +200,10 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                     member.setPhone(encryptedPhone);
                     member.setLastLoginAt(LocalDateTime.now());
                     return memberRepository.save(member)
-                            .doOnSuccess(memberSyncer::sync)
+                            .doOnSuccess(saved -> {
+                                memberSyncer.sync(saved);
+                                clearMemberCache(saved.getId());
+                            })
                             .map(savedMember -> {
                                 log.info("更新会员手机号成功, memberId: {}", savedMember.getId());
                                 return true;
@@ -197,12 +215,15 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                 }));
     }
 
+    private void clearMemberCache(Long memberId) {
+        String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
+        redisUtil.delete(cacheKey);
+        log.debug("清除会员缓存, memberId: {}", memberId);
+    }
+
     private String encryptPhone(String phoneNumber) {
         try {
-            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
+            String encryptedPhone = AesUtil.encrypt(phoneNumber);
-            String iv = wechatProperties.getPhoneEncryption().getIv();
-
-            String encryptedPhone = AesUtil.encrypt(phoneNumber, secretKey, iv);
 
             log.debug("手机号加密成功");
             return encryptedPhone;
@@ -214,10 +235,8 @@ public class WechatAuthServiceImpl implements WechatAuthService {
 
     public String decryptPhone(String encryptedPhone) {
         try {
-            String secretKey = wechatProperties.getPhoneEncryption().getSecretKey();
-            String iv = wechatProperties.getPhoneEncryption().getIv();
 
-            String phoneNumber = AesUtil.decrypt(encryptedPhone, secretKey, iv);
+            String phoneNumber = AesUtil.decrypt(encryptedPhone);
 
             log.debug("手机号解密成功");
             return phoneNumber;

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatOfficialServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.member.service.impl;
 
+import cn.novalon.gym.manage.common.util.HtmlEscapeUtil;
 import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.entity.Member;
 import cn.novalon.gym.manage.member.es.entity.MemberES;
@@ -7,6 +8,7 @@ import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
 import cn.novalon.gym.manage.member.repository.IMemberRepository;
 import cn.novalon.gym.manage.member.service.WechatOfficialService;
 import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.vo.WechatUserInfoVO;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -40,11 +42,16 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
     private final MemberESRepository memberESRepository;
     private final ObjectMapper objectMapper = new ObjectMapper()
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
     private final EsSyncUtils esSyncUtils;
+    private final RedisUtil redisUtil;
 
     private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
 
+    private static final String ACCESS_TOKEN_CACHE_PREFIX = "wechat:access_token:";
+    private static final String MEMBER_INFO_CACHE_PREFIX = "member:info:";
+    private static final long ACCESS_TOKEN_EXPIRE_SECONDS = 7000;
+    private static final long CACHE_EXPIRE_SECONDS = 300;
+
     @PostConstruct
     public void init() {
         this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
@@ -74,24 +81,30 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                                         existingMember.setOfficialOpenId(openId);
                                         
                                         if (existingMember.getNickname() == null || existingMember.getNickname().isEmpty()) {
-                                            existingMember.setNickname(userInfo.getNickname());
+                                            existingMember.setNickname(HtmlEscapeUtil.escape(userInfo.getNickname()));
                                         }
                                         
                                         if (existingMember.getAvatar() == null || existingMember.getAvatar().isEmpty()) {
-                                            existingMember.setAvatar(userInfo.getHeadimgurl());
+                                            existingMember.setAvatar(HtmlEscapeUtil.escape(userInfo.getHeadimgurl()));
                                         }
                                         
                                         return memberRepository.save(existingMember)
-                                                .doOnSuccess(memberSyncer::sync)
+                                                .flatMap(saved -> {
-                                                .then(sendWelcomeMessage(openId));
+                                                    memberSyncer.sync(saved);
+                                                    return clearMemberCache(saved.getId())
+                                                            .then(sendWelcomeMessage(openId));
+                                                });
                                     } else {
                                         log.info("老用户关注服务号: memberId={}", existingMember.getId());
                                         existingMember.setSubscribed(true);
                                         existingMember.setLastLoginAt(LocalDateTime.now());
                                         
                                         return memberRepository.save(existingMember)
-                                                .doOnSuccess(memberSyncer::sync)
+                                                .flatMap(saved -> {
-                                                .then(sendWelcomeMessage(openId));
+                                                    memberSyncer.sync(saved);
+                                                    return clearMemberCache(saved.getId())
+                                                            .then(sendWelcomeMessage(openId));
+                                                });
                                     }
                                 })
                                 .switchIfEmpty(Mono.defer(() -> {
@@ -104,7 +117,10 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                                                 existingMember.setLastLoginAt(LocalDateTime.now());
                                                 
                                                 return memberRepository.save(existingMember)
-                                                        .doOnSuccess(memberSyncer::sync)
+                                                        .doOnSuccess(saved -> {
+                                                            memberSyncer.sync(saved);
+                                                            clearMemberCache(saved.getId());
+                                                        })
                                                         .then(sendWelcomeMessage(openId));
                                             })
                                             .switchIfEmpty(Mono.defer(() -> {
@@ -122,7 +138,10 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                                     existingMember.setLastLoginAt(LocalDateTime.now());
                                     
                                     return memberRepository.save(existingMember)
-                                            .doOnSuccess(memberSyncer::sync)
+                                            .doOnSuccess(saved -> {
+                                                memberSyncer.sync(saved);
+                                                clearMemberCache(saved.getId());
+                                            })
                                             .then(sendWelcomeMessage(openId));
                                 })
                                 .switchIfEmpty(Mono.defer(() -> {
@@ -148,8 +167,10 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                     member.setSubscribed(false);
                     member.setLastLoginAt(LocalDateTime.now());
                     return memberRepository.save(member)
-                            .doOnSuccess(memberSyncer::sync)
+                            .flatMap(saved -> {
-                            .then();
+                                memberSyncer.sync(saved);
+                                return clearMemberCache(saved.getId()).then();
+                            });
                 })
                 .then()
                 .switchIfEmpty(Mono.defer(() -> {
@@ -213,7 +234,11 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                         member.setOfficialOpenId(officialOpenId);
                     }
                     return memberRepository.save(member)
-                            .doOnSuccess(memberSyncer::sync)
+                            .flatMap(saved -> {
+                                memberSyncer.sync(saved);
+                                return clearMemberCache(saved.getId())
+                                        .then(Mono.just(saved));
+                            })
                             .map(savedMember -> {
                                 log.info("关联成功, memberId: {}", savedMember.getId());
                                 return true;
@@ -268,28 +293,38 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
 
     /**
      * 获取微信AccessToken
-     * 
-     * TODO: 应该使用缓存，避免频繁请求
      */
     private Mono<String> getAccessToken() {
-        String appId = wechatProperties.getMp().getAppId();
+        String cacheKey = ACCESS_TOKEN_CACHE_PREFIX + "mp";
-        String appSecret = wechatProperties.getMp().getAppSecret();
 
-        String url = "https://api.weixin.qq.com/cgi-bin/token"
+        return redisUtil.get(cacheKey, String.class)
-                + "?grant_type=client_credential"
+                .flatMap(cachedToken -> {
-                + "&appid=" + appId
+                    if (cachedToken != null) {
-                + "&secret=" + appSecret;
+                        log.debug("从缓存获取服务号access_token");
-
+                        return Mono.just(cachedToken);
-        return webClient.get()
-                .uri(url)
-                .accept(MediaType.APPLICATION_JSON)
-                .retrieve()
-                .bodyToMono(Map.class)
-                .map(response -> {
-                    if (response.containsKey("errcode")) {
-                        throw new RuntimeException("获取AccessToken失败: " + response.get("errmsg"));
                     }
-                    return (String) response.get("access_token");
+
+                    String appId = wechatProperties.getMp().getAppId();
+                    String appSecret = wechatProperties.getMp().getAppSecret();
+
+                    String url = "https://api.weixin.qq.com/cgi-bin/token"
+                            + "?grant_type=client_credential"
+                            + "&appid=" + appId
+                            + "&secret=" + appSecret;
+
+                    return webClient.get()
+                            .uri(url)
+                            .accept(MediaType.APPLICATION_JSON)
+                            .retrieve()
+                            .bodyToMono(Map.class)
+                            .flatMap(response -> {
+                                if (response.containsKey("errcode")) {
+                                    throw new RuntimeException("获取AccessToken失败: " + response.get("errmsg"));
+                                }
+                                String accessToken = (String) response.get("access_token");
+                                return redisUtil.setWithExpire(cacheKey, accessToken, ACCESS_TOKEN_EXPIRE_SECONDS)
+                                        .then(Mono.just(accessToken));
+                            });
                 });
     }
 
@@ -335,4 +370,10 @@ public class WechatOfficialServiceImpl implements WechatOfficialService {
                     return Mono.empty(); // 即使发送失败也不影响主流程
                 });
     }
+
+    private Mono<Long> clearMemberCache(Long memberId) {
+        String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
+        return redisUtil.delete(cacheKey)
+                .doOnSuccess(result -> log.debug("清除会员缓存, memberId: {}", memberId));
+    }
 }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/AesUtil.java

@@ -1,12 +1,24 @@
 package cn.novalon.gym.manage.member.util;
 
+import cn.novalon.gym.manage.member.config.WechatProperties;
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.core.IndexResponse;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpHost;
+import org.checkerframework.checker.units.qual.K;
+import org.elasticsearch.client.RestClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * AES加密工具类
@@ -16,24 +28,35 @@ import java.util.Base64;
  */
 
 @Slf4j
+@Component
 public class AesUtil {
 
     private static final String ALGORITHM = "AES";
     private static final String TRANSFORMATION = "AES/CBC/PKCS5Padding";
 
+    private static String KEY;
+    private static String IV;
+
+    @Autowired
+    public void setWechatProperties(WechatProperties props) {
+        KEY = props.getPhoneEncryption().getSecretKey();  // 从配置类读取
+        IV = props.getPhoneEncryption().getIv();
+        if(KEY == null || IV == null) throw new RuntimeException("请配置AES密钥和偏移量");
+    }
+
+
     /**
      * AES 解密
      *
      * @param encryptedData 加密数据，Base64编码
-     * @param key           AES密钥，Base64编码（32字节）
-     * @param iv            初始化向量IV，Base64编码（16字节）
      * @return 解密后的字符串
      */
-    public static String decrypt(String encryptedData, String key, String iv) {
+    public static String decrypt(String encryptedData) {
+
         try {
             byte[] dataByte = Base64.getDecoder().decode(encryptedData);
-            byte[] keyByte = Base64.getDecoder().decode(key);
+            byte[] keyByte = Base64.getDecoder().decode(KEY);
-            byte[] ivByte = Base64.getDecoder().decode(iv);
+            byte[] ivByte = Base64.getDecoder().decode(IV);
 
             Cipher cipher = Cipher.getInstance(TRANSFORMATION);
             SecretKeySpec secretKeySpec = new SecretKeySpec(keyByte, ALGORITHM);
@@ -52,15 +75,13 @@ public class AesUtil {
      * AES 加密
      *
      * @param data 原始数据
-     * @param key  AES密钥，Base64编码（32字节）
-     * @param iv   初始化向量IV，Base64编码（16字节）
      * @return Base64编码的加密数据
      */
-    public static String encrypt(String data, String key, String iv) {
+    public static String encrypt(String data) {
         try {
             byte[] dataByte = data.getBytes(StandardCharsets.UTF_8);
-            byte[] keyByte = Base64.getDecoder().decode(key);
+            byte[] keyByte = Base64.getDecoder().decode(KEY);
-            byte[] ivByte = Base64.getDecoder().decode(iv);
+            byte[] ivByte = Base64.getDecoder().decode(IV);
 
             Cipher cipher = Cipher.getInstance(TRANSFORMATION);
             SecretKeySpec secretKeySpec = new SecretKeySpec(keyByte, ALGORITHM);

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/WechatPhoneUtil.java

@@ -56,7 +56,7 @@ public class WechatPhoneUtil {
      * @param phone 手机号
      * @return 脱敏后的手机号，如：138****8000
      */
-    private String maskPhone(String phone) {
+    public static String maskPhone(String phone) {
         if (phone == null || phone.length() < 7) {
             return "***";
         }

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardInfoVO.java

@@ -0,0 +1,92 @@
+package cn.novalon.gym.manage.member.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 会员卡类型响应 VO
+ *
+ * @author 付嘉
+ * @date 2026-05-27
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberCardInfoVO {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 会员卡ID
+     */
+    private Long memberCardId;
+
+    /**
+     * 会员卡名称
+     */
+    private String memberCardName;
+
+    /**
+     * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡
+     */
+    private String memberCardType;
+
+    /**
+     * 卡类型描述
+     */
+    private String memberCardTypeDesc;
+
+    /**
+     * 会员卡价格
+     */
+    private BigDecimal memberCardPrice;
+
+    /**
+     * 有效天数（时长卡用）
+     */
+    private Integer memberCardValidityDays;
+
+    /**
+     * 总次数（次卡用）
+     */
+    private Integer memberCardTotalTimes;
+
+    /**
+     * 面额（储值卡用）
+     */
+    private BigDecimal memberCardAmount;
+
+    /**
+     * 状态：0-下架, 1-上架
+     */
+    private Integer memberCardStatus;
+
+    /**
+     * 状态描述
+     */
+    private String memberCardStatusDesc;
+
+    /**
+     * 扩展配置（JSON格式）
+     */
+    private String extraConfig;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardRecordVO.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 /**
  * 会员卡记录响应 VO
- * 
+ *
  * @author 付嘉
  * @date 2026-05-27
  */
@@ -68,4 +68,4 @@ public class MemberCardRecordVO {
      * 创建时间
      */
     private LocalDateTime createdAt;
-}
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberDetailVO.java

@@ -0,0 +1,96 @@
+package cn.novalon.gym.manage.member.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 会员详情 VO（管理端使用）
+ *
+ * @author 付嘉
+ * @date 2026-05-27
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberDetailVO {
+
+    // ==================== 会员基础信息 ====================
+
+    /**
+     * 会员ID
+     */
+    private Long id;
+
+    /**
+     * 会员编号
+     */
+    private String memberNo;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号（脱敏显示）
+     */
+    private String phone;
+
+    /**
+     * 性别描述
+     */
+    private String genderDesc;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 头像URL
+     */
+    private String avatar;
+
+    /**
+     * 是否关注服务号
+     */
+    private Boolean subscribed;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime lastLoginAt;
+
+    /**
+     * 注册时间
+     */
+    private LocalDateTime createdAt;
+
+    // ==================== 会员卡信息 ====================
+
+    /**
+     * 会员持有的卡列表
+     */
+    private List<MemberCardInfoVO> memberCards;
+
+    /**
+     * 有效会员卡数量
+     */
+    private Integer activeCardCount;
+
+    /**
+     * 过期/用完会员卡数量
+     */
+    private Integer inactiveCardCount;
+}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberInfoVO.java

@@ -1,15 +1,17 @@
 package cn.novalon.gym.manage.member.vo;
 
+import cn.novalon.gym.manage.member.enums.GenderEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
  * 会员信息 VO
- * 
+ *
  * @author 付嘉
  * @date 2026-05-01
  */
@@ -30,10 +32,13 @@ public class MemberInfoVO {
     private String phone;
 
     // 性别
-    private Integer gender;
+    private GenderEnum gender;
+
+    // 性别描述
+    private String genderDesc;
 
     // 生日
-    private Date birthday;
+    private LocalDate birthday;
 
     // 头像
     private String avatar;
@@ -43,4 +48,4 @@ public class MemberInfoVO {
 
     // 是否已关注公众号
     private Boolean isSubscribed;
-}
+}

gym-manage-api/gym-member/src/main/resources/db/schema.sql

@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS member_user (
     nickname VARCHAR(100),                                         -- 昵称
     phone VARCHAR(255),                                            -- 手机号（AES加密存储）
     gender INTEGER DEFAULT 0,                                      -- 性别：0-未知，1-男，2-女
-    birthday TIMESTAMP,                                            -- 生日
+    birthday DATE,                                            -- 生日
     address VARCHAR(500),                                          -- 地址
     avatar VARCHAR(500),                                           -- 头像URL
     subscribed BOOLEAN DEFAULT FALSE,                              -- 是否关注服务号

gym-manage-api/gym-member/src/main/resources/member-config.yml

@@ -2,21 +2,23 @@
 wechat:
   # Mock模式：true=使用模拟数据（开发测试），false=调用真实微信API（生产环境）
   mock-enabled: false
+
   miniapp:
-    app-id: wx4d480112b426100b
+    app-id: ${WECHAT_MINIAPP_APP_ID}
-    app-secret: 78548f0c0ff66c73d3e8b071897eb1e5
+    app-secret: ${WECHAT_MINIAPP_SECRET}
+
   mp:
-    app-id: wx6f138c9aacc8a0e8
+    app-id: ${WECHAT_MP_APP_ID}
-    app-secret: 5df2e315e9268e96a43bb2cce1d2270b
+    app-secret: ${WECHAT_MP_SECRET}
-    token: test_token
+    token: ${WECHAT_MP_TOKEN}
-    aes-key: ${WECHAT_MP_AESKEY:test_aes_key}
+    aes-key: ${WECHAT_MP_AESKEY}
-    # 服务器回调地址（微信服务器推送事件的URL）
+    callback-url: ${WECHAT_MP_CALLBACK_URL}
-    callback-url: https://1me240209tk74.vicp.fun/api/member/auth/mp/callback
+
   # 手机号加密配置
   phone-encryption:
-    secret-key: nVnA99iBfyK0IE6SkcUYdVAaVrezyn2sLRdLfkIyWnY=
+    secret-key: ${PHONE_ENCRYPTION_SECRET_KEY}
-    iv: LMpG6Ih9mmfEAALOCeIJBw==
+    iv: ${PHONE_ENCRYPTION_IV}
 
 spring:
   elasticsearch:
-    uris: http://localhost:9200          # ES 服务器地址（支持多个，逗号分隔）
+    uris: http://localhost:9200

gym-manage-api/log.text

@@ -0,0 +1,200 @@
+2026-06-02T14:56:05.966+08:00 TRACE 22380 --- [gym-manage-api] [ctor-http-nio-7] o.s.w.s.adapter.HttpWebHandlerAdapter    : [7ce54381-10] HTTP POST "/api/groupCourse/11/cancel", headers={masked}
+2026-06-02T14:56:05.967+08:00 DEBUG 22380 --- [gym-manage-api] [    parallel-11] o.s.w.s.s.DefaultWebSessionManager       : Created new WebSession.
+2026-06-02T14:56:05.967+08:00  INFO 22380 --- [gym-manage-api] [    parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter  : WebFilter 拦截请求: POST /api/groupCourse/11/cancel
+2026-06-02T14:56:05.967+08:00  INFO 22380 --- [gym-manage-api] [    parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter  : 未匹配到操作日志配置，跳过: POST /api/groupCourse/11/cancel
+2026-06-02T14:56:05.967+08:00  INFO 22380 --- [gym-manage-api] [    parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter  : WebFilter 拦截请求: POST /api/groupCourse/11/cancel
+2026-06-02T14:56:05.967+08:00  INFO 22380 --- [gym-manage-api] [    parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter  : 未匹配到操作日志配置，跳过: POST /api/groupCourse/11/cancel
+2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dictionaries" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/change-password" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/logical-delete" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/logical-delete" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/action/restore" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/restore" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/roles" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/menus" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles/{id}/restore" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles/{id}/permissions" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/config" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/login" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/exception" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/operation" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/login" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/register" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/logout" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dict/types" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dict/data" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/notices" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/messages" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/files/upload" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/permissions" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/auth/miniapp/login" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/auth/mp/callback" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/phone/bind" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/admin/member/{id}/phone" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-cards" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/purchase" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/renew" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/use" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/refund" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/process-expired" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-transactions" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/page" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse" does not match against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/{id}/cancel" matches against value "/api/groupCourse/11/cancel"
+2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.function.server.RouterFunctions  : [7ce54381-10] Matched (POST && /api/groupCourse/{id}/cancel)
+2026-06-02T14:56:05.970+08:00 DEBUG 22380 --- [gym-manage-api] [    parallel-11] o.s.w.r.f.s.s.RouterFunctionMapping      : [7ce54381-10] Mapped to cn.novalon.gym.manage.app.config.SystemRouter$$Lambda/0x00000198019592d8@6903bec9
+2026-06-02T14:56:05.972+08:00 DEBUG 22380 --- [gym-manage-api] [    parallel-11] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [SELECT group_course.course_name, group_course.coach_id, group_course.course_type, group_course.start_time, group_course.end_time, group_course.max_members, group_course.current_members, group_course.status, group_course.location, group_course.cover_image, group_course.description, group_course.point_card_amount, group_course.stored_value_amount, group_course.id, group_course.create_by, group_course.update_by, group_course.created_at, group_course.updated_at, group_course.deleted_at FROM group_course WHERE group_course.id = $1 AND (group_course.deleted_at IS NULL)]
+2026-06-02T14:56:05.976+08:00  INFO 22380 --- [gym-manage-api] [actor-tcp-nio-5] c.n.g.m.g.c.GroupCourseConverter         : 转换bean，entity-domain：
+2026-06-02T14:56:05.976+08:00 ERROR 22380 --- [gym-manage-api] [actor-tcp-nio-5] c.n.g.m.g.s.impl.GroupCourseService      : 团课取消失败 - id=11, error: 课程取消需提前24小时
+2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] org.springframework.web.HttpLogging      : [7ce54381-10] Encoding [{success=false, message=课程取消需提前24小时}]
+2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] o.s.w.s.adapter.HttpWebHandlerAdapter    : [7ce54381-10] Completed 400 BAD_REQUEST, headers={masked}
+2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] org.springframework.web.HttpLogging      : [7ce54381-1, L:/[0:0:0:0:0:0:0:1]:8084 - R:/[0:0:0:0:0:0:0:1]:57674] Handling completed

gym-manage-api/manage-app/pom.xml

@@ -139,6 +139,16 @@
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-groupCourse</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java

@@ -10,16 +10,25 @@ import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDeta
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.server.WebFilter;
 
 import java.util.List;
 
 @SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = {
         ReactiveUserDetailsServiceAutoConfiguration.class })
-@EnableR2dbcRepositories(basePackages = { "cn.novalon.gym.manage.db.dao",
+@EnableScheduling
+@EnableR2dbcRepositories(basePackages = {
+        "cn.novalon.gym.manage.db.dao",
         "cn.novalon.gym.manage.sys.audit.repository" ,
-        "cn.novalon.gym.manage.gymmembercard.dao"})
+        "cn.novalon.gym.manage.gymmembercard.dao",
+        "cn.novalon.gym.manage.member.repository",
+        "cn.novalon.gym.manage.groupcourse.dao"
+})
+@EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository")
 public class ManageApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(ManageApplication.class);

gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.app.config;
 
 
 import cn.novalon.gym.manage.file.handler.SysFileHandler;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardRecordHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardTransactionHandler;
@@ -62,7 +64,9 @@ public class SystemRouter {
             PasswordDiagnosticHandler passwordDiagnosticHandler,
             MemberCardHandler memberCardHandler,
             MemberCardRecordHandler memberCardRecordHandler,
-            MemberCardTransactionHandler memberCardTransactionHandler) {
+            MemberCardTransactionHandler memberCardTransactionHandler,
+            GroupCourseHandler groupCourseHandler,
+            GroupCourseBookingHandler groupCourseBookingHandler) {
 
         return route()
                 // ========== 诊断路由 ==========
@@ -249,6 +253,27 @@ public class SystemRouter {
                 .GET("/api/member-card-transactions/statistics/deduct/{cardId}", memberCardTransactionHandler::getDeductCountByCardId)
                 .GET("/api/member-card-transactions/statistics/renew", memberCardTransactionHandler::getRenewAmountByTimeRange)
                 .GET("/api/member-card-transactions/statistics/purchase/{memberId}", memberCardTransactionHandler::getPurchaseAmountByMember)
+
+                // ========================================
+                // ========== 团课管理路由 =================
+                // ========================================
+
+                // ===== 团课课程管理 =====
+                .GET("/api/groupCourse/list", groupCourseHandler::getAllGroupCourse)
+                .POST("/api/groupCourse/page", groupCourseHandler::getGroupCoursesByPage)
+                .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById)
+                .POST("/api/groupCourse", groupCourseHandler::createGroupCourse)
+                .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse)
+                .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse)
+                .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse)
+                .POST("/api/groupCourse/{courseId}/signin", groupCourseHandler::signIn)
+
+                // ===== 团课预约管理 =====
+                .POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse)
+                .POST("/api/groupCourse/booking/{bookingId}/cancel", groupCourseBookingHandler::cancelBooking)
+                .GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId)
+                .GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)
+                .GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
                 
                 .build();
     }

gym-manage-api/manage-app/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
     url: jdbc:postgresql://localhost:55432/manage_system
     user: novalon
     password: novalon123
-    enabled: false
+    enabled: true
     locations: classpath:db/migration
     baseline-on-migrate: true
     validate-on-migrate: true

gym-manage-api/manage-app/src/main/resources/application.yml

@@ -15,8 +15,8 @@ spring:
       - org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
   r2dbc:
     url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:postgres}
+    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:postgres}
+    password: ${DB_PASSWORD:novalon123}
     pool:
       initial-size: 10
       max-size: 50
@@ -25,11 +25,11 @@ spring:
       acquire-timeout: 5s
   datasource:
     url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:postgres}
+    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:postgres}
+    password: ${DB_PASSWORD:novalon123}
     driver-class-name: org.postgresql.Driver
   flyway:
-    enabled: false
+    enabled: true
     locations: classpath:db/migration
     baseline-on-migrate: true
     baseline-version: 0
@@ -38,11 +38,25 @@ spring:
     user:
       name: disabled
       password: disabled
+  data:
+    redis:
+      host: ${REDIS_HOST:localhost}
+      port: ${REDIS_PORT:6379}
+      password: ${REDIS_PASSWORD:novalon123}
+      timeout: 5000
+      lettuce:
+        pool:
+          max-active: 8  # 最大连接数
+          max-idle: 8    # 最大空闲连接
+          min-idle: 0    # 最小空闲连接
+          max-wait: -1ms # 连接等待时间
   profiles:
     active: dev
   config:
     import: classpath:member-config.yml
 
+
+
 management:
   endpoints:
     web:

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/config/RedisConfig.java

@@ -0,0 +1,38 @@
+package cn.novalon.gym.manage.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * Redis 配置类（响应式版本）
+ * 
+ * @author 付嘉
+ * @date 2026-05-29
+ */
+@Configuration
+public class RedisConfig {
+
+    /**
+     * 配置 ReactiveRedisTemplate
+     */
+    @Bean
+    public ReactiveRedisTemplate<String, Object> reactiveRedisTemplate(
+            ReactiveRedisConnectionFactory connectionFactory) {
+        
+        // 配置序列化上下文
+        RedisSerializationContext<String, Object> serializationContext = 
+            RedisSerializationContext.<String, Object>newSerializationContext()
+                .key(StringRedisSerializer.UTF_8)
+                .value(new GenericJackson2JsonRedisSerializer())
+                .hashKey(StringRedisSerializer.UTF_8)
+                .hashValue(new GenericJackson2JsonRedisSerializer())
+                .build();
+        
+        return new ReactiveRedisTemplate<>(connectionFactory, serializationContext);
+    }
+}

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/HtmlEscapeUtil.java

@@ -0,0 +1,117 @@
+package cn.novalon.gym.manage.common.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/**
+ * HTML 转义工具类
+ * 防止 XSS 注入攻击
+ *
+ * @author 付嘉
+ * @date 2026-05-29
+ */
+public class HtmlEscapeUtil {
+
+    private static final Map<Character, String> ESCAPE_MAP = new HashMap<>();
+    private static final Map<String, Character> UNESCAPE_MAP = new HashMap<>();
+    private static final Pattern HTML_PATTERN = Pattern.compile("<[^>]*>");
+
+    static {
+        // HTML 特殊字符转义映射
+        ESCAPE_MAP.put('&', "&amp;");
+        ESCAPE_MAP.put('<', "&lt;");
+        ESCAPE_MAP.put('>', "&gt;");
+        ESCAPE_MAP.put('"', "&quot;");
+        ESCAPE_MAP.put('\'', "&#39;");
+
+        // 反向映射
+        UNESCAPE_MAP.put("&amp;", '&');
+        UNESCAPE_MAP.put("&lt;", '<');
+        UNESCAPE_MAP.put("&gt;", '>');
+        UNESCAPE_MAP.put("&quot;", '"');
+        UNESCAPE_MAP.put("&#39;", '\'');
+    }
+
+    /**
+     * 转义 HTML 特殊字符
+     *
+     * @param input 原始字符串
+     * @return 转义后的字符串
+     */
+    public static String escape(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+
+        StringBuilder result = new StringBuilder();
+        for (char c : input.toCharArray()) {
+            String escaped = ESCAPE_MAP.get(c);
+            if (escaped != null) {
+                result.append(escaped);
+            } else {
+                result.append(c);
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * 反转义 HTML 特殊字符
+     *
+     * @param input 转义后的字符串
+     * @return 原始字符串
+     */
+    public static String unescape(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+
+        String result = input;
+        for (Map.Entry<String, Character> entry : UNESCAPE_MAP.entrySet()) {
+            result = result.replace(entry.getKey(), String.valueOf(entry.getValue()));
+        }
+        return result;
+    }
+
+    /**
+     * 移除所有 HTML 标签
+     *
+     * @param input 原始字符串
+     * @return 移除标签后的字符串
+     */
+    public static String stripHtmlTags(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+        return HTML_PATTERN.matcher(input).replaceAll("");
+    }
+
+    /**
+     * 安全转义（转义 + 移除标签）
+     *
+     * @param input 原始字符串
+     * @return 安全字符串
+     */
+    public static String sanitize(String input) {
+        if (input == null || input.isEmpty()) {
+            return input;
+        }
+        // 先移除 HTML 标签，再转义特殊字符
+        String noTags = stripHtmlTags(input);
+        return escape(noTags);
+    }
+
+    /**
+     * 判断是否包含 HTML 标签
+     *
+     * @param input 原始字符串
+     * @return true-包含, false-不包含
+     */
+    public static boolean containsHtmlTags(String input) {
+        if (input == null || input.isEmpty()) {
+            return false;
+        }
+        return HTML_PATTERN.matcher(input).find();
+    }
+}

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java

@@ -0,0 +1,80 @@
+package cn.novalon.gym.manage.common.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+
+/**
+ * Redis 工具类（响应式版本）
+ * 
+ * @author liwentao
+ * @date 2026/5/15
+ */
+@Component
+public class RedisUtil {
+
+    @Autowired
+    private ReactiveRedisTemplate<String, Object> reactiveRedisTemplate;
+
+    /**
+     * 设置值
+     */
+    public Mono<Boolean> set(String key, Object value) {
+        return reactiveRedisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 设置值并指定过期时间（秒）
+     */
+    public Mono<Boolean> setWithExpire(String key, Object value, long timeoutSeconds) {
+        return reactiveRedisTemplate.opsForValue().set(key, value, Duration.ofSeconds(timeoutSeconds));
+    }
+
+    /**
+     * 获取值
+     */
+    @SuppressWarnings("unchecked")
+    public <T> Mono<T> get(String key, Class<T> clazz) {
+        return reactiveRedisTemplate.opsForValue().get(key)
+                .map(obj -> clazz.isInstance(obj) ? (T) obj : null);
+    }
+
+    /**
+     * 获取值（返回 Object）
+     */
+    public Mono<Object> get(String key) {
+        return reactiveRedisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 删除key
+     */
+    public Mono<Long> delete(String key) {
+        return reactiveRedisTemplate.delete(key);
+    }
+
+    /**
+     * 判断key是否存在
+     */
+    public Mono<Boolean> hasKey(String key) {
+        return reactiveRedisTemplate.hasKey(key);
+    }
+
+    /**
+     * 设置过期时间（秒）
+     */
+    public Mono<Boolean> expire(String key, long timeoutSeconds) {
+        return reactiveRedisTemplate.expire(key, Duration.ofSeconds(timeoutSeconds));
+    }
+
+    /**
+     * 根据通配符模式删除key
+     */
+    public Mono<Long> deleteByPattern(String pattern) {
+        return reactiveRedisTemplate.keys(pattern)
+                .flatMap(keys -> reactiveRedisTemplate.delete(keys)).count();
+    }
+}

gym-manage-api/manage-db/pom.xml

@@ -99,6 +99,8 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+
     </dependencies>
 
     <build>

gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/SysUserRepository.java

@@ -10,6 +10,7 @@ import cn.novalon.gym.manage.sys.core.query.SysUserQuery;
 import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
+import cn.novalon.gym.manage.sys.dto.response.UserResponse;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.relational.core.query.Query;

gym-manage-api/manage-db/src/main/resources/db/migration/V10__Insert_Booking_Test_Data.sql

@@ -0,0 +1,86 @@
+-- V10: 团课预约业务场景测试数据
+-- 测试场景：
+-- 1. 用户A刚刚注册，在没有任何会员卡的情况下申请团课预约
+-- 2. 用户B已有时长卡，但已经过期
+-- 3. 会员C有时长卡，未过期
+-- 4. 会员D有次数卡，但次数卡耗尽次数
+-- 5. 会员E有次数卡，且次数充足
+-- 6. 会员F有储值卡，但余额不足以支付其预约的团课
+-- 7. 会员G有储值卡，余额充足
+
+-- ============================================
+-- 1. 创建测试会员用户 (A-G)
+-- ============================================
+
+INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES
+    ('MEM_TEST_A', '用户A_无卡新用户', '13800001001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'),
+    ('MEM_TEST_B', '用户B_过期时长卡', '13800001002', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_C', '会员C_有效时长卡', '13800001003', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_D', '会员D_次数用尽', '13800001004', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_E', '会员E_次数充足', '13800001005', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_F', '会员F_储值卡余额不足', '13800001006', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
+    ('MEM_TEST_G', '会员G_储值卡余额充足', '13800001007', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00');
+
+-- ============================================
+-- 2. 团课课程测试数据（用于预约测试）
+-- ============================================
+
+-- 团课A: 收费类型为次数卡(点卡额度=1)
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('燃脂搏击_次数卡课程', 102, 2, '2026-06-10 19:30:00', '2026-06-10 20:30:00', 20, 0, '0', '综合训练区', '高强度间歇训练，配合音乐快速燃脂，消耗1次', 1, 0.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
+
+-- 团课B: 收费类型为储值卡(储值额度=50.00)
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('高端普拉提_储值卡课程', 103, 1, '2026-06-11 19:00:00', '2026-06-11 20:00:00', 15, 0, '0', '普拉提教室', '精准训练核心肌群，消耗储值50元', 0, 20.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
+
+-- ============================================
+-- 3. 会员卡类型定义
+-- ============================================
+
+INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) VALUES
+    ('30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
+    ('10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
+    ('储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00');
+
+-- ============================================
+-- 4. 会员卡记录测试数据
+-- ============================================
+
+-- 场景2: 用户B - 时长卡已过期 (expire_time < 当前时间)
+-- 购买于30天前，有效期30天，现已过期
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_B'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'EXPIRED', 0, 0.00, '2026-05-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- 场景3: 会员C - 时长卡未过期 (expire_time > 当前时间)
+-- 购买于今天，有效期30天，还有30天有效期
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_C'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- 场景4: 会员D - 次数卡耗尽 (remaining_times = 0)
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_D'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 0, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- 场景5: 会员E - 次数卡充足 (remaining_times >= point_card_amount)
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_E'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- 场景6: 会员F - 储值卡余额不足 (remaining_amount < stored_value_amount of course)
+-- 团课B收费50元，但会员F储值卡只有30元
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_F'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 30.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- 场景7: 会员G - 储值卡余额充足 (remaining_amount >= stored_value_amount of course)
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_G'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 5. 测试场景说明
+-- ============================================
+
+-- 场景1: 用户A无会员卡 -> 预约团课时应提示"无可用会员卡"
+-- 场景2: 用户B时长卡已过期 -> 预约团课时应提示"会员卡已过期"
+-- 场景3: 会员C时长卡有效 -> 可以正常预约次数卡团课
+-- 场景4: 会员D次数为0 -> 预约团课时应提示"剩余次数不足"
+-- 场景5: 会员E次数充足 -> 可以正常预约次数卡团课
+-- 场景6: 会员F储值卡余额30元，团课需50元 -> 预约时应提示"余额不足"
+-- 场景7: 会员G储值卡余额200元，团课需50元 -> 可以正常预约储值卡团课

gym-manage-api/manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql

@@ -0,0 +1,116 @@
+-- V11: 团课预约取消业务场景测试数据
+-- 测试场景：
+-- 1. 用户张三使用时长卡预约了团课，需要取消预约
+-- 2. 用户李四使用次数卡预约了团课，需要取消预约
+-- 3. 用户王五使用储值卡预约了团课，需要取消预约
+
+-- ============================================
+-- 1. 创建测试会员用户 (张三、李四、王五)
+-- ============================================
+
+INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES
+    ('MEM_TEST_ZHANG', '张三_时长卡用户', '13800002001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'),
+    ('MEM_TEST_LI', '李四_次数卡用户', '13800002002', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'),
+    ('MEM_TEST_WANG', '王五_储值卡用户', '13800002003', 2, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 2. 确保会员卡类型已存在（如果不存在则创建）
+-- ============================================
+
+-- 时长卡类型（30天）
+INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) 
+SELECT '30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'
+WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '30天时长卡');
+
+-- 次数卡类型（10次）
+INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) 
+SELECT '10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'
+WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '10次卡');
+
+-- 储值卡类型（500元）
+INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) 
+SELECT '储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'
+WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '储值卡500');
+
+-- ============================================
+-- 3. 为测试用户分配会员卡
+-- ============================================
+
+-- 张三：时长卡（有效期内）
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG'), 
+     (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 
+     'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- 李四：次数卡（剩余5次）
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI'), 
+     (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 
+     'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- 王五：储值卡（余额200元）
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG'), 
+     (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 
+     'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 4. 创建用于取消预约测试的团课
+-- ============================================
+
+-- 团课X: 时长卡可用课程（使用次数卡支付，时长卡会员可预约）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('晚间瑜伽_取消测试', 101, 1, '2026-06-15 19:00:00', '2026-06-15 20:00:00', 20, 0, '0', '瑜伽教室', '适合所有级别的瑜伽课程，用于测试取消预约功能', 1, 30.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 5. 创建已预约的记录（状态为0-已预约）
+-- ============================================
+
+-- 张三使用时长卡预约团课（状态：已预约）
+INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES
+    ((SELECT id FROM group_course WHERE course_name = '晚间瑜伽_取消测试'),
+     (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG'),
+     (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG')),
+     '2026-06-02 11:00:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室',
+     '2026-06-02 11:00:00', '2026-06-02 11:00:00');
+
+-- 李四使用次数卡预约团课（状态：已预约）
+INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES
+    ((SELECT id FROM group_course WHERE course_name = '晚间瑜伽_取消测试'),
+     (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI'),
+     (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI')),
+     '2026-06-02 11:30:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室',
+     '2026-06-02 11:30:00', '2026-06-02 11:30:00');
+
+-- 王五使用储值卡预约团课（状态：已预约）
+INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES
+    ((SELECT id FROM group_course WHERE course_name = '晚间瑜伽_取消测试'),
+     (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG'),
+     (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG')),
+     '2026-06-02 12:00:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室',
+     '2026-06-02 12:00:00', '2026-06-02 12:00:00');
+
+-- ============================================
+-- 6. 更新团课当前预约人数
+-- ============================================
+
+UPDATE group_course 
+SET current_members = current_members + 3 
+WHERE course_name = '晚间瑜伽_取消测试';
+
+-- ============================================
+-- 测试数据说明
+-- ============================================
+-- 用户信息：
+-- 张三 (MEM_TEST_ZHANG): 13800002001 - 持有有效期内的时长卡
+-- 李四 (MEM_TEST_LI): 13800002002 - 持有次数卡（剩余5次）
+-- 王五 (MEM_TEST_WANG): 13800002003 - 持有储值卡（余额200元）
+
+-- 测试场景：
+-- 1. 张三使用时长卡预约了团课 -> 取消预约 -> 应恢复时长卡状态，释放课程名额
+-- 2. 李四使用次数卡预约了团课 -> 取消预约 -> 应返还扣除的次数，释放课程名额
+-- 3. 王五使用储值卡预约了团课 -> 取消预约 -> 应返还扣除的金额，释放课程名额
+
+-- 预约记录状态说明：
+-- status = '0' 表示已预约
+-- status = '1' 表示已取消（取消后应更新为此状态）

gym-manage-api/manage-db/src/main/resources/db/migration/V12__Insert_Time_Conflict_Test_Data.sql

@@ -0,0 +1,58 @@
+-- V12: 团课预约时间冲突测试数据
+-- 测试场景：会员预约两个时间重叠的团课时，系统应检测到时间冲突并拒绝预约
+
+-- ============================================
+-- 1. 创建测试会员
+-- ============================================
+
+INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES
+    ('MEM_TIME_CONFLICT', '时间冲突测试会员', '13800009999', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 2. 创建时间冲突的团课
+-- ============================================
+
+-- 团课A: 6月15日 13:00 - 15:00
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('时间冲突测试_A_13点-15点', 102, 2, '2026-06-15 13:00:00', '2026-06-15 15:00:00', 20, 0, '0', '综合训练区', '测试用团课A，用于验证时间冲突检测', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- 团课B: 6月15日 14:00 - 16:00 (与团课A时间重叠)
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('时间冲突测试_B_14点-16点', 103, 1, '2026-06-15 14:00:00', '2026-06-15 16:00:00', 15, 0, '0', '普拉提教室', '测试用团课B，与团课A时间重叠（14:00-15:00）', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- 团课C: 6月15日 10:00 - 12:00 (不冲突，作为对照)
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
+    ('时间冲突测试_C_10点-12点', 101, 1, '2026-06-15 10:00:00', '2026-06-15 12:00:00', 15, 0, '0', '瑜伽教室', '测试用团课C，与团课A/B不冲突', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 3. 会员卡记录（用于预约）
+-- ============================================
+
+-- 为时间冲突测试会员创建有效次数卡
+INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
+    ((SELECT id FROM member_user WHERE member_no = 'MEM_TIME_CONFLICT'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 10, 0.00, '2026-12-31 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
+
+-- ============================================
+-- 4. 测试场景说明
+-- ============================================
+-- 
+-- 测试步骤：
+-- 1. 使用会员 MEM_TIME_CONFLICT 预约团课A (course_name='时间冲突测试_A_13点-15点')
+--    → 预期：预约成功
+-- 
+-- 2. 使用会员 MEM_TIME_CONFLICT 预约团课B (course_name='时间冲突测试_B_14点-16点')
+--    → 预期：预约失败，提示时间冲突（14:00-15:00与已预约的团课A重叠）
+-- 
+-- 3. 使用会员 MEM_TIME_CONFLICT 预约团课C (course_name='时间冲突测试_C_10点-12点')
+--    → 预期：预约成功（与团课A时间不冲突）
+-- 
+-- 时间冲突判断逻辑：
+-- 新课程开始时间 < 已预约课程结束时间 AND 新课程结束时间 > 已预约课程开始时间
+-- 即：newStartTime < existingEndTime AND newEndTime > existingStartTime
+-- 
+-- 本测试数据中的时间关系：
+-- - 团课A: 13:00 - 15:00
+-- - 团课B: 14:00 - 16:00
+--   → 14:00 < 15:00 AND 16:00 > 13:00 → 冲突
+-- - 团课C: 10:00 - 12:00
+--   → 10:00 < 15:00 AND 12:00 > 13:00 → 12:00 > 13:00 不成立 → 不冲突

gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql

@@ -0,0 +1,77 @@
+-- ============================================
+-- 团课相关表
+-- ============================================
+
+-- 团课课程表
+CREATE TABLE IF NOT EXISTS group_course (
+    id BIGSERIAL PRIMARY KEY,
+    course_name VARCHAR(100) NOT NULL,
+    coach_id BIGINT,
+    course_type BIGINT,
+    start_time TIMESTAMP NOT NULL,
+    end_time TIMESTAMP NOT NULL,
+    max_members INTEGER DEFAULT 20,
+    current_members INTEGER DEFAULT 0,
+    status VARCHAR(1) DEFAULT '0',
+    location VARCHAR(255),
+    cover_image VARCHAR(500),
+    description TEXT,
+    point_card_amount INTEGER DEFAULT 1,
+    stored_value_amount DECIMAL(10,2) DEFAULT 0,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+-- 团课预约记录表
+CREATE TABLE IF NOT EXISTS group_course_booking (
+    id BIGSERIAL PRIMARY KEY,
+    course_id BIGINT NOT NULL,
+    member_id BIGINT NOT NULL,
+    member_card_id BIGINT NOT NULL,
+    booking_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    status VARCHAR(1) DEFAULT '0',
+    cancel_time TIMESTAMP,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+COMMENT ON TABLE group_course IS '团课课程表';
+COMMENT ON COLUMN group_course.id IS '主键ID';
+COMMENT ON COLUMN group_course.course_name IS '课程名称';
+COMMENT ON COLUMN group_course.coach_id IS '教练ID（关联sys_user）';
+COMMENT ON COLUMN group_course.course_type IS '课程类型（如瑜伽/普拉提/动感单车）';
+COMMENT ON COLUMN group_course.start_time IS '开始时间';
+COMMENT ON COLUMN group_course.end_time IS '结束时间';
+COMMENT ON COLUMN group_course.max_members IS '最大参与人数';
+COMMENT ON COLUMN group_course.current_members IS '当前参与人数';
+COMMENT ON COLUMN group_course.status IS '状态（0正常 1已取消 2已结束）';
+COMMENT ON COLUMN group_course.location IS '上课地点';
+COMMENT ON COLUMN group_course.cover_image IS '封面图URL';
+COMMENT ON COLUMN group_course.description IS '课程描述';
+COMMENT ON COLUMN group_course.point_card_amount IS '点卡额度（消耗次数）';
+COMMENT ON COLUMN group_course.stored_value_amount IS '储值卡额度（消耗金额）';
+COMMENT ON COLUMN group_course.create_by IS '创建人';
+COMMENT ON COLUMN group_course.update_by IS '更新人';
+COMMENT ON COLUMN group_course.created_at IS '创建时间';
+COMMENT ON COLUMN group_course.updated_at IS '更新时间';
+COMMENT ON COLUMN group_course.deleted_at IS '删除时间（软删除）';
+
+COMMENT ON TABLE group_course_booking IS '团课预约记录表';
+COMMENT ON COLUMN group_course_booking.id IS '主键ID';
+COMMENT ON COLUMN group_course_booking.course_id IS '团课ID';
+COMMENT ON COLUMN group_course_booking.member_id IS '用户ID';
+COMMENT ON COLUMN group_course_booking.member_card_id IS '会员卡ID';
+COMMENT ON COLUMN group_course_booking.booking_time IS '预约时间';
+COMMENT ON COLUMN group_course_booking.status IS '状态（0已预约 1已取消 2已出席 3缺席）';
+COMMENT ON COLUMN group_course_booking.cancel_time IS '取消时间';
+COMMENT ON COLUMN group_course_booking.create_by IS '创建人';
+COMMENT ON COLUMN group_course_booking.update_by IS '更新人';
+COMMENT ON COLUMN group_course_booking.created_at IS '创建时间';
+COMMENT ON COLUMN group_course_booking.updated_at IS '更新时间';
+COMMENT ON COLUMN group_course_booking.deleted_at IS '删除时间（软删除）';

gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql

@@ -0,0 +1,28 @@
+-- 场景1: 0人预约，可预约（正常状态，6月15日，距开始还有14天）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('极速燃脂单车', 104, 2, '2026-06-02 16:45:00', '2026-06-15 20:20:00', 25, 0, 0, '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-06-01 11:00:00', '2026-06-01 11:00:00');
+
+-- 场景2: 已有人预约，可预约（正常状态，6月12日，5/15人）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('清晨流瑜伽', 101, 1, '2026-06-12 09:00:00', '2026-06-12 10:30:00', 15, 5, 0, 'A座3楼瑜伽教室', '/images/yoga_flow.jpg', '适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。', 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
+
+-- 场景3: 满员，不可预约（正常状态但已满员，6月10日，20/20人）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('燃脂搏击', 102, 2, '2026-06-10 18:30:00', '2026-06-10 19:30:00', 20, 20, 0, '综合训练区', '/images/kickboxing.jpg', '高强度间歇训练，配合音乐快速燃脂，释放压力。名额已满，无法预约。', 'coach_zhang', '2026-06-01 14:30:00', '2026-06-01 14:30:00');
+
+-- 场景4: 超出可预约时间，不可预约（正常状态但距开始不足30分钟）
+-- 当前时间: 2026-06-01 15:00，课程开始: 2026-06-01 15:20
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('哈他瑜伽', 101, 1, '2026-06-01 15:20:00', '2026-06-01 16:50:00', 12, 3, 0, '瑜伽教室B', '/images/hatha_yoga.jpg', '基础哈他瑜伽，适合所有级别。距开始不足30分钟，已停止预约。', 'coach_li', '2026-06-01 08:00:00', '2026-06-01 08:00:00');
+
+-- 场景5: 课程已取消，不可预约（status=1）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('周末冥想修复', 101, 1, '2026-06-20 15:00:00', '2026-06-20 16:00:00', 12, 3, 1, '冥想室', '/images/meditation.jpg', '通过呼吸和正念冥想，深度放松身心。该课程已被取消。', 'coach_wang', '2026-05-28 08:00:00', '2026-05-28 08:00:00');
+
+-- 场景6: 课程已结束，不可预约（status=2）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('蜜桃臀塑造', 103, 3, '2026-05-30 19:00:00', '2026-05-30 20:00:00', 10, 8, 2, '私教专区', '/images/glute.jpg', '针对性训练臀部肌肉群，课程已于5月30日结束，无法预约。', 'coach_li', '2026-05-20 09:15:00', '2026-05-20 09:15:00');
+
+-- 场景7（可选）: 已结束但未满员的课程（status=2，即使有空位也不可预约）
+INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES
+    ('午间冥想放松', 101, 1, '2026-05-31 12:00:00', '2026-05-31 13:00:00', 15, 6, 2, '冥想室', '/images/meditation_noon.jpg', '午间冥想课程，已于5月31日结束。', 'admin', '2026-05-25 09:00:00', '2026-05-25 09:00:00');

gym-manage-api/manage-db/src/main/resources/db/migration/V8__Create_Member_And_MemberCard.sql

@@ -0,0 +1,281 @@
+-- ============================================
+-- 1. member_user 表（会员表）
+-- ============================================
+
+-- Step 1: 删除已存在的表（如果需要重建）
+-- DROP TABLE IF EXISTS member_user CASCADE;
+
+-- Step 2: 创建 member_user 表
+CREATE TABLE IF NOT EXISTS member_user (
+    -- ========== 主键和基础字段（来自BaseEntity）==========
+                                           id BIGSERIAL PRIMARY KEY,                                      -- 主键ID，自增
+                                           created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,      -- 创建时间
+                                           updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,      -- 更新时间
+
+    -- ========== 会员核心字段 ==========
+                                           member_no VARCHAR(50) NOT NULL UNIQUE,                         -- 会员编号（唯一）
+    nickname VARCHAR(100),                                         -- 昵称
+    phone VARCHAR(255),                                            -- 手机号（AES加密存储）
+    gender INTEGER DEFAULT 0,                                      -- 性别：0-未知，1-男，2-女
+    birthday DATE,                                            -- 生日
+    address VARCHAR(500),                                          -- 地址
+    avatar VARCHAR(500),                                           -- 头像URL
+    subscribed BOOLEAN DEFAULT FALSE,                              -- 是否关注服务号
+    last_login_at TIMESTAMP,                                       -- 最后登录时间
+
+-- ========== 微信相关字段 ==========
+    union_id VARCHAR(100),                                         -- 微信UnionID（跨应用唯一标识）
+    miniapp_open_id VARCHAR(100),                                  -- 小程序OpenID
+    official_open_id VARCHAR(100),                                 -- 服务号OpenID
+
+-- ========== 软删除字段 ==========
+    is_deleted BOOLEAN DEFAULT FALSE                               -- 是否删除（软删除标记）
+    );
+
+-- Step 3: 创建索引
+-- 会员编号索引（唯一索引，加速查询）
+CREATE UNIQUE INDEX IF NOT EXISTS idx_member_user_member_no ON member_user(member_no);
+
+-- UnionID索引（加速跨平台用户查找）
+CREATE INDEX IF NOT EXISTS idx_member_user_union_id ON member_user(union_id);
+
+-- 小程序OpenID索引（加速小程序登录查询）
+CREATE INDEX IF NOT EXISTS idx_member_user_miniapp_openid ON member_user(miniapp_open_id);
+
+-- 服务号OpenID索引（加速服务号事件处理）
+CREATE INDEX IF NOT EXISTS idx_member_user_official_openid ON member_user(official_open_id);
+
+-- 手机号索引（加速手机号查询和去重）
+CREATE INDEX IF NOT EXISTS idx_member_user_phone ON member_user(phone);
+
+-- 软删除索引（加速查询未删除的记录）
+CREATE INDEX IF NOT EXISTS idx_member_user_is_deleted ON member_user(is_deleted);
+
+-- Step 4: 添加注释
+COMMENT ON TABLE member_user IS '会员表';
+
+COMMENT ON COLUMN member_user.id IS '主键ID';
+COMMENT ON COLUMN member_user.created_at IS '创建时间';
+COMMENT ON COLUMN member_user.updated_at IS '更新时间';
+
+COMMENT ON COLUMN member_user.member_no IS '会员编号（唯一，格式：MEM + 8位随机字符）';
+COMMENT ON COLUMN member_user.nickname IS '昵称';
+COMMENT ON COLUMN member_user.phone IS '手机号（AES-128-CBC加密存储）';
+COMMENT ON COLUMN member_user.gender IS '性别：0-未知，1-男，2-女';
+COMMENT ON COLUMN member_user.birthday IS '生日';
+COMMENT ON COLUMN member_user.address IS '地址';
+COMMENT ON COLUMN member_user.avatar IS '头像URL';
+COMMENT ON COLUMN member_user.subscribed IS '是否关注服务号：true-已关注，false-未关注';
+COMMENT ON COLUMN member_user.last_login_at IS '最后登录时间';
+
+COMMENT ON COLUMN member_user.union_id IS '微信UnionID（用户在开放平台的唯一标识，跨应用相同）';
+COMMENT ON COLUMN member_user.miniapp_open_id IS '小程序OpenID（用户在当前小程序的唯一标识）';
+COMMENT ON COLUMN member_user.official_open_id IS '服务号OpenID（用户在当前服务号的唯一标识）';
+
+COMMENT ON COLUMN member_user.is_deleted IS '是否删除（软删除标记）：false-正常，true-已删除';
+
+
+-- ============================================
+-- 2. wechat_user 表（微信用户表）
+-- ============================================
+
+-- Step 1: 删除已存在的表（如果需要重建）
+-- DROP TABLE IF EXISTS wechat_user CASCADE;
+
+-- Step 2: 创建 wechat_user 表
+CREATE TABLE IF NOT EXISTS wechat_user (
+    -- ========== 主键和基础字段（来自BaseEntity）==========
+                                           id BIGSERIAL PRIMARY KEY,                                      -- 主键ID，自增
+                                           created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,      -- 创建时间
+                                           updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,      -- 更新时间
+
+    -- ========== 关联字段 ==========
+                                           member_id BIGINT NOT NULL,                                     -- 会员ID（外键）
+
+    -- ========== 微信标识字段 ==========
+                                           union_id VARCHAR(100),                                         -- 微信UnionID
+    miniapp_openid VARCHAR(100),                                   -- 小程序OpenID
+    mp_openid VARCHAR(100),                                        -- 服务号OpenID
+
+-- ========== 关注状态字段 ==========
+    is_subscribed BOOLEAN DEFAULT FALSE,                           -- 是否关注服务号
+    subscribe_time TIMESTAMP,                                      -- 首次关注时间
+    unsubscribe_time TIMESTAMP                                     -- 最后一次取消关注时间
+    );
+
+-- Step 3: 创建外键约束
+ALTER TABLE wechat_user
+    ADD CONSTRAINT fk_wechat_user_member
+        FOREIGN KEY (member_id) REFERENCES member_user(id) ON DELETE CASCADE;
+
+-- Step 4: 创建索引
+-- UnionID索引（加速跨平台用户查找）
+CREATE INDEX IF NOT EXISTS idx_wechat_user_union_id ON wechat_user(union_id);
+
+-- 小程序OpenID索引（加速小程序登录查询）
+CREATE INDEX IF NOT EXISTS idx_wechat_user_miniapp_openid ON wechat_user(miniapp_openid);
+
+-- 服务号OpenID索引（加速服务号事件处理）
+CREATE INDEX IF NOT EXISTS idx_wechat_user_mp_openid ON wechat_user(mp_openid);
+
+-- 会员ID索引（加速关联查询）
+CREATE INDEX IF NOT EXISTS idx_wechat_user_member_id ON wechat_user(member_id);
+
+-- Step 5: 添加注释
+COMMENT ON TABLE wechat_user IS '微信用户表';
+
+COMMENT ON COLUMN wechat_user.id IS '主键ID';
+COMMENT ON COLUMN wechat_user.created_at IS '创建时间';
+COMMENT ON COLUMN wechat_user.updated_at IS '更新时间';
+
+COMMENT ON COLUMN wechat_user.member_id IS '会员ID（关联 member_user 表的 id 字段）';
+COMMENT ON COLUMN wechat_user.union_id IS '微信UnionID（用户在开放平台的唯一标识）';
+COMMENT ON COLUMN wechat_user.miniapp_openid IS '小程序OpenID（用户在当前小程序的唯一标识）';
+COMMENT ON COLUMN wechat_user.mp_openid IS '服务号OpenID（用户在当前服务号的唯一标识）';
+
+COMMENT ON COLUMN wechat_user.is_subscribed IS '是否关注服务号：true-已关注，false-未关注';
+COMMENT ON COLUMN wechat_user.subscribe_time IS '首次关注时间';
+COMMENT ON COLUMN wechat_user.unsubscribe_time IS '最后一次取消关注时间';
+
+
+-- ============================================
+-- 3. member_card 表（会员卡类型表）
+-- ============================================
+CREATE TABLE IF NOT EXISTS member_card (
+                                           id BIGSERIAL PRIMARY KEY,
+                                           created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                           updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                           deleted_at TIMESTAMP,
+
+                                           member_card_id BIGSERIAL,
+                                           member_card_name VARCHAR(100) NOT NULL,
+    member_card_type VARCHAR(20) NOT NULL,
+    member_card_price DECIMAL(10, 2) NOT NULL,
+    member_card_validity_days INTEGER,
+    member_card_total_times INTEGER,
+    member_card_amount DECIMAL(10, 2),
+    member_card_status INTEGER DEFAULT 1 NOT NULL,
+    extra_config TEXT DEFAULT '{}'
+    );
+
+COMMENT ON TABLE member_card IS '会员卡类型表';
+COMMENT ON COLUMN member_card.member_card_id IS '会员卡ID';
+COMMENT ON COLUMN member_card.member_card_name IS '会员卡名称';
+COMMENT ON COLUMN member_card.member_card_type IS '会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡';
+COMMENT ON COLUMN member_card.member_card_price IS '会员卡价格';
+COMMENT ON COLUMN member_card.member_card_validity_days IS '有效天数（时长卡用）';
+COMMENT ON COLUMN member_card.member_card_total_times IS '总次数（次卡用）';
+COMMENT ON COLUMN member_card.member_card_amount IS '面额（储值卡用）';
+COMMENT ON COLUMN member_card.member_card_status IS '状态：0-下架, 1-上架';
+COMMENT ON COLUMN member_card.extra_config IS '扩展配置（JSON格式）';
+
+
+-- ============================================
+-- 4. member_card_record 表（会员卡记录表）
+-- ============================================
+CREATE TABLE IF NOT EXISTS member_card_record (
+                                                  id BIGSERIAL PRIMARY KEY,
+                                                  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                  deleted_at TIMESTAMP,
+
+                                                  member_card_record_id BIGSERIAL,
+                                                  member_id BIGINT NOT NULL,
+                                                  member_card_id BIGINT NOT NULL,
+                                                  status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE',
+    remaining_times INTEGER DEFAULT 0,
+    remaining_amount DECIMAL(10, 2) DEFAULT 0.00,
+    expire_time TIMESTAMP,
+    source_order_id BIGINT,
+    purchase_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    version INTEGER DEFAULT 0 NOT NULL,
+    card_composition TEXT
+    );
+
+-- 索引优化
+CREATE INDEX IF NOT EXISTS idx_member_card_record_member_id ON member_card_record(member_id);
+CREATE INDEX IF NOT EXISTS idx_member_card_record_status ON member_card_record(status);
+CREATE INDEX IF NOT EXISTS idx_member_card_record_expire_time ON member_card_record(expire_time);
+CREATE INDEX IF NOT EXISTS idx_member_card_record_member_status ON member_card_record(member_id, status);
+CREATE INDEX IF NOT EXISTS idx_member_card_record_status_expire ON member_card_record(status, expire_time)
+    WHERE status = 'ACTIVE';
+
+COMMENT ON TABLE member_card_record IS '会员卡记录表（会员持有的卡）';
+COMMENT ON COLUMN member_card_record.member_card_record_id IS '会员卡记录ID';
+COMMENT ON COLUMN member_card_record.member_id IS '会员ID';
+COMMENT ON COLUMN member_card_record.member_card_id IS '会员卡类型ID';
+COMMENT ON COLUMN member_card_record.status IS '状态：ACTIVE-有效, USED_UP-用完, EXPIRED-过期, REFUNDED-已退款';
+COMMENT ON COLUMN member_card_record.remaining_times IS '剩余次数';
+COMMENT ON COLUMN member_card_record.remaining_amount IS '剩余金额';
+COMMENT ON COLUMN member_card_record.expire_time IS '到期时间';
+COMMENT ON COLUMN member_card_record.source_order_id IS '来源订单ID';
+COMMENT ON COLUMN member_card_record.purchase_time IS '购买时间';
+COMMENT ON COLUMN member_card_record.version IS '乐观锁版本号';
+COMMENT ON COLUMN member_card_record.card_composition IS '卡片组成（JSON格式，用于组合卡）';
+
+
+-- ============================================
+-- 5. member_card_transactions 表（会员卡交易流水表）
+-- ============================================
+CREATE TABLE IF NOT EXISTS member_card_transactions (
+                                                        id BIGSERIAL PRIMARY KEY,
+                                                        created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+                                                        member_card_record_id BIGINT NOT NULL,
+                                                        member_id BIGINT NOT NULL,
+                                                        member_card_id BIGINT NOT NULL,
+                                                        operation_type VARCHAR(20) NOT NULL,
+    change_amount INTEGER DEFAULT 0,
+    change_balance DECIMAL(10, 2) DEFAULT 0.00,
+    after_remaining_count INTEGER DEFAULT 0,
+    after_remaining_balance DECIMAL(10, 2) DEFAULT 0.00,
+    related_biz_type VARCHAR(20),
+    source_order_id BIGINT,
+    remark VARCHAR(500),
+    is_archived BOOLEAN DEFAULT FALSE,
+    archived_at TIMESTAMP
+    );
+
+-- 索引优化
+CREATE INDEX IF NOT EXISTS idx_member_card_transactions_member_id ON member_card_transactions(member_id);
+CREATE INDEX IF NOT EXISTS idx_member_card_transactions_record_id ON member_card_transactions(member_card_record_id);
+CREATE INDEX IF NOT EXISTS idx_member_card_transactions_created_at ON member_card_transactions(created_at);
+CREATE INDEX IF NOT EXISTS idx_member_card_transactions_member_type_time
+    ON member_card_transactions(member_id, operation_type, created_at);
+
+COMMENT ON TABLE member_card_transactions IS '会员卡交易流水表';
+COMMENT ON COLUMN member_card_transactions.operation_type IS '操作类型：PURCHASE-购买, DEDUCT-扣次/扣费, RENEW-续费, REFUND-退款, EXPIRE-过期';
+COMMENT ON COLUMN member_card_transactions.change_amount IS '变动次数';
+COMMENT ON COLUMN member_card_transactions.change_balance IS '变动金额';
+COMMENT ON COLUMN member_card_transactions.after_remaining_count IS '变动后剩余次数';
+COMMENT ON COLUMN member_card_transactions.after_remaining_balance IS '变动后剩余金额';
+COMMENT ON COLUMN member_card_transactions.related_biz_type IS '关联业务类型：GROUP_CLASS-团课, PT_CLASS-私教, CHECK_IN-签到';
+COMMENT ON COLUMN member_card_transactions.is_archived IS '是否已归档';
+COMMENT ON COLUMN member_card_transactions.archived_at IS '归档时间';
+
+
+-- ============================================
+-- 6. refund_application 表（退款申请表）
+-- ============================================
+CREATE TABLE IF NOT EXISTS refund_application (
+                                                  id BIGSERIAL PRIMARY KEY,
+                                                  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                  deleted_at TIMESTAMP,
+
+                                                  record_id BIGINT NOT NULL,
+                                                  member_id BIGINT NOT NULL,
+                                                  status VARCHAR(20) NOT NULL DEFAULT 'PENDING',
+    reason VARCHAR(500),
+    apply_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    audit_time TIMESTAMP,
+    auditor_id BIGINT,
+    audit_remark VARCHAR(500),
+    refund_amount DECIMAL(10, 2)
+    );
+
+CREATE INDEX IF NOT EXISTS idx_refund_application_record_id ON refund_application(record_id);
+CREATE INDEX IF NOT EXISTS idx_refund_application_status ON refund_application(status);
+
+COMMENT ON TABLE refund_application IS '退款申请表';
+COMMENT ON COLUMN refund_application.status IS '状态：PENDING-待审核, APPROVED-已批准, REJECTED-已拒绝, PROCESSING-处理中, SUCCESS-成功, FAILED-失败';

gym-manage-api/manage-db/src/main/resources/db/migration/V9__Add_GroupCourse_Booking_Snapshot_Fields.sql

@@ -0,0 +1,15 @@
+-- ============================================
+-- 为团课预约记录表添加课程冗余字段
+-- 用于保存预约时的课程快照信息
+-- ============================================
+
+ALTER TABLE group_course_booking
+    ADD COLUMN IF NOT EXISTS course_name VARCHAR(100),
+    ADD COLUMN IF NOT EXISTS course_start_time TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS course_end_time TIMESTAMP,
+    ADD COLUMN IF NOT EXISTS location VARCHAR(255);
+
+COMMENT ON COLUMN group_course_booking.course_name IS '课程名称（冗余字段，保存预约时的课程快照）';
+COMMENT ON COLUMN group_course_booking.course_start_time IS '课程开始时间（冗余字段，保存预约时的课程快照）';
+COMMENT ON COLUMN group_course_booking.course_end_time IS '课程结束时间（冗余字段，保存预约时的课程快照）';
+COMMENT ON COLUMN group_course_booking.location IS '上课地点（冗余字段，保存预约时的课程快照）';

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java

@@ -50,7 +50,15 @@ public class SecurityConfig {
                     spec.pathMatchers("/api/auth/**").permitAll()
                             .pathMatchers("/api/public/**").permitAll()
                             .pathMatchers("/ws/**").permitAll()
-                            .pathMatchers("/actuator/**").permitAll();
+                            .pathMatchers("/actuator/**").permitAll()
+                            .pathMatchers("/api/groupCourse/**").permitAll()
+                            .pathMatchers("/api/member/**").permitAll()
+                            .pathMatchers("/api/admin/member/**").permitAll()
+                            .pathMatchers("/api/member-cards/**").permitAll()
+                            .pathMatchers("/api/member-card-records/**").permitAll()
+//                            .pathMatchers("/**").permitAll()
+                            .pathMatchers("/api/member-card-transactions/**").permitAll();
+
 
                     if (isDevOrTest) {
                         spec.pathMatchers("/swagger-ui.html").permitAll()

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserService.java

@@ -15,6 +15,7 @@ import cn.novalon.gym.manage.sys.core.repository.IUserRoleRepository;
 import cn.novalon.gym.manage.sys.core.service.ISysUserService;
 import cn.novalon.gym.manage.sys.core.command.CreateUserCommand;
 import cn.novalon.gym.manage.sys.core.command.UpdateUserCommand;
+import cn.novalon.gym.manage.sys.dto.response.UserResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;

gym-manage-api/pom.xml

@@ -43,6 +43,7 @@
         <module>manage-notify</module>
         <module>manage-file</module>
         <module>gym-member</module>
+        <module>gym-groupCourse</module>
 	</modules>
 
     <dependencyManagement>
@@ -222,7 +223,19 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-    </dependencies>
+
+        <!--        HuTool工具箱-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.38</version>
+        </dependency>
+
+        <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+            </dependency>
+        </dependencies>
 
     <build>
         <plugins>

gym-manage-uniapp/.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+unpackage/
+.hbuilderx/
+.DS_Store

gym-manage-uniapp/App.vue

@@ -0,0 +1,77 @@
+<template>
+  <view>
+    <GlobalLoading />
+  </view>
+</template>
+<script>
+	import GlobalLoading from '@/components/global/GlobalLoading.vue'
+export default {
+  onLaunch: function() {
+    console.log('App Launch')
+    this.preloadTabData()
+  },
+  onShow: function() {
+    console.log('App Show')
+  },
+  onHide: function() {
+    console.log('App Hide')
+  },
+  methods: {
+    // 预加载所有 Tab 页面的核心数据
+    preloadTabData() {
+      // 延迟执行，不阻塞首屏
+      setTimeout(() => {
+        // 预加载课程数据
+        // #ifdef MP-WEIXIN
+        // 小程序端预请求数据
+        // #endif
+        
+        // 预加载训练数据
+       
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import 'common/style/base.css';
+
+/* 全局骨架屏样式 */
+.skeleton {
+  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+  background-size: 200% 100%;
+  animation: skeleton-loading 1.5s infinite;
+}
+
+@keyframes skeleton-loading {
+  0% { background-position: 200% 0; }
+  100% { background-position: -200% 0; }
+}
+
+/* 页面切换动画 */
+.page-enter-active,
+.page-leave-active {
+  transition: opacity 0.2s ease, transform 0.2s ease;
+}
+
+.page-enter-from {
+  opacity: 0;
+  transform: translateX(30rpx);
+}
+
+.page-leave-to {
+  opacity: 0;
+  transform: translateX(-30rpx);
+}
+
+.app-container {
+  width: 100%;
+  min-height: 100vh;
+  max-width: 430px;
+  margin: 0 auto;
+  background-color: var(--bg-light);
+  position: relative;
+  overflow-x: hidden;
+}
+</style>

gym-manage-uniapp/api/main.js

@@ -0,0 +1,50 @@
+import request from "@/utils/request.js"
+
+export function login(params) {
+  return request.post('/member/auth/miniapp/login', params)
+}
+
+export function logout() {
+  return request.post('/member/auth/logout')
+}
+
+export function getQRCode(options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
+  return request.get('/checkIn/qrcode', {}, options)
+}
+
+export function checkIn(params) {
+  return request.post('/checkIn/scan', params)
+}
+
+export function getUserInfo(options = { cache: true, cacheTime: 30 * 60 * 1000 }) {
+  return request.get('/member/info', {}, options)
+}
+
+export function updateUserInfo(params) {
+  return request.put('/member/info', params)
+}
+
+export function getRecommendCourses(options = { cache: true, cacheTime: 10 * 60 * 1000 }) {
+  return request.get('/course/recommend', {}, options)
+}
+
+export function getCourseDetail(id, options = { cache: true, cacheTime: 15 * 60 * 1000 }) {
+  return request.get(`/course/${id}`, {}, options)
+}
+
+export function getGroupCoursePage(params = {}, options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
+  const { page = 0, size = 10, sort = 'id', order = 'asc', keyword } = params
+  return request.post('/groupCourse/page', { page, size, sort, order, keyword }, options)
+}
+
+export default {
+  login,
+  logout,
+  getQRCode,
+  checkIn,
+  getUserInfo,
+  updateUserInfo,
+  getRecommendCourses,
+  getCourseDetail,
+  getGroupCoursePage
+}

gym-manage-uniapp/common/constants/routes.js

@@ -0,0 +1,189 @@
+// common/constants/routes.js
+
+/** 与 pages.json 保持一致 */
+export const PAGE = {
+    INDEX: '/pages/index/index',
+    COURSE: '/pages/course/index',
+    TRAIN: '/pages/train/index',
+    DISCOVER: '/pages/discover/index',
+    MEMBER: '/pages/memberInfo/memberInfo',
+    BOOKING: '/pages/memberInfo/booking',
+    MEMBER_CARD: '/pages/memberInfo/memberCard',
+    USER_INFO: '/pages/memberInfo/userInfo',
+    BODY_TEST_HOME: '/pages/memberInfo/bodyTestHome',
+    BODY_TEST_CONNECT: '/pages/memberInfo/bodyTestConnect',
+    BODY_TEST_MEASURING: '/pages/memberInfo/bodyTestMeasuring',
+    BODY_TEST_REPORT: '/pages/memberInfo/bodyTestReport',
+    BODY_TEST_HISTORY: '/pages/memberInfo/bodyTestHistory',
+    BODY_TEST_COMPARE: '/pages/memberInfo/bodyTestCompare',
+    BODY_TEST_SETTINGS: '/pages/memberInfo/bodyTestSettings',
+    BODY_TEST_TREND: '/pages/memberInfo/bodyTestTrend',
+    COURSE_LIST: '/pages/groupCourse/list',
+    COURSE_DETAIL: '/pages/memberInfo/courseDetail',
+    COUPON_DETAIL: '/pages/memberInfo/couponDetail',
+    COUPON_CENTER: '/pages/memberInfo/couponCenter',
+    POINTS_MALL: '/pages/memberInfo/pointsMall',
+    POINTS_HISTORY: '/pages/memberInfo/pointsHistory',
+    ONLINE_COURSE: '/pages/memberInfo/onlineCourseDetail',
+    COURSE_EVALUATE: '/pages/memberInfo/courseEvaluate',
+    TRAIN_SESSION: '/pages/memberInfo/trainSessionDetail',
+    TRAIN_REPORT: '/pages/memberInfo/trainReport',
+    COUPONS: '/pages/memberInfo/coupons',
+    POINTS: '/pages/memberInfo/points',
+    REFERRAL: '/pages/memberInfo/referral',
+    MY_COURSES: '/pages/memberInfo/myCourses',
+    CHECK_IN_HISTORY: '/pages/memberInfo/checkInHistory'
+}
+
+/** 底部 TabBar 页面路径，顺序与 TabBar.vue 一致 */
+export const TAB_ROUTES = [
+    PAGE.INDEX,
+    PAGE.COURSE,
+    PAGE.TRAIN,
+    PAGE.DISCOVER,
+    PAGE.MEMBER
+]
+
+const TAB_PAGES = new Set(TAB_ROUTES)
+
+/** 防止 Tab 连点触发并发路由 */
+let tabNavigating = false
+
+function normalizePath(url) {
+    if (!url) return ''
+    const path = url.split('?')[0]
+    return path.startsWith('/') ? path : `/${path}`
+}
+
+export function getTabIndexByRoute(route) {
+    const path = normalizePath(route)
+    const idx = TAB_ROUTES.indexOf(path)
+    return idx >= 0 ? idx : 0
+}
+
+export function getCurrentRoutePath() {
+    const pages = getCurrentPages()
+    if (!pages.length) return PAGE.INDEX
+    const page = pages[pages.length - 1]
+    const route = page.route || page.$page?.fullPath || ''
+    return normalizePath(route ? `/${route}` : PAGE.INDEX)
+}
+
+/**
+ * 跳转到普通页面（非 TabBar 页面）
+ * 使用 navigateTo，保留页面栈，可以正常返回
+ */
+export function navigateToPage(url) {
+	uni.showLoading({ title: '加载中...', mask: true })
+    const path = normalizePath(url)
+    
+    // ✅ 如果目标是 TabBar 页面，不应该使用 navigateTo
+    // 这种情况应该使用 switchToTabPage（会清空页面栈）
+    if (TAB_PAGES.has(path)) {
+        console.warn('[navigateToPage] 不应该用 navigateTo 跳转 TabBar 页面，请使用 switchToTabPage')
+        switchToTabPage(path)
+        return
+    }
+    
+    console.log('[navigateToPage] 跳转到:', url)
+    
+    uni.navigateTo({
+        url,
+        fail: (err) => {
+            console.error('[navigateTo]', url, err)
+            // 页面栈满时降级使用 redirectTo
+            if (err.errMsg && err.errMsg.includes('limit')) {
+                uni.redirectTo({ url })
+            } else {
+                uni.showToast({ title: '页面跳转失败', icon: 'none' })
+            }
+        },
+		success: () => {
+			setTimeout(() => {
+				uni.hideLoading()
+			},3000)
+		}
+    })
+}
+
+/**
+ * 跳转到 TabBar 页面（清空页面栈）
+ * 用于从任何页面跳转到首页/课程/训练等 TabBar 页面
+ */
+export function switchToTabPage(url) {
+    const path = normalizePath(url)
+    if (!TAB_PAGES.has(path)) {
+        console.warn('[switchToTabPage] 目标不是 TabBar 页面:', path)
+        navigateToPage(url)
+        return
+    }
+    
+    if (getCurrentRoutePath() === path || tabNavigating) return
+    
+    console.log('[switchToTabPage] 跳转到 TabBar:', path)
+    
+    tabNavigating = true
+    uni.switchTab({  // ✅ 改用 switchTab，而不是 reLaunch
+        url: path,
+        complete: () => {
+            setTimeout(() => {
+                tabNavigating = false
+            }, 320)
+        },
+        fail: (err) => {
+            console.error('[switchTab]', path, err)
+            // 降级使用 reLaunch
+            uni.reLaunch({
+                url: path,
+                complete: () => {
+                    setTimeout(() => {
+                        tabNavigating = false
+                    }, 320)
+                }
+            })
+        }
+    })
+}
+
+/**
+ * 重置到 TabBar 页面（清空所有历史）
+ * 用于退出登录、强制跳转等场景
+ */
+export function reLaunchToTabPage(url) {
+    const path = normalizePath(url)
+    console.log('[reLaunchToTabPage] 重置到:', path)
+    
+    uni.reLaunch({
+        url: path,
+        fail: (err) => {
+            console.error('[reLaunch]', path, err)
+            uni.switchTab({ url: path })
+        }
+    })
+}
+
+/**
+ * 返回上一页，如果没有上一页则跳转到指定 TabBar 页面
+ */
+export function goBackOrTab(fallbackUrl = PAGE.MEMBER) {
+    const pages = getCurrentPages()
+    if (pages.length > 1) {
+        uni.navigateBack({ delta: 1 })
+    } else {
+        switchToTabPage(fallbackUrl)
+    }
+}
+
+/**
+ * 子页面返回个人中心
+ */
+export function backToMemberCenter() {
+    goBackOrTab(PAGE.MEMBER)
+}
+
+/**
+ * 子页面返回指定 TabBar 页面
+ */
+export function backToTab(tabUrl) {
+    goBackOrTab(tabUrl)
+}

gym-manage-uniapp/common/memberInfo/bodyTestChart.js

@@ -0,0 +1,163 @@
+const COLORS = {
+    primary: '#0B2B4B',
+    accent: '#FF6B35',
+    accentLight: 'rgba(255, 107, 53, 0.25)',
+    grid: '#E9EDF2',
+    text: '#5E6F8D',
+    fill: 'rgba(26, 74, 111, 0.35)',
+    line: '#1A4A6F'
+}
+
+function setupCanvas(canvas, width, height, dpr) {
+    canvas.width = width * dpr
+    canvas.height = height * dpr
+    const ctx = canvas.getContext('2d')
+    ctx.scale(dpr, dpr)
+    return ctx
+}
+
+/** 绘制雷达图 */
+export function drawRadarChart(canvas, opts = {}) {
+    if (!canvas) return
+    const {
+        width = 280,
+        height = 240,
+        labels = [],
+        values = [],
+        dpr = 1
+    } = opts
+    const ctx = setupCanvas(canvas, width, height, dpr)
+    ctx.clearRect(0, 0, width, height)
+
+    const cx = width / 2
+    const cy = height / 2 + 8
+    const radius = Math.min(width, height) * 0.32
+    const count = labels.length || 6
+    const angleStep = (Math.PI * 2) / count
+
+    for (let level = 1; level <= 4; level += 1) {
+        ctx.beginPath()
+        const r = (radius * level) / 4
+        for (let i = 0; i <= count; i += 1) {
+            const angle = -Math.PI / 2 + i * angleStep
+            const x = cx + r * Math.cos(angle)
+            const y = cy + r * Math.sin(angle)
+            if (i === 0) ctx.moveTo(x, y)
+            else ctx.lineTo(x, y)
+        }
+        ctx.strokeStyle = COLORS.grid
+        ctx.lineWidth = 1
+        ctx.stroke()
+    }
+
+    for (let i = 0; i < count; i += 1) {
+        const angle = -Math.PI / 2 + i * angleStep
+        ctx.beginPath()
+        ctx.moveTo(cx, cy)
+        ctx.lineTo(cx + radius * Math.cos(angle), cy + radius * Math.sin(angle))
+        ctx.strokeStyle = COLORS.grid
+        ctx.stroke()
+    }
+
+    ctx.beginPath()
+    values.forEach((val, i) => {
+        const ratio = Math.min(1, Math.max(0, val / 100))
+        const angle = -Math.PI / 2 + i * angleStep
+        const x = cx + radius * ratio * Math.cos(angle)
+        const y = cy + radius * ratio * Math.sin(angle)
+        if (i === 0) ctx.moveTo(x, y)
+        else ctx.lineTo(x, y)
+    })
+    ctx.closePath()
+    ctx.fillStyle = COLORS.fill
+    ctx.fill()
+    ctx.strokeStyle = COLORS.accent
+    ctx.lineWidth = 2
+    ctx.stroke()
+
+    ctx.font = '11px sans-serif'
+    ctx.fillStyle = COLORS.text
+    ctx.textAlign = 'center'
+    labels.forEach((label, i) => {
+        const angle = -Math.PI / 2 + i * angleStep
+        const x = cx + (radius + 18) * Math.cos(angle)
+        const y = cy + (radius + 18) * Math.sin(angle) + 4
+        ctx.fillText(label, x, y)
+    })
+}
+
+/** 绘制折线趋势图 */
+export function drawTrendChart(canvas, opts = {}) {
+    if (!canvas) return
+    const {
+        width = 300,
+        height = 160,
+        points = [],
+        dpr = 1,
+        unit = ''
+    } = opts
+    const ctx = setupCanvas(canvas, width, height, dpr)
+    ctx.clearRect(0, 0, width, height)
+
+    if (!points.length) {
+        ctx.fillStyle = COLORS.text
+        ctx.font = '13px sans-serif'
+        ctx.textAlign = 'center'
+        ctx.fillText('暂无趋势数据', width / 2, height / 2)
+        return
+    }
+
+    const pad = { top: 16, right: 12, bottom: 28, left: 12 }
+    const chartW = width - pad.left - pad.right
+    const chartH = height - pad.top - pad.bottom
+    const values = points.map((p) => p.value)
+    const min = Math.min(...values) * 0.95
+    const max = Math.max(...values) * 1.05
+    const range = max - min || 1
+
+    ctx.strokeStyle = COLORS.grid
+    ctx.lineWidth = 1
+    for (let i = 0; i <= 3; i += 1) {
+        const y = pad.top + (chartH * i) / 3
+        ctx.beginPath()
+        ctx.moveTo(pad.left, y)
+        ctx.lineTo(width - pad.right, y)
+        ctx.stroke()
+    }
+
+    const coords = points.map((p, i) => ({
+        x: pad.left + (chartW * i) / Math.max(1, points.length - 1),
+        y: pad.top + chartH - ((p.value - min) / range) * chartH
+    }))
+
+    ctx.beginPath()
+    coords.forEach((pt, i) => {
+        if (i === 0) ctx.moveTo(pt.x, pt.y)
+        else ctx.lineTo(pt.x, pt.y)
+    })
+    ctx.strokeStyle = COLORS.line
+    ctx.lineWidth = 2
+    ctx.stroke()
+
+    coords.forEach((pt, i) => {
+        ctx.beginPath()
+        ctx.arc(pt.x, pt.y, 4, 0, Math.PI * 2)
+        ctx.fillStyle = COLORS.accent
+        ctx.fill()
+        ctx.strokeStyle = '#fff'
+        ctx.lineWidth = 1.5
+        ctx.stroke()
+
+        ctx.fillStyle = COLORS.text
+        ctx.font = '10px sans-serif'
+        ctx.textAlign = 'center'
+        ctx.fillText(points[i].label, pt.x, height - 8)
+    })
+
+    if (unit) {
+        ctx.fillStyle = COLORS.text
+        ctx.font = '10px sans-serif'
+        ctx.textAlign = 'left'
+        ctx.fillText(unit, pad.left, pad.top - 2)
+    }
+}

gym-manage-uniapp/common/memberInfo/bodyTestStore.js

@@ -0,0 +1,283 @@
+import { bodyTestMock } from './mockData.js'
+
+function clone(value) {
+    return JSON.parse(JSON.stringify(value))
+}
+
+function formatRecordTime(date) {
+    const y = date.getFullYear()
+    const m = String(date.getMonth() + 1).padStart(2, '0')
+    const d = String(date.getDate()).padStart(2, '0')
+    const h = String(date.getHours()).padStart(2, '0')
+    const min = String(date.getMinutes()).padStart(2, '0')
+    return `${y}-${m}-${d}  ${h}:${min}`
+}
+
+function formatIsoDate(date) {
+    const y = date.getFullYear()
+    const m = String(date.getMonth() + 1).padStart(2, '0')
+    const d = String(date.getDate()).padStart(2, '0')
+    return `${y}-${m}-${d}`
+}
+
+function formatTime(date) {
+    const h = String(date.getHours()).padStart(2, '0')
+    const min = String(date.getMinutes()).padStart(2, '0')
+    return `${h}:${min}`
+}
+
+export function getDefaultBodyTestState() {
+    return {
+        settings: { ...bodyTestMock.settings },
+        device: { ...bodyTestMock.device },
+        records: clone(bodyTestMock.records)
+    }
+}
+
+export function mergeBodyTestState(saved) {
+    const defaults = getDefaultBodyTestState()
+    if (!saved) return defaults
+    return {
+        settings: { ...defaults.settings, ...(saved.settings || {}) },
+        device: { ...defaults.device, ...(saved.device || {}) },
+        records: saved.records?.length ? saved.records : defaults.records
+    }
+}
+
+export function getLatestBodyTestRecord(store) {
+    const records = store.bodyTest?.records || []
+    return records.length ? { ...records[0] } : null
+}
+
+export function getBodyTestRecordById(store, id) {
+    const numId = Number(id)
+    const record = (store.bodyTest?.records || []).find((item) => item.id === numId)
+    return record ? { ...record } : null
+}
+
+export function getBodyTestHistory(store, year) {
+    let list = (store.bodyTest?.records || []).map((item) => ({ ...item }))
+    if (year && year !== 'all') {
+        list = list.filter((r) => r.date.startsWith(String(year)))
+    }
+    return list
+}
+
+export function getBodyTestChangeBadge(record, previous) {
+    if (!previous?.metrics || !record?.metrics) return null
+    const diff = Math.round((record.metrics.bodyFat - previous.metrics.bodyFat) * 10) / 10
+    if (diff === 0) return null
+    const sign = diff > 0 ? '+' : ''
+    return { key: 'bodyFat', text: `体脂率${sign}${diff}%`, good: diff < 0 }
+}
+
+export function getBodyTestYears(store) {
+    const years = new Set((store.bodyTest?.records || []).map((r) => r.date.slice(0, 4)))
+    return ['all', ...Array.from(years).sort().reverse()]
+}
+
+export function computeGrade(score) {
+    if (score >= 90) return { grade: 'A', gradeLabel: '优秀' }
+    if (score >= 80) return { grade: 'B+', gradeLabel: '良好' }
+    if (score >= 70) return { grade: 'B', gradeLabel: '中等' }
+    if (score >= 60) return { grade: 'C', gradeLabel: '一般' }
+    return { grade: 'D', gradeLabel: '需改善' }
+}
+
+export function computeScore(metrics) {
+    const bmi = metrics.bmi || 22
+    const bodyFat = metrics.bodyFat || 25
+    const muscle = metrics.muscleMass || 22
+    const bmiScore = bmi >= 18.5 && bmi <= 24 ? 90 : bmi >= 17 && bmi <= 27 ? 75 : 60
+    const fatScore = bodyFat <= 22 ? 92 : bodyFat <= 26 ? 80 : bodyFat <= 30 ? 68 : 55
+    const muscleScore = muscle >= 22 ? 88 : muscle >= 20 ? 76 : 62
+    return Math.round((bmiScore + fatScore + muscleScore) / 3)
+}
+
+export function computeChanges(current, previous) {
+    if (!previous?.metrics) return {}
+    const keys = ['weight', 'bmi', 'bodyFat', 'muscleMass', 'visceralFat', 'bmr', 'bodyWater', 'boneMass']
+    const changes = {}
+    keys.forEach((key) => {
+        const cur = Number(current.metrics[key])
+        const prev = Number(previous.metrics[key])
+        if (Number.isFinite(cur) && Number.isFinite(prev)) {
+            const diff = Math.round((cur - prev) * 10) / 10
+            changes[key] = diff
+        }
+    })
+    return changes
+}
+
+export function formatChangeValue(key, diff, unitSystem = 'metric') {
+    if (diff === undefined || diff === null) return '--'
+    const sign = diff > 0 ? '+' : ''
+    const units = {
+        weight: unitSystem === 'metric' ? 'kg' : 'lb',
+        bodyFat: '%',
+        muscleMass: 'kg',
+        bmi: '',
+        visceralFat: '级',
+        bmr: 'kcal',
+        bodyWater: '%',
+        boneMass: 'kg'
+    }
+    const unit = units[key] || ''
+    return `${sign}${diff}${unit}`
+}
+
+export function buildBodyReportSummary(record, previous) {
+    if (!record) {
+        return {
+            date: '--',
+            weight: '--',
+            bmi: '--',
+            bodyFat: '--',
+            bmr: '--',
+            status: '暂无数据',
+            change: '--'
+        }
+    }
+    const changes = computeChanges(record, previous)
+    const weightChange = changes.weight
+    let changeText = '--'
+    if (weightChange !== undefined) {
+        const sign = weightChange > 0 ? '+' : ''
+        changeText = `${sign}${weightChange}kg`
+    }
+    return {
+        date: record.date,
+        weight: String(record.metrics.weight),
+        bmi: String(record.metrics.bmi),
+        bodyFat: `${record.metrics.bodyFat}%`,
+        bmr: String(record.metrics.bmr),
+        status: record.status,
+        change: changeText,
+        recordId: record.id
+    }
+}
+
+export function getBodyTestTrendData(store, metricKey, limit = 6) {
+    const records = [...(store.bodyTest?.records || [])].reverse().slice(-limit)
+    return records.map((item) => ({
+        id: item.id,
+        date: item.date,
+        label: item.date.slice(5),
+        value: Number(item.metrics[metricKey]) || 0
+    }))
+}
+
+export function getCompareData(store, idA, idB) {
+    const a = getBodyTestRecordById(store, idA)
+    const b = getBodyTestRecordById(store, idB)
+    if (!a || !b) return null
+    const keys = ['weight', 'bmi', 'bodyFat', 'muscleMass', 'visceralFat', 'bmr']
+    const metrics = keys.map((key) => ({
+        key,
+        label: bodyTestMock.metricDefs.find((m) => m.key === key)?.label || key,
+        valueA: a.metrics[key],
+        valueB: b.metrics[key],
+        diff: Math.round((a.metrics[key] - b.metrics[key]) * 10) / 10
+    }))
+    return { recordA: a, recordB: b, metrics }
+}
+
+export function getRecommendedCourses(record) {
+    const ids = record?.recommendedCourseIds || []
+    return bodyTestMock.recommendedCourses.filter((c) => ids.includes(c.id))
+}
+
+export function updateBodyTestSettings(store, patch) {
+    store.bodyTest.settings = { ...store.bodyTest.settings, ...patch }
+    return store
+}
+
+export function connectBodyTestDevice(store) {
+    store.bodyTest.device = {
+        ...store.bodyTest.device,
+        connected: true,
+        battery: Math.min(100, (store.bodyTest.device.battery || 80) + Math.floor(Math.random() * 5)),
+        lastConnected: formatRecordTime(new Date())
+    }
+    return store
+}
+
+export function disconnectBodyTestDevice(store) {
+    store.bodyTest.device = { ...store.bodyTest.device, connected: false }
+    return store
+}
+
+function nextRecordId(records) {
+    return (records || []).reduce((max, item) => Math.max(max, item.id || 0), 0) + 1
+}
+
+/** 模拟一次完整体测并写入记录 */
+export function saveSimulatedBodyTestRecord(store, finalMetrics) {
+    const now = new Date()
+    const previous = getLatestBodyTestRecord(store)
+    const metrics = { ...finalMetrics }
+    const heightCm = Number(store.profile?.height) || 165
+    const heightM = heightCm / 100
+    metrics.bmi = Math.round((metrics.weight / (heightM * heightM)) * 10) / 10
+
+    const score = computeScore(metrics)
+    const { grade, gradeLabel } = computeGrade(score)
+    const status = score >= 80 ? '比较健康' : score >= 70 ? '需关注' : '建议改善'
+
+    const radar = {
+        weight: Math.min(95, Math.round(score * 0.9 + Math.random() * 5)),
+        bodyFat: Math.min(95, Math.round(100 - metrics.bodyFat * 2.5)),
+        muscle: Math.min(95, Math.round(metrics.muscleMass * 3.2)),
+        bone: Math.min(95, Math.round(metrics.boneMass * 32)),
+        water: Math.min(95, Math.round(metrics.bodyWater * 1.4)),
+        bmr: Math.min(95, Math.round(metrics.bmr / 16))
+    }
+
+    const record = {
+        id: nextRecordId(store.bodyTest.records),
+        date: formatIsoDate(now),
+        time: formatTime(now),
+        score,
+        grade,
+        gradeLabel,
+        status,
+        metrics,
+        radar,
+        bodySegments: clone(bodyTestMock.records[0].bodySegments),
+        advice: clone(bodyTestMock.records[0].advice),
+        recommendedCourseIds: [1, 2]
+    }
+
+    if (previous) {
+        record.changes = computeChanges(record, previous)
+    }
+
+    store.bodyTest.records.unshift(record)
+    store.bodyReport = buildBodyReportSummary(record, previous)
+    return record
+}
+
+/** 测量过程实时数据插值 */
+export function interpolateMeasuringMetrics(progress, profile) {
+    const baseWeight = Number(profile?.weight) || 64
+    const target = {
+        weight: baseWeight - 0.3 + Math.random() * 0.2,
+        bodyFat: 24.5 + Math.random() * 0.8,
+        muscleMass: 22.4 + Math.random() * 0.3,
+        visceralFat: 6,
+        bmr: 1380 + Math.floor(Math.random() * 20),
+        bodyWater: 52.5 + Math.random(),
+        boneMass: 2.4,
+        protein: 16.2
+    }
+    const ratio = Math.min(1, progress / 100)
+    return {
+        weight: Math.round((baseWeight + (target.weight - baseWeight) * ratio) * 10) / 10,
+        bodyFat: Math.round((26 + (target.bodyFat - 26) * ratio) * 10) / 10,
+        muscleMass: Math.round((21.5 + (target.muscleMass - 21.5) * ratio) * 10) / 10,
+        bmr: Math.round(1340 + (target.bmr - 1340) * ratio),
+        bodyWater: Math.round((51 + (target.bodyWater - 51) * ratio) * 10) / 10
+    }
+}
+
+export { bodyTestMock }

gym-manage-uniapp/common/memberInfo/bookingStore.js

@@ -0,0 +1,127 @@
+import { courseCatalogMock } from './mockData.js'
+
+function clone(value) {
+    return JSON.parse(JSON.stringify(value))
+}
+
+export function getDefaultCourseCatalog() {
+    return clone(courseCatalogMock.courses)
+}
+
+export function mergeCourseCatalog(saved) {
+    const defaults = getDefaultCourseCatalog()
+    if (!saved?.length) return defaults
+    return saved.map((item, i) => ({ ...defaults[i], ...item }))
+}
+
+function parseCourseStart(course) {
+    const str = `${course.date} ${course.startTime}`.replace(/-/g, '/')
+    return new Date(str)
+}
+
+function getPeriod(hour) {
+    if (hour < 12) return 'morning'
+    if (hour < 18) return 'afternoon'
+    return 'evening'
+}
+
+export function filterCourses(courses, filters = {}) {
+    const {
+        date = '',
+        weekDates = [],
+        type = 'all',
+        coach = '全部',
+        period = 'all'
+    } = filters
+
+    return courses.filter((c) => {
+        if (type !== 'all' && c.type !== type) return false
+        if (coach !== '全部' && c.coach !== coach) return false
+        if (period !== 'all' && c.period !== period) return false
+        if (date && c.date !== date) {
+            if (!weekDates.length || !weekDates.includes(c.date)) return false
+        }
+        return true
+    })
+}
+
+export function getCourseById(store, id) {
+    const course = (store.courseCatalog || []).find((c) => c.id === Number(id))
+    return course ? { ...course } : null
+}
+
+export function canCancelBooking(item) {
+    if (!item?.courseDate || !item?.startTime) return !!item?.canCancel
+    const start = new Date(`${item.courseDate} ${item.startTime}`.replace(/-/g, '/'))
+    const diff = start - Date.now()
+    return diff >= 2 * 3600000
+}
+
+export function bookCourse(store, courseId) {
+    const course = store.courseCatalog.find((c) => c.id === Number(courseId))
+    if (!course) return { ok: false, message: '课程不存在' }
+    if (course.enrolled >= course.capacity) return { ok: false, message: '课程已约满' }
+    const exists = store.ongoingBookings.some((b) => b.courseId === course.id)
+    if (exists) return { ok: false, message: '您已预约该课程' }
+
+    course.enrolled += 1
+    const nextId = store.ongoingBookings.reduce((m, b) => Math.max(m, b.id || 0), 0) + 1
+    const parts = course.date.split('-')
+    const booking = {
+        id: nextId,
+        courseId: course.id,
+        title: course.title,
+        banner: course.banner,
+        status: 'booked',
+        statusLabel: '已预约',
+        schedule: `${parts[1]}月${parts[2]}日 ${course.startTime}-${course.endTime}`,
+        dateDay: parts[2],
+        dateMonth: `月${parts[2]}日`,
+        timeRange: `${course.startTime}-${course.endTime}`,
+        courseDate: course.date,
+        startTime: course.startTime,
+        coach: course.coach,
+        coachShort: course.coach.replace('教练', ''),
+        location: course.location,
+        footerText: `可取消（需提前2小时，截止 ${parts[1]}/${parts[2]} ${course.startTime} 前2小时）`,
+        canCancel: true,
+        type: course.type
+    }
+    store.ongoingBookings.unshift(booking)
+    return { ok: true, message: '预约成功', booking }
+}
+
+export function getWeekDates(baseDateStr) {
+    const base = baseDateStr ? new Date(baseDateStr.replace(/-/g, '/')) : new Date()
+    const day = base.getDay() || 7
+    const monday = new Date(base)
+    monday.setDate(base.getDate() - day + 1)
+    const dates = []
+    for (let i = 0; i < 7; i += 1) {
+        const d = new Date(monday)
+        d.setDate(monday.getDate() + i)
+        dates.push(formatIso(d))
+    }
+    return dates
+}
+
+function formatIso(d) {
+    const y = d.getFullYear()
+    const m = String(d.getMonth() + 1).padStart(2, '0')
+    const day = String(d.getDate()).padStart(2, '0')
+    return `${y}-${m}-${day}`
+}
+
+export function enrichCourseForDisplay(course) {
+    const remaining = course.capacity - course.enrolled
+    const percent = Math.round((course.enrolled / course.capacity) * 100)
+    return {
+        ...course,
+        remaining,
+        percent,
+        full: remaining <= 0,
+        scarcityLabel: remaining > 0 && remaining <= 5 ? `仅剩${remaining}席` : ''
+    }
+}
+
+export { courseCatalogMock }

gym-manage-uniapp/common/memberInfo/format.js

@@ -0,0 +1,37 @@
+/** 手机号展示脱敏（中间四位 ****） */
+
+export function maskPhone(phone) {
+    if (phone == null || phone === '') return ''
+
+    const str = String(phone).trim()
+    if (str.includes('****')) return str
+
+    const digits = str.replace(/\D/g, '')
+    if (digits.length === 11) {
+        return `${digits.slice(0, 3)}****${digits.slice(7)}`
+    }
+    if (digits.length > 4) {
+        const hideLen = Math.min(4, digits.length - 3)
+        const start = Math.floor((digits.length - hideLen) / 2)
+        return `${digits.slice(0, start)}${'*'.repeat(hideLen)}${digits.slice(start + hideLen)}`
+    }
+
+    return str
+}
+
+/** 个人中心头部：138****6789  已绑定微信 */
+export function formatMemberCenterPhone(phone) {
+    const masked = maskPhone(phone)
+    return masked ? `${masked}  已绑定微信` : ''
+}
+
+/** 保存前规范化：尽量存 11 位数字；已是脱敏串则原样保留 */
+export function normalizePhoneForStore(phone) {
+    const str = String(phone || '').trim()
+    if (!str) return ''
+    if (str.includes('****')) return str
+
+    const digits = str.replace(/\D/g, '')
+    if (digits.length >= 11) return digits.slice(0, 11)
+    return digits || str
+}

gym-manage-uniapp/common/memberInfo/index.js

@@ -0,0 +1,79 @@
+export { memberCenterMock, userInfoMock, fitnessGoalOptions, bookingMock, memberCardMock, bodyTestMock, moduleMock, courseCatalogMock } from './mockData.js'
+export { statusBarTimeMixin, subPageMixin } from './mixins.js'
+export {
+    loadMemberStore,
+    saveMemberStore,
+    persistMemberStore,
+    syncStats,
+    computeRemainingDays,
+    buildCardTip,
+    formatUpcomingAlert,
+    getBookingPreview,
+    getCenterPageData,
+    cancelOngoingBooking,
+    renewMemberCard,
+    parseLocalDate,
+    saveUserProfile
+} from './store.js'
+export {
+    getLatestBodyTestRecord,
+    getBodyTestRecordById,
+    getBodyTestHistory,
+    computeChanges,
+    formatChangeValue,
+    buildBodyReportSummary,
+    getBodyTestTrendData,
+    getCompareData,
+    getRecommendedCourses,
+    getBodyTestChangeBadge,
+    getBodyTestYears,
+    updateBodyTestSettings,
+    connectBodyTestDevice,
+    disconnectBodyTestDevice,
+    saveSimulatedBodyTestRecord,
+    interpolateMeasuringMetrics,
+    bodyTestMock
+} from './bodyTestStore.js'
+export {
+    getTrainingReportData,
+    getTrainingSessionById,
+    filterTrainingSessions,
+    getCouponsByStatus,
+    getCouponById,
+    useCoupon,
+    deleteExpiredCoupon,
+    getCouponCenterList,
+    claimCouponFromCenter,
+    getPointsPageData,
+    redeemPointsReward,
+    filterPointsHistory,
+    getReferralPageData,
+    getMyCoursesData,
+    getMyCoursesByTab,
+    getOnlineCourseById,
+    updateOnlineProgress,
+    getCheckInHistory,
+    moduleMock
+} from './moduleStore.js'
+export {
+    filterCourses,
+    getCourseById,
+    bookCourse,
+    canCancelBooking,
+    enrichCourseForDisplay,
+    getWeekDates,
+    courseCatalogMock
+} from './bookingStore.js'
+export { previewImage, persistChosenImage, isLocalFilePath } from './media.js'
+export { maskPhone, formatMemberCenterPhone, normalizePhoneForStore } from './format.js'
+export {
+    validateName,
+    validatePhone,
+    validatePhoneForRebind,
+    validateHeight,
+    validateWeight,
+    validateBirthday,
+    validateFitnessGoals,
+    validateUserProfile,
+    showValidationError
+} from './validate.js'

gym-manage-uniapp/common/memberInfo/media.js

@@ -0,0 +1,159 @@
+/** 头像等媒体：真机选图后须 saveFile，/static/ 须 getImageInfo */
+
+function buildStaticPathCandidates(url) {
+    const list = [url]
+    if (url.startsWith('/')) {
+        list.push(url.slice(1))
+    } else {
+        list.push(`/${url}`)
+    }
+    return [...new Set(list.filter(Boolean))]
+}
+
+function isPackageStaticPath(url) {
+    return /^(\/)?static\//i.test(url)
+}
+
+/** chooseImage / saveFile 产生的本地路径（含真机 temp、usr、store） */
+export function isLocalFilePath(url) {
+    if (!url) return false
+    if (/^(wxfile:|file:|blob:|data:)/i.test(url)) return true
+    if (/^https?:\/\/(tmp|usr|store)\//i.test(url)) return true
+    if (/^https?:\/\//i.test(url) && !isPackageStaticPath(url)) return true
+    return false
+}
+
+function showPreviewFail() {
+    uni.showToast({ title: '无法预览头像', icon: 'none' })
+}
+
+function openPreview(path, onFail) {
+    if (!path) {
+        ;(onFail || showPreviewFail)()
+        return
+    }
+    uni.previewImage({
+        urls: [path],
+        current: path,
+        fail: () => (onFail ? onFail() : showPreviewFail())
+    })
+}
+
+function previewLocalFile(url) {
+    openPreview(url, () => {
+        uni.getImageInfo({
+            src: url,
+            success: (res) => {
+                openPreview(res.path || url, showPreviewFail)
+            },
+            fail: showPreviewFail
+        })
+    })
+}
+
+function tryGetImageInfo(candidates, index, onSuccess, onFail) {
+    if (index >= candidates.length) {
+        onFail()
+        return
+    }
+    uni.getImageInfo({
+        src: candidates[index],
+        success: (res) => onSuccess(res.path || candidates[index]),
+        fail: () => tryGetImageInfo(candidates, index + 1, onSuccess, onFail)
+    })
+}
+
+function getMpUserDataPath() {
+    // #ifdef MP-WEIXIN
+    return wx.env.USER_DATA_PATH
+    // #endif
+    return ''
+}
+
+function tryCopyFile(candidates, index, onSuccess, onFail) {
+    // #ifdef MP-WEIXIN
+    const userPath = getMpUserDataPath()
+    if (!userPath) {
+        onFail()
+        return
+    }
+    const fs = uni.getFileSystemManager()
+    const extMatch = candidates[0]?.match(/\.(\w+)(?:\?|$)/)
+    const ext = extMatch ? extMatch[1] : 'png'
+    const dest = `${userPath}/avatar_preview_${Date.now()}.${ext}`
+
+    if (index >= candidates.length) {
+        onFail()
+        return
+    }
+
+    fs.copyFile({
+        srcPath: candidates[index],
+        destPath: dest,
+        success: () => onSuccess(dest),
+        fail: () => tryCopyFile(candidates, index + 1, onSuccess, onFail)
+    })
+    // #endif
+    // #ifndef MP-WEIXIN
+    onFail()
+    // #endif
+}
+
+function previewPackageStatic(url) {
+    const candidates = buildStaticPathCandidates(url)
+    tryGetImageInfo(
+        candidates,
+        0,
+        (path) => openPreview(path, showPreviewFail),
+        () => {
+            tryCopyFile(
+                candidates,
+                0,
+                (path) => openPreview(path, showPreviewFail),
+                showPreviewFail
+            )
+        }
+    )
+}
+
+/** 选图后将临时文件转为真机可预览、可持久化的本地路径 */
+export function persistChosenImage(tempPath) {
+    return new Promise((resolve) => {
+        const path = String(tempPath || '').trim()
+        if (!path) {
+            resolve('')
+            return
+        }
+
+        // #ifdef MP-WEIXIN
+        uni.saveFile({
+            tempFilePath: path,
+            success: (res) => resolve(res.savedFilePath || path),
+            fail: () => resolve(path)
+        })
+        // #endif
+        // #ifndef MP-WEIXIN
+        resolve(path)
+        // #endif
+    })
+}
+
+export function previewImage(src, fallback = '') {
+    const url = String(src || fallback || '').trim()
+    if (!url) {
+        uni.showToast({ title: '暂无头像', icon: 'none' })
+        return
+    }
+
+    if (isLocalFilePath(url)) {
+        previewLocalFile(url)
+        return
+    }
+
+    if (isPackageStaticPath(url)) {
+        previewPackageStatic(url)
+        return
+    }
+
+    previewLocalFile(url)
+}

gym-manage-uniapp/common/memberInfo/mixins.js

@@ -0,0 +1,28 @@
+import { backToMemberCenter } from '../constants/routes.js'
+
+/** 状态栏时间（Pixso 顶栏占位） */
+export const statusBarTimeMixin = {
+    data() {
+        return {
+            statusBarTime: '9:41'
+        }
+    },
+    onLoad() {
+        this.updateStatusBarTime()
+    },
+    methods: {
+        updateStatusBarTime() {
+            const now = new Date()
+            this.statusBarTime = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`
+        }
+    }
+}
+
+/** 子页面返回个人中心 tab */
+export const subPageMixin = {
+    methods: {
+        goBack() {
+            backToMemberCenter()
+        }
+    }
+}

gym-manage-uniapp/common/memberInfo/mockData.js

@@ -0,0 +1,884 @@
+/** 个人中心模块 mock 数据（后续可替换为 API） */
+
+export const memberCenterMock = {
+    userInfo: {
+        name: '张小芳',
+        phone: '13812345678  已绑定微信',
+        memberLevel: '黄金会员',
+        avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AvatarEditWrap.png'
+    },
+    stats: {
+        checkInCount: 128,
+        trainingHours: 23,
+        pointsBalance: 1250
+    },
+    cardInfo: {
+        name: '健身时长卡',
+        detailTag: '详情',
+        expireDate: '有效期至 2025年12月31日',
+        remainingDays: 187,
+        tip: '距离下次到期还有187天，请及时续费'
+    },
+    checkIns: [
+        {
+            id: 1,
+            title: '今日签到 · 瑜伽初级班',
+            time: '2024-07-12 09:05',
+            tag: '团课',
+            tagTheme: 'group'
+        },
+        {
+            id: 2,
+            title: '自由训练 · 进馆记录',
+            time: '2024-07-11 18:30',
+            tag: '自由',
+            tagTheme: 'free'
+        },
+        {
+            id: 3,
+            title: '私教课 · 力量训练',
+            time: '2024-07-10 14:00',
+            tag: '私教',
+            tagTheme: 'private'
+        }
+    ],
+    bodyReport: {
+        date: '2024-07-01',
+        weight: '63.5',
+        bmi: '22.1',
+        bodyFat: '24.8%',
+        bmr: '165',
+        status: '比较健康',
+        change: '-1.2kg'
+    },
+    couponPoints: {
+        amount: '¥50',
+        couponDesc: '满500可用 · 1张',
+        couponAction: '去使用',
+        points: 1250,
+        pointsLabel: '我的积分',
+        pointsAction: '去兑换'
+    },
+    referral: {
+        code: 'FIT-ZXF-2024',
+        invited: 5,
+        registered: 3,
+        purchased: 2
+    }
+}
+
+export const userInfoMock = {
+    name: '张小芳',
+    phone: '13812345678',
+    gender: 'female',
+    birthday: '1995年06月15日',
+    height: '165',
+    weight: '63.5',
+    fitnessGoals: ['减脂', '塑形'],
+    avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AvatarEditWrap.png'
+}
+
+export const fitnessGoalOptions = ['减脂', '塑形', '增肌', '提升耐力', '改善体态']
+
+export const memberCardMock = {
+    card: {
+        name: '黄金健身时长卡',
+        status: '生效中',
+        validityStart: '2024年01月01日',
+        validity: '2024年01月01日 - 2025年12月31日',
+        validityEnd: '2025-12-31',
+        remainingDays: 187
+    },
+    recordTabs: [
+        { key: 'all', label: '全部' },
+        { key: 'consume', label: '消费' },
+        { key: 'checkin', label: '签到' }
+    ],
+    records: [
+        {
+            id: 1,
+            type: 'checkin',
+            title: '瑜伽初级班 · 团课签到',
+            time: '2024-07-12  09:05',
+            value: '-1次',
+            valueType: 'negative',
+            icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/dumbbell.png',
+            iconTheme: 'orange'
+        },
+        {
+            id: 2,
+            type: 'checkin',
+            title: '自由进馆',
+            time: '2024-07-11  18:30',
+            value: '-1天',
+            valueType: 'negative',
+            icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/mappin.png',
+            iconTheme: 'green'
+        },
+        {
+            id: 3,
+            type: 'consume',
+            title: '会员卡充值',
+            time: '2024-07-01  10:00',
+            value: '+90天',
+            valueType: 'positive',
+            icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/pluscircle.png',
+            iconTheme: 'orange'
+        }
+    ],
+    rules: [
+        '时长卡有效期内不限入场次数，但需提前预约团课',
+        '卡到期后不退余额，请合理安排使用',
+        '一卡仅限本人使用，不可转让'
+    ]
+}
+
+/** 智能体测模块 mock 数据 */
+export const bodyTestMock = {
+    settings: {
+        autoSync: true,
+        bluetoothEnabled: true,
+        notifyOnComplete: true,
+        shareAnonymous: false,
+        unitSystem: 'metric'
+    },
+    device: {
+        connected: false,
+        name: 'InBody 270',
+        model: 'IB-270',
+        battery: 86,
+        signal: 'strong',
+        lastConnected: '2024-07-10 18:20'
+    },
+    connectSteps: [
+        { step: 1, title: '开启体测仪', desc: '长按电源键 3 秒，等待蓝牙指示灯闪烁' },
+        { step: 2, title: '靠近设备', desc: '将手机靠近体测仪 1 米范围内' },
+        { step: 3, title: '确认连接', desc: '点击下方按钮搜索并配对设备' }
+    ],
+    metricDefs: [
+        { key: 'weight', label: '体重', unit: 'kg', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/target.png' },
+        { key: 'bmi', label: 'BMI', unit: '', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/activity.png' },
+        { key: 'bodyFat', label: '体脂率', unit: '%', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/trendingdown.png' },
+        { key: 'muscleMass', label: '肌肉量', unit: 'kg', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/dumbbell.png' },
+        { key: 'visceralFat', label: '内脏脂肪', unit: '级', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/alertcircle.png' },
+        { key: 'bmr', label: '基础代谢', unit: 'kcal', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/clock.png' },
+        { key: 'bodyWater', label: '体水分', unit: '%', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/shield.png' },
+        { key: 'boneMass', label: '骨量', unit: 'kg', icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user.png' }
+    ],
+    radarLabels: [
+        { key: 'weight', label: '体重控制' },
+        { key: 'bodyFat', label: '体脂肪' },
+        { key: 'muscle', label: '肌肉量' },
+        { key: 'bone', label: '骨量' },
+        { key: 'water', label: '体水分' },
+        { key: 'bmr', label: '基础代谢' }
+    ],
+    trendMetrics: [
+        { key: 'weight', label: '体重' },
+        { key: 'bodyFat', label: '体脂率' },
+        { key: 'muscleMass', label: '肌肉量' },
+        { key: 'bmi', label: 'BMI' }
+    ],
+    recommendedCourses: [
+        {
+            id: 1,
+            title: '燃脂 HIIT 团课',
+            coach: '李明教练',
+            schedule: '每周二、四 19:00',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            tag: '减脂推荐'
+        },
+        {
+            id: 2,
+            title: '核心力量塑形',
+            coach: '王强教练',
+            schedule: '每周一、三 18:30',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+            tag: '塑形推荐'
+        }
+    ],
+    records: [
+        {
+            id: 4,
+            date: '2024-07-12',
+            time: '09:05',
+            score: 85,
+            grade: 'B+',
+            gradeLabel: '良好',
+            status: '比较健康',
+            bodyAge: 27,
+            realAge: 29,
+            metrics: {
+                weight: 63.5,
+                bmi: 22.1,
+                bodyFat: 24.8,
+                muscleMass: 22.6,
+                visceralFat: 6,
+                bmr: 1385,
+                bodyWater: 52.8,
+                boneMass: 2.42,
+                protein: 16.4
+            },
+            radar: { weight: 78, bodyFat: 72, muscle: 74, bone: 81, water: 79, bmr: 73 },
+            bodySegments: [
+                { part: '左臂', level: 'normal', value: '2.1kg' },
+                { part: '右臂', level: 'normal', value: '2.2kg' },
+                { part: '躯干', level: 'high', value: '28.5kg' },
+                { part: '左腿', level: 'normal', value: '8.6kg' },
+                { part: '右腿', level: 'normal', value: '8.7kg' }
+            ],
+            advice: [
+                '体脂率略高，建议增加有氧训练频率至每周 3-4 次',
+                '核心肌群表现良好，可尝试进阶力量课程',
+                '保持当前蛋白质摄入，有助于维持肌肉量'
+            ],
+            recommendedCourseIds: [1, 2]
+        },
+        {
+            id: 3,
+            date: '2024-06-28',
+            time: '18:40',
+            score: 82,
+            grade: 'B+',
+            gradeLabel: '良好',
+            status: '比较健康',
+            bodyAge: 28,
+            realAge: 29,
+            metrics: {
+                weight: 64.7,
+                bmi: 22.5,
+                bodyFat: 25.3,
+                muscleMass: 22.2,
+                visceralFat: 7,
+                bmr: 1370,
+                bodyWater: 52.1,
+                boneMass: 2.4,
+                protein: 16.1
+            },
+            radar: { weight: 74, bodyFat: 68, muscle: 70, bone: 80, water: 76, bmr: 70 },
+            bodySegments: [
+                { part: '左臂', level: 'normal', value: '2.0kg' },
+                { part: '右臂', level: 'normal', value: '2.1kg' },
+                { part: '躯干', level: 'high', value: '28.2kg' },
+                { part: '左腿', level: 'normal', value: '8.5kg' },
+                { part: '右腿', level: 'normal', value: '8.6kg' }
+            ],
+            advice: [
+                '体重较上次下降 0.8kg，减脂方向正确',
+                '建议配合拉伸课程改善体态'
+            ],
+            recommendedCourseIds: [1]
+        },
+        {
+            id: 2,
+            date: '2024-06-10',
+            time: '10:15',
+            score: 79,
+            grade: 'B',
+            gradeLabel: '中等',
+            status: '需关注',
+            bodyAge: 30,
+            realAge: 29,
+            metrics: {
+                weight: 65.5,
+                bmi: 22.8,
+                bodyFat: 26.1,
+                muscleMass: 21.8,
+                visceralFat: 8,
+                bmr: 1355,
+                bodyWater: 51.5,
+                boneMass: 2.38,
+                protein: 15.8
+            },
+            radar: { weight: 70, bodyFat: 62, muscle: 66, bone: 78, water: 72, bmr: 66 },
+            bodySegments: [
+                { part: '左臂', level: 'low', value: '1.9kg' },
+                { part: '右臂', level: 'normal', value: '2.0kg' },
+                { part: '躯干', level: 'high', value: '28.0kg' },
+                { part: '左腿', level: 'normal', value: '8.4kg' },
+                { part: '右腿', level: 'normal', value: '8.5kg' }
+            ],
+            advice: [
+                '内脏脂肪偏高，建议减少高糖饮食',
+                '增加抗阻训练提升肌肉量'
+            ],
+            recommendedCourseIds: [2]
+        },
+        {
+            id: 1,
+            date: '2024-05-20',
+            time: '14:30',
+            score: 76,
+            grade: 'B',
+            gradeLabel: '中等',
+            status: '需关注',
+            bodyAge: 31,
+            realAge: 29,
+            metrics: {
+                weight: 66.2,
+                bmi: 23.1,
+                bodyFat: 26.8,
+                muscleMass: 21.5,
+                visceralFat: 9,
+                bmr: 1340,
+                bodyWater: 51.0,
+                boneMass: 2.35,
+                protein: 15.5
+            },
+            radar: { weight: 66, bodyFat: 58, muscle: 62, bone: 76, water: 68, bmr: 62 },
+            bodySegments: [
+                { part: '左臂', level: 'low', value: '1.8kg' },
+                { part: '右臂', level: 'low', value: '1.9kg' },
+                { part: '躯干', level: 'high', value: '27.8kg' },
+                { part: '左腿', level: 'normal', value: '8.3kg' },
+                { part: '右腿', level: 'normal', value: '8.4kg' }
+            ],
+            advice: [
+                '建议制定 8 周减脂计划并定期复测',
+                '每日饮水量建议达到 2000ml'
+            ],
+            recommendedCourseIds: [1, 2]
+        }
+    ]
+}
+
+export const bookingMock = {
+    upcomingAlert: '明天 09:00 有一堂瑜伽课，请提前 30 分钟到场',
+    tabs: [
+        { key: 'ongoing', label: '进行中' },
+        { key: 'history', label: '历史预约' }
+    ],
+    ongoing: [
+        {
+            id: 1,
+            title: '瑜伽基础班',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            status: 'booked',
+            statusLabel: '已预约',
+            schedule: '07月15日 09:00-10:00',
+            dateDay: '07',
+            dateMonth: '月15日',
+            timeRange: '09:00-10:00',
+            coach: '李明教练',
+            coachShort: '李明',
+            location: '一楼 大厅',
+            footerText: '可取消（截止 07/15 07:00）',
+            canCancel: true
+        },
+        {
+            id: 2,
+            title: '私教健身课',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+            status: 'pending',
+            statusLabel: '待上课',
+            schedule: '07月18日 14:00-15:00',
+            dateDay: '07',
+            dateMonth: '月18日',
+            timeRange: '14:00-15:00',
+            coach: '王强教练',
+            coachShort: '王强',
+            location: 'B区私教室',
+            footerText: '地点：B区私教室',
+            canCancel: true
+        }
+    ],
+    history: [
+        {
+            id: 3,
+            title: '动感单车',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            status: 'completed',
+            statusLabel: '已完成',
+            schedule: '07月10日 19:00-20:00',
+            coach: '赵敏教练',
+            footerText: '已签到',
+            canCancel: false
+        },
+        {
+            id: 4,
+            title: '普拉提进阶',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+            status: 'cancelled',
+            statusLabel: '已取消',
+            schedule: '07月05日 10:00-11:00',
+            coach: '李明教练',
+            footerText: '用户主动取消',
+            canCancel: false
+        }
+    ]
+}
+
+/** 可预约课程 catalog */
+export const courseCatalogMock = {
+    coaches: ['全部', '李明教练', '王强教练', '赵敏教练'],
+    periodOptions: [
+        { key: 'all', label: '全部时段' },
+        { key: 'morning', label: '上午' },
+        { key: 'afternoon', label: '下午' },
+        { key: 'evening', label: '晚上' }
+    ],
+    typeOptions: [
+        { key: 'all', label: '全部' },
+        { key: 'group', label: '团课' },
+        { key: 'private', label: '私教' }
+    ],
+    courses: [
+        {
+            id: 101,
+            title: '瑜伽基础班',
+            type: 'group',
+            coach: '李明教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user0.png',
+            date: '2024-07-15',
+            startTime: '09:00',
+            endTime: '10:00',
+            location: '一楼大厅',
+            enrolled: 12,
+            capacity: 20,
+            price: '次卡扣 1 次',
+            payType: 'session',
+            period: 'morning',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            intro: '适合零基础学员，重点提升柔韧性与呼吸控制。',
+            suitable: '久坐办公族、初学者、想改善体态者',
+            coachBio: '国家一级瑜伽指导员，5年教学经验',
+            coachRating: 4.9,
+            reviews: [
+                { user: '会员 A', score: 5, text: '教练讲解很细致，氛围很好' },
+                { user: '会员 B', score: 5, text: '适合新手，推荐' }
+            ],
+            cancelRule: '至少提前 2 小时取消，否则视为爽约'
+        },
+        {
+            id: 102,
+            title: 'HIIT 燃脂团课',
+            type: 'group',
+            coach: '赵敏教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user1.png',
+            date: '2024-07-15',
+            startTime: '19:00',
+            endTime: '20:00',
+            location: '有氧区',
+            enrolled: 18,
+            capacity: 20,
+            price: '时长卡',
+            payType: 'duration',
+            period: 'evening',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            intro: '高强度间歇训练，快速燃脂提升心肺。',
+            suitable: '有一定运动基础、目标减脂者',
+            coachBio: 'ACE 认证教练，擅长 HIIT 与动感单车',
+            coachRating: 4.8,
+            reviews: [{ user: '会员 C', score: 5, text: '强度够，出汗很多' }],
+            cancelRule: '至少提前 2 小时取消'
+        },
+        {
+            id: 103,
+            title: '私教 · 力量训练',
+            type: 'private',
+            coach: '王强教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user2.png',
+            date: '2024-07-16',
+            startTime: '14:00',
+            endTime: '15:00',
+            location: 'B区私教室',
+            enrolled: 1,
+            capacity: 1,
+            price: '私教课时卡',
+            payType: 'private',
+            period: 'afternoon',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+            intro: '一对一力量训练，定制训练计划。',
+            suitable: '增肌塑形、康复训练',
+            coachBio: 'NSCA 认证私教，8年从业经验',
+            coachRating: 5.0,
+            reviews: [{ user: '会员 D', score: 5, text: '非常专业' }],
+            cancelRule: '至少提前 2 小时取消'
+        },
+        {
+            id: 104,
+            title: '普拉提进阶',
+            type: 'group',
+            coach: '李明教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user0.png',
+            date: '2024-07-17',
+            startTime: '10:30',
+            endTime: '11:30',
+            location: '二楼瑜伽室',
+            enrolled: 8,
+            capacity: 15,
+            price: '次卡扣 1 次',
+            payType: 'session',
+            period: 'morning',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+            intro: '核心稳定与体态矫正进阶课程。',
+            suitable: '有普拉提基础者',
+            coachBio: '国家一级瑜伽指导员',
+            coachRating: 4.9,
+            reviews: [],
+            cancelRule: '至少提前 2 小时取消'
+        },
+        {
+            id: 105,
+            title: '动感单车',
+            type: 'group',
+            coach: '赵敏教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user1.png',
+            date: '2024-07-18',
+            startTime: '18:30',
+            endTime: '19:30',
+            location: '单车房',
+            enrolled: 20,
+            capacity: 20,
+            price: '储值卡 ¥39',
+            payType: 'stored',
+            period: 'evening',
+            banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+            intro: '音乐骑行，团队氛围燃脂。',
+            suitable: '所有级别，可调节阻力',
+            coachBio: 'ACE 认证教练',
+            coachRating: 4.7,
+            reviews: [{ user: '会员 E', score: 4, text: '音乐很带感' }],
+            cancelRule: '至少提前 2 小时取消'
+        }
+    ]
+}
+
+/** 个人中心其它模块 mock 数据 */
+export const moduleMock = {
+    trainingReport: {
+        periodLabel: '本周训练',
+        summary: {
+            sessions: 4,
+            hours: 6.5,
+            calories: 2180,
+            streak: 3,
+            visits: 5
+        },
+        monthlyHours: [
+            { label: '第1周', value: 4.2 },
+            { label: '第2周', value: 5.8 },
+            { label: '第3周', value: 6.5 },
+            { label: '第4周', value: 5.0 }
+        ],
+        monthlyCalories: [
+            { label: '第1周', value: 1200 },
+            { label: '第2周', value: 1680 },
+            { label: '第3周', value: 2180 },
+            { label: '第4周', value: 1850 }
+        ],
+        weeklyHours: [
+            { label: '一', value: 1.2 },
+            { label: '二', value: 0 },
+            { label: '三', value: 1.5 },
+            { label: '四', value: 0.8 },
+            { label: '五', value: 1.0 },
+            { label: '六', value: 2.0 },
+            { label: '日', value: 0 }
+        ],
+        sessions: [
+            {
+                id: 1,
+                title: '瑜伽基础班',
+                coach: '李明教练',
+                date: '2024-07-12',
+                time: '09:00-10:00',
+                duration: '60分钟',
+                calories: 320,
+                type: 'group',
+                typeLabel: '团课'
+            },
+            {
+                id: 2,
+                title: '自由训练 · 力量',
+                coach: '自主训练',
+                date: '2024-07-11',
+                time: '18:30-19:45',
+                duration: '75分钟',
+                calories: 480,
+                type: 'free',
+                typeLabel: '自由'
+            },
+            {
+                id: 3,
+                title: '私教 · 核心塑形',
+                coach: '王强教练',
+                date: '2024-07-10',
+                time: '14:00-15:00',
+                duration: '60分钟',
+                calories: 410,
+                type: 'private',
+                typeLabel: '私教'
+            },
+            {
+                id: 4,
+                title: '动感单车',
+                coach: '赵敏教练',
+                date: '2024-07-08',
+                time: '19:00-20:00',
+                duration: '60分钟',
+                calories: 520,
+                type: 'group',
+                typeLabel: '团课'
+            }
+        ]
+    },
+    couponTabs: [
+        { key: 'available', label: '可用' },
+        { key: 'used', label: '已使用' },
+        { key: 'expired', label: '已过期' }
+    ],
+    coupons: [
+        {
+            id: 1,
+            status: 'available',
+            amount: 50,
+            title: '满500减50',
+            desc: '全场团课/私教可用',
+            expire: '2024-12-31',
+            minSpend: 500,
+            tag: '通用券',
+            rules: '1. 满500元可用\n2. 适用于团课/私教\n3. 不可与其他优惠叠加\n4. 有效期至2024-12-31',
+            scope: '全门店 · 团课/私教',
+            flow: '选择课程 → 确认订单 → 选择优惠券 → 完成支付'
+        },
+        {
+            id: 2,
+            status: 'available',
+            amount: 30,
+            title: '新人专享',
+            desc: '首次购课立减',
+            expire: '2024-08-31',
+            minSpend: 200,
+            tag: '新人券',
+            rules: '1. 限新注册用户首次购课\n2. 满200可用',
+            scope: '全门店 · 首次购课',
+            flow: '首次预约课程时自动提示使用'
+        },
+        {
+            id: 3,
+            status: 'used',
+            amount: 20,
+            title: '签到奖励券',
+            desc: '连续签到7天获得',
+            expire: '2024-07-01',
+            minSpend: 100,
+            tag: '奖励券',
+            usedAt: '2024-06-28',
+            rules: '满100可用',
+            scope: '团课',
+            flow: '预约时使用'
+        },
+        {
+            id: 4,
+            status: 'expired',
+            amount: 100,
+            title: '周年庆特惠',
+            desc: '满1000可用',
+            expire: '2024-06-01',
+            minSpend: 1000,
+            tag: '活动券',
+            rules: '满1000可用，已过期',
+            scope: '全门店',
+            flow: '—'
+        }
+    ],
+    couponCenter: [
+        {
+            id: 11,
+            amount: 20,
+            title: '周末团课券',
+            desc: '周末团课满200减20',
+            expireDays: 30,
+            minSpend: 200,
+            tag: '可领取',
+            claimed: false
+        },
+        {
+            id: 12,
+            amount: 50,
+            title: '私教体验券',
+            desc: '私教课满500减50',
+            expireDays: 15,
+            minSpend: 500,
+            tag: '限时',
+            claimed: false
+        },
+        {
+            id: 13,
+            amount: 10,
+            title: '签到加油券',
+            desc: '无门槛10元券',
+            expireDays: 7,
+            minSpend: 0,
+            tag: '每日',
+            claimed: true
+        }
+    ],
+    pointsConfig: {
+        rate: '100积分 = 1元',
+        rule: '签到、训练、邀请好友、购课均可获得积分；积分可用于商城兑换。'
+    },
+    pointsRewards: [
+        { id: 1, name: '团课体验券', cost: 500, stock: 12, icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/ticket.png' },
+        { id: 2, name: '运动毛巾', cost: 800, stock: 5, icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/dumbbell.png' },
+        { id: 3, name: '私教体验30分钟', cost: 2000, stock: 3, icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/usercheck.png' },
+        { id: 4, name: '蛋白粉小样', cost: 350, stock: 20, icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/star.png' }
+    ],
+    pointsHistory: [
+        { id: 1, type: 'earn', title: '团课签到', amount: 50, time: '2024-07-12 09:10', balance: 1250 },
+        { id: 2, type: 'earn', title: '邀请好友注册', amount: 200, time: '2024-07-08 15:30', balance: 1200 },
+        { id: 3, type: 'spend', title: '兑换团课体验券', amount: -500, time: '2024-07-01 11:00', balance: 1000 },
+        { id: 4, type: 'earn', title: '会员卡续费奖励', amount: 100, time: '2024-07-01 10:05', balance: 1500 },
+        { id: 5, type: 'earn', title: '体测完成奖励', amount: 30, time: '2024-06-28 18:45', balance: 1400 }
+    ],
+    referralRules: [
+        '好友通过您的邀请码注册，双方各得 100 积分',
+        '好友首次购课成功后，您额外获得 300 积分',
+        '每月邀请奖励上限 10 人，超出不再计奖',
+        '积分可用于兑换课程体验券及周边礼品'
+    ],
+    referralRecords: [
+        { id: 1, name: '李**', avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user0.png', status: 'purchased', statusLabel: '已购课', time: '2024-07-05', reward: '+300积分', rewardStatus: '已发放' },
+        { id: 2, name: '王**', avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user1.png', status: 'registered', statusLabel: '已注册', time: '2024-06-20', reward: '+100积分', rewardStatus: '已发放' },
+        { id: 3, name: '陈**', avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user2.png', status: 'invited', statusLabel: '已邀请', time: '2024-06-15', reward: '待注册', rewardStatus: '待发放' },
+        { id: 4, name: '赵**', avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user3.png', status: 'purchased', statusLabel: '已购课', time: '2024-06-01', reward: '+300积分', rewardStatus: '已发放' },
+        { id: 5, name: '刘**', avatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user0.png', status: 'registered', statusLabel: '已注册', time: '2024-05-28', reward: '+100积分', rewardStatus: '已发放' }
+    ],
+    referralRewardSummary: {
+        totalPoints: 800,
+        totalCoupons: 2,
+        pendingCount: 1
+    },
+    myCourseTabs: [
+        { key: 'group', label: '团课' },
+        { key: 'private', label: '私教' },
+        { key: 'online', label: '线上课' },
+        { key: 'package', label: '训练营' }
+    ],
+    myCourses: {
+        group: {
+            ongoing: [
+                {
+                    id: 1,
+                    title: '瑜伽基础班',
+                    coach: '李明教练',
+                    banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+                    progress: 6,
+                    total: 12,
+                    schedule: '每周二、四 09:00',
+                    location: '一楼大厅',
+                    nextClass: '07月16日 09:00',
+                    canCancel: true,
+                    bookingId: 1
+                }
+            ],
+            completed: [
+                {
+                    id: 3,
+                    title: '动感单车入门',
+                    coach: '赵敏教练',
+                    banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+                    progress: 8,
+                    total: 8,
+                    schedule: '已结课',
+                    location: '单车房',
+                    completedAt: '2024-06-30',
+                    canEvaluate: true
+                }
+            ]
+        },
+        private: {
+            remaining: 7,
+            coach: '王强教练',
+            coachAvatar: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/user2.png',
+            nextClass: '07月15日 14:00',
+            bookings: [
+                { id: 2, title: '私教 · 力量训练', time: '07月18日 14:00', status: '已预约', location: 'B区私教室' }
+            ],
+            completed: [
+                { id: 5, title: '私教 · 核心塑形', time: '2024-07-10 14:00', coach: '王强教练' }
+            ]
+        },
+        online: [
+            {
+                id: 201,
+                title: '居家核心训练',
+                cover: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC2Banner.png',
+                duration: '45分钟',
+                progress: 60,
+                chapters: 6,
+                watched: 4,
+                type: 'video'
+            },
+            {
+                id: 202,
+                title: '直播 · 晨间拉伸',
+                cover: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+                duration: '30分钟',
+                progress: 0,
+                liveTime: '07月20日 07:00',
+                type: 'live'
+            }
+        ],
+        package: [
+            {
+                id: 301,
+                title: '28天减脂训练营',
+                banner: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/AC1Banner.png',
+                progress: 3,
+                total: 10,
+                coach: '李明教练',
+                schedule: '每周5练'
+            }
+        ]
+    },
+    checkInTabs: [
+        { key: 'all', label: '全部' },
+        { key: 'group', label: '团课' },
+        { key: 'private', label: '私教' },
+        { key: 'free', label: '自由' }
+    ],
+    checkInHistory: [
+        {
+            id: 1,
+            title: '今日签到 · 瑜伽初级班',
+            time: '2024-07-12 09:05',
+            tag: '团课',
+            tagTheme: 'group',
+            location: '一楼大厅'
+        },
+        {
+            id: 2,
+            title: '自由训练 · 进馆记录',
+            time: '2024-07-11 18:30',
+            tag: '自由',
+            tagTheme: 'free',
+            location: '器械区'
+        },
+        {
+            id: 3,
+            title: '私教课 · 力量训练',
+            time: '2024-07-10 14:00',
+            tag: '私教',
+            tagTheme: 'private',
+            location: 'B区私教室'
+        },
+        {
+            id: 4,
+            title: '团课签到 · 动感单车',
+            time: '2024-07-08 19:02',
+            tag: '团课',
+            tagTheme: 'group',
+            location: '单车房'
+        },
+        {
+            id: 5,
+            title: '自由训练 · 进馆记录',
+            time: '2024-07-06 17:45',
+            tag: '自由',
+            tagTheme: 'free',
+            location: '有氧区'
+        }
+    ]
+}

gym-manage-uniapp/common/memberInfo/moduleStore.js

@@ -0,0 +1,270 @@
+import { moduleMock } from './mockData.js'
+
+
+
+function clone(value) {
+
+    return JSON.parse(JSON.stringify(value))
+
+}
+
+
+
+export function getDefaultModuleState() {
+
+    return {
+
+        trainingReport: clone(moduleMock.trainingReport),
+
+        coupons: clone(moduleMock.coupons),
+
+        couponCenter: clone(moduleMock.couponCenter),
+
+        pointsHistory: clone(moduleMock.pointsHistory),
+
+        pointsRewards: clone(moduleMock.pointsRewards),
+
+        redeemRecords: [],
+
+        referralRecords: clone(moduleMock.referralRecords),
+
+        myCourses: clone(moduleMock.myCourses),
+
+        checkInHistory: clone(moduleMock.checkInHistory)
+
+    }
+
+}
+
+
+
+export function mergeModuleState(saved) {
+
+    const defaults = getDefaultModuleState()
+
+    if (!saved) return defaults
+
+    return {
+
+        trainingReport: { ...defaults.trainingReport, ...(saved.trainingReport || {}) },
+
+        coupons: saved.coupons?.length ? saved.coupons : defaults.coupons,
+
+        couponCenter: saved.couponCenter?.length ? saved.couponCenter : defaults.couponCenter,
+
+        pointsHistory: saved.pointsHistory?.length ? saved.pointsHistory : defaults.pointsHistory,
+
+        pointsRewards: saved.pointsRewards?.length ? saved.pointsRewards : defaults.pointsRewards,
+
+        redeemRecords: saved.redeemRecords || defaults.redeemRecords,
+
+        referralRecords: saved.referralRecords?.length ? saved.referralRecords : defaults.referralRecords,
+
+        myCourses: saved.myCourses ? mergeMyCourses(defaults.myCourses, saved.myCourses) : defaults.myCourses,
+
+        checkInHistory: saved.checkInHistory?.length ? saved.checkInHistory : defaults.checkInHistory
+
+    }
+
+}
+
+
+
+function mergeMyCourses(defaults, saved) {
+
+    return {
+
+        group: saved.group || defaults.group,
+
+        private: saved.private || defaults.private,
+
+        online: saved.online?.length ? saved.online : defaults.online,
+
+        package: saved.package?.length ? saved.package : defaults.package
+
+    }
+
+}
+
+
+
+function syncCouponSummary(store) {
+
+    const available = store.modules.coupons.filter((c) => c.status === 'available')
+
+    const top = available[0]
+
+    store.couponPoints = {
+
+        ...store.couponPoints,
+
+        amount: top ? `¥${top.amount}` : '暂无',
+
+        couponDesc: top
+
+            ? `满${top.minSpend}可用 · ${available.length}张`
+
+            : '暂无可用优惠券',
+
+        couponAction: available.length ? '去使用' : '去领取',
+
+        points: store.stats.pointsBalance,
+
+        pointsLabel: '我的积分',
+
+        pointsAction: '去兑换'
+
+    }
+
+    return store
+
+}
+
+
+
+export function finalizeModules(store) {
+
+    syncCouponSummary(store)
+
+    store.checkIns = store.modules.checkInHistory.slice(0, 3).map((item) => ({ ...item }))
+
+    return store
+
+}
+
+
+
+export function getTrainingReportData(store, period = 'week') {
+
+    const report = store.modules.trainingReport
+
+    const trend = period === 'month' ? report.monthlyHours : report.weeklyHours
+
+    const calTrend = period === 'month' ? report.monthlyCalories : report.weeklyHours.map((w, i) => ({
+
+        label: w.label,
+
+        value: Math.round((report.summary.calories / 7) * (w.value || 0.5))
+
+    }))
+
+    return {
+
+        ...report,
+
+        period,
+
+        summary: {
+
+            ...report.summary,
+
+            hours: store.stats.trainingHours ?? report.summary.hours,
+
+            visits: report.summary.visits ?? store.stats.checkInCount ?? 5
+
+        },
+
+        trendHours: trend.map((t) => ({ ...t, id: t.label })),
+
+        trendCalories: calTrend.map((t) => ({ ...t, id: t.label })),
+
+        sessions: report.sessions.map((s) => ({ ...s }))
+
+    }
+
+}
+
+
+
+export function getTrainingSessionById(store, id) {
+
+    const session = store.modules.trainingReport.sessions.find((s) => s.id === Number(id))
+
+    if (!session) return null
+
+    return {
+
+        ...session,
+
+        heartRate: '128 bpm',
+
+        comment: '动作标准，核心发力良好，下次可增加负重。',
+
+        checkInTime: `${session.date} ${session.time.split('-')[0]}`
+
+    }
+
+}
+
+
+
+export function filterTrainingSessions(store, filters = {}) {
+
+    let list = store.modules.trainingReport.sessions.map((s) => ({ ...s }))
+
+    if (filters.type && filters.type !== 'all') {
+
+        list = list.filter((s) => s.type === filters.type)
+
+    }
+
+    return list
+
+}
+
+
+
+export function getCouponsByStatus(store, status) {
+
+    return store.modules.coupons.filter((c) => c.status === status).map((c) => ({ ...c }))
+
+}
+
+
+
+export function getCouponById(store, id) {
+
+    const c = store.modules.coupons.find((item) => item.id === Number(id))
+
+    return c ? { ...c } : null
+
+}
+
+
+
+export function useCoupon(store, id) {
+
+    const coupon = store.modules.coupons.find((c) => c.id === id)
+
+    if (!coupon || coupon.status !== 'available') return null
+
+    coupon.status = 'used'
+
+    coupon.usedAt = new Date().toISOString().slice(0, 10)
+
+    syncCouponSummary(store)
+
+    return coupon
+
+}
+
+
+
+export function deleteExpiredCoupon(store, id) {
+
+    const idx = store.modules.coupons.findIndex((c) => c.id === id && c.status === 'expired')
+
+    if (idx >= 0) store.modules.coupons.splice(idx, 1)
+
+    syncCouponSummary(store)
+
+    return store
+
+}
+
+
+
+export function getCouponCenterList(store) {
+
+    return store.modules.couponCenter.map((c) => ({ ...c }))
+

gym-manage-uniapp/common/memberInfo/store.js

@@ -0,0 +1,308 @@
+import {
+    memberCenterMock,
+    userInfoMock,
+    memberCardMock,
+    bookingMock
+} from './mockData.js'
+import { formatMemberCenterPhone, normalizePhoneForStore } from './format.js'
+import {
+    getDefaultBodyTestState,
+    mergeBodyTestState,
+    getLatestBodyTestRecord,
+    buildBodyReportSummary
+} from './bodyTestStore.js'
+import {
+    getDefaultModuleState,
+    mergeModuleState,
+    finalizeModules
+} from './moduleStore.js'
+import {
+    getDefaultCourseCatalog,
+    mergeCourseCatalog,
+    canCancelBooking
+} from './bookingStore.js'
+
+const STORAGE_KEY = 'gym_member_info_v1'
+
+function clone(value) {
+    return JSON.parse(JSON.stringify(value))
+}
+
+export function buildCardTip(remainingDays) {
+    return `距离下次到期还有${remainingDays}天，请及时续费`
+}
+
+function applyCardInfo(store) {
+    const days = computeRemainingDays(store.card.validityEnd)
+    store.card.remainingDays = days
+    store.cardInfo.remainingDays = days
+    store.cardInfo.tip = buildCardTip(days)
+    return store
+}
+
+export function syncStats(store) {
+    store.stats = {
+        ...store.stats,
+        pointsBalance: store.stats.pointsBalance ?? 1250
+    }
+    return store
+}
+
+function finalizeStore(store) {
+    syncStats(store)
+    applyCardInfo(store)
+    if (store.profile?.avatar) {
+        store.memberProfile.avatar = store.profile.avatar
+    }
+    if (store.profile?.phone) {
+        store.memberProfile.phone = formatMemberCenterPhone(store.profile.phone)
+    }
+    const latestBodyTest = getLatestBodyTestRecord(store)
+    if (latestBodyTest) {
+        const previous = store.bodyTest.records[1]
+        store.bodyReport = buildBodyReportSummary(latestBodyTest, previous)
+    }
+    if (store.modules) {
+        finalizeModules(store)
+    }
+    return store
+}
+
+function getDefaultStore() {
+    return finalizeStore({
+        profile: { ...userInfoMock, avatar: memberCenterMock.userInfo.avatar },
+        memberProfile: { ...memberCenterMock.userInfo },
+        stats: { ...memberCenterMock.stats },
+        cardInfo: { ...memberCenterMock.cardInfo },
+        card: { ...memberCardMock.card },
+        records: clone(memberCardMock.records),
+        ongoingBookings: clone(bookingMock.ongoing),
+        historyBookings: clone(bookingMock.history),
+        checkIns: clone(memberCenterMock.checkIns),
+        bodyReport: { ...memberCenterMock.bodyReport },
+        bodyTest: getDefaultBodyTestState(),
+        modules: getDefaultModuleState(),
+        courseCatalog: getDefaultCourseCatalog(),
+        couponPoints: { ...memberCenterMock.couponPoints },
+        referral: { ...memberCenterMock.referral }
+    })
+}
+
+function mergeDefaults(saved) {
+    const defaults = getDefaultStore()
+    return finalizeStore({
+        profile: { ...defaults.profile, ...(saved.profile || {}) },
+        memberProfile: { ...defaults.memberProfile, ...(saved.memberProfile || {}) },
+        stats: { ...defaults.stats, ...(saved.stats || {}) },
+        cardInfo: { ...defaults.cardInfo, ...(saved.cardInfo || {}) },
+        card: { ...defaults.card, ...(saved.card || {}) },
+        records: saved.records?.length ? saved.records : defaults.records,
+        ongoingBookings: saved.ongoingBookings ?? defaults.ongoingBookings,
+        historyBookings: saved.historyBookings ?? defaults.historyBookings,
+        checkIns: saved.checkIns?.length ? saved.checkIns : defaults.checkIns,
+        bodyReport: { ...defaults.bodyReport, ...(saved.bodyReport || {}) },
+        bodyTest: mergeBodyTestState(saved.bodyTest),
+        modules: mergeModuleState(saved.modules),
+        courseCatalog: mergeCourseCatalog(saved.courseCatalog),
+        couponPoints: { ...defaults.couponPoints, ...(saved.couponPoints || {}) },
+        referral: { ...defaults.referral, ...(saved.referral || {}) }
+    })
+}
+
+export function loadMemberStore() {
+    try {
+        const saved = uni.getStorageSync(STORAGE_KEY)
+        if (saved && typeof saved === 'object') {
+            return mergeDefaults(saved)
+        }
+    } catch (e) {
+        console.warn('[memberStore] load failed', e)
+    }
+    return getDefaultStore()
+}
+
+export function saveMemberStore(store) {
+    uni.setStorageSync(STORAGE_KEY, store)
+}
+
+/** 解析为本地 0 点，避免 ISO 字符串时区偏差 */
+export function parseLocalDate(dateStr) {
+    if (!dateStr) return null
+    const str = String(dateStr).trim()
+    const iso = str.match(/^(\d{4})-(\d{2})-(\d{2})$/)
+    if (iso) {
+        return new Date(Number(iso[1]), Number(iso[2]) - 1, Number(iso[3]))
+    }
+    const cn = str.match(/(\d{4})年(\d{2})月(\d{2})日/)
+    if (cn) {
+        return new Date(Number(cn[1]), Number(cn[2]) - 1, Number(cn[3]))
+    }
+    const parsed = new Date(str.replace(/-/g, '/'))
+    return Number.isNaN(parsed.getTime()) ? null : parsed
+}
+
+function formatIsoDate(date) {
+    const y = date.getFullYear()
+    const m = String(date.getMonth() + 1).padStart(2, '0')
+    const d = String(date.getDate()).padStart(2, '0')
+    return `${y}-${m}-${d}`
+}
+
+function formatChineseDate(date) {
+    const y = date.getFullYear()
+    const m = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    return `${y}年${m}月${day}日`
+}
+
+function formatRecordTime(date) {
+    const y = date.getFullYear()
+    const m = String(date.getMonth() + 1).padStart(2, '0')
+    const d = String(date.getDate()).padStart(2, '0')
+    const h = String(date.getHours()).padStart(2, '0')
+    const min = String(date.getMinutes()).padStart(2, '0')
+    return `${y}-${m}-${d}  ${h}:${min}`
+}
+
+function nextRecordId(records) {
+    return (records || []).reduce((max, item) => Math.max(max, item.id || 0), 0) + 1
+}
+
+export function computeRemainingDays(endDateStr) {
+    const end = parseLocalDate(endDateStr)
+    if (!end) return 0
+    const now = new Date()
+    now.setHours(0, 0, 0, 0)
+    end.setHours(0, 0, 0, 0)
+    const diff = Math.ceil((end - now) / 86400000)
+    return Math.max(0, diff)
+}
+
+export function formatUpcomingAlert(booking) {
+    if (!booking) return ''
+    const timePart = booking.timeRange || booking.schedule?.split(' ')[1] || ''
+    return `明天 ${timePart} 有一堂${booking.title}，请提前 30 分钟到场`
+}
+
+export function toBookingPreviewItem(item) {
+    return {
+        id: item.id,
+        dateDay: item.dateDay,
+        dateMonth: item.dateMonth,
+        desc: `${item.title} · ${item.timeRange}`,
+        coach: item.coachShort || item.coach.replace('教练', ''),
+        location: item.location ? `地点：${item.location}` : '',
+        status: item.status,
+        statusLabel: item.statusLabel
+    }
+}
+
+export function getBookingPreview(store, limit = 2) {
+    return store.ongoingBookings.slice(0, limit).map(toBookingPreviewItem)
+}
+
+export function getCenterPageData(store) {
+    return {
+        userInfo: { ...store.memberProfile },
+        stats: { ...store.stats },
+        cardInfo: { ...store.cardInfo },
+        bookingPreview: getBookingPreview(store),
+        checkIns: store.checkIns.map((item) => ({ ...item })),
+        bodyReport: {
+            ...store.bodyReport,
+            weight: store.profile.weight || store.bodyReport.weight
+        },
+        couponPoints: {
+            ...store.couponPoints,
+            points: store.stats.pointsBalance
+        },
+        referral: { ...store.referral }
+    }
+}
+
+export function cancelOngoingBooking(store, id) {
+    const index = store.ongoingBookings.findIndex((b) => b.id === id)
+    if (index < 0) return { ok: false, message: '预约不存在' }
+
+    const item = store.ongoingBookings[index]
+    if (!canCancelBooking(item)) {
+        return { ok: false, message: '距开课不足2小时，无法取消' }
+    }
+
+    const [removed] = store.ongoingBookings.splice(index, 1)
+    if (removed.courseId) {
+        const course = store.courseCatalog.find((c) => c.id === removed.courseId)
+        if (course && course.enrolled > 0) course.enrolled -= 1
+    }
+    store.historyBookings.unshift({
+        ...removed,
+        status: 'cancelled',
+        statusLabel: '已取消',
+        footerText: '用户主动取消',
+        canCancel: false
+    })
+    finalizeStore(store)
+    saveMemberStore(store)
+    return { ok: true, message: '已取消' }
+}
+
+export function renewMemberCard(store, addDays = 90) {
+    const now = new Date()
+    now.setHours(0, 0, 0, 0)
+
+    let base = parseLocalDate(store.card.validityEnd) || new Date(now)
+    base.setHours(0, 0, 0, 0)
+    // 已过期：从今天起续费；未过期：从当前到期日起顺延
+    if (base < now) {
+        base = new Date(now)
+    }
+
+    const end = new Date(base)
+    end.setDate(end.getDate() + addDays)
+
+    const validityEnd = formatIsoDate(end)
+    const validityEndCn = formatChineseDate(end)
+    store.card.validityEnd = validityEnd
+    store.card.validity = store.card.validityStart
+        ? `${store.card.validityStart} - ${validityEndCn}`
+        : `2024年01月01日 - ${validityEndCn}`
+    store.cardInfo.expireDate = `有效期至 ${validityEndCn}`
+
+    store.records.unshift({
+        id: nextRecordId(store.records),
+        type: 'consume',
+        title: '会员卡续费',
+        time: formatRecordTime(new Date()),
+        value: `+${addDays}天`,
+        valueType: 'positive',
+        icon: 'https://gymfuture.oss-cn-chengdu.aliyuncs.com/static/images/pluscircle.png',
+        iconTheme: 'orange'
+    })
+
+    finalizeStore(store)
+    saveMemberStore(store)
+    return store
+}
+
+export function saveUserProfile(store, profile) {
+    const phone = normalizePhoneForStore(profile.phone ?? store.profile.phone)
+    store.profile = { ...store.profile, ...profile, phone }
+    store.memberProfile = {
+        ...store.memberProfile,
+        name: store.profile.name,
+        phone: formatMemberCenterPhone(store.profile.phone),
+        avatar: store.profile.avatar || store.memberProfile.avatar
+    }
+    if (store.profile.weight) {
+        store.bodyReport.weight = store.profile.weight
+    }
+    finalizeStore(store)
+    saveMemberStore(store)
+    return store
+}
+
+export function persistMemberStore(store) {
+    finalizeStore(store)
+    saveMemberStore(store)
+    return store
+}

gym-manage-uniapp/common/memberInfo/validate.js

@@ -0,0 +1,202 @@
+/** 个人信息页前端校验（与后端手机号规则对齐：^1[3-9]\\d{9}$） */
+
+const PHONE_REG = /^1[3-9]\d{9}$/
+const MIN_NAME_LEN = 2
+const MAX_NAME_LEN = 8
+const NAME_REG = new RegExp(
+    `^[\\u4e00-\\u9fa5a-zA-Z·\\s]{${MIN_NAME_LEN},${MAX_NAME_LEN}}$`
+)
+const MEASURE_REG = /^\d+(\.\d)?$/
+
+const MIN_HEIGHT = 50
+const MAX_HEIGHT = 250
+const MIN_WEIGHT = 20
+const MAX_WEIGHT = 300
+const MIN_BIRTH_YEAR = 1900
+const MIN_AGE = 14
+const MAX_FITNESS_GOALS = 5
+
+export function isMaskedPhone(phone) {
+    return String(phone || '').includes('****')
+}
+
+export function validateName(name) {
+    const value = String(name ?? '').trim()
+    if (!value) {
+        return { ok: false, message: '请输入姓名' }
+    }
+    if (!NAME_REG.test(value)) {
+        return { ok: false, message: `姓名为${MIN_NAME_LEN}-${MAX_NAME_LEN}个汉字或字母` }
+    }
+    return { ok: true, value }
+}
+
+/** 保存时使用：允许保留已脱敏的旧手机号 */
+export function validatePhone(phone, options = {}) {
+    const { allowMasked = true } = options
+    const raw = String(phone ?? '').trim()
+    if (!raw) {
+        return { ok: false, message: '请绑定手机号' }
+    }
+    if (allowMasked && isMaskedPhone(raw)) {
+        const digits = raw.replace(/\D/g, '')
+        if (digits.length >= 7) {
+            return { ok: true, value: raw }
+        }
+        return { ok: false, message: '手机号格式不正确' }
+    }
+
+    const digits = raw.replace(/\D/g, '')
+    if (!PHONE_REG.test(digits)) {
+        return { ok: false, message: '请输入11位有效手机号' }
+    }
+    return { ok: true, value: digits }
+}
+
+/** 换绑时必须输入完整新号 */
+export function validatePhoneForRebind(phone) {
+    return validatePhone(phone, { allowMasked: false })
+}
+
+function parseMeasure(value) {
+    const str = String(value ?? '').trim()
+    if (!str || !MEASURE_REG.test(str)) {
+        return null
+    }
+    const num = Number(str)
+    return Number.isFinite(num) ? num : null
+}
+
+function formatMeasure(num) {
+    return Number.isInteger(num) ? String(num) : String(Number(num.toFixed(1)))
+}
+
+export function validateHeight(height) {
+    const num = parseMeasure(height)
+    if (num == null) {
+        return { ok: false, message: '请输入有效身高（单位 cm）' }
+    }
+    if (num < MIN_HEIGHT || num > MAX_HEIGHT) {
+        return { ok: false, message: `身高请在 ${MIN_HEIGHT}-${MAX_HEIGHT} cm 之间` }
+    }
+    return { ok: true, value: formatMeasure(num) }
+}
+
+export function validateWeight(weight) {
+    const num = parseMeasure(weight)
+    if (num == null) {
+        return { ok: false, message: '请输入有效体重（单位 kg）' }
+    }
+    if (num < MIN_WEIGHT || num > MAX_WEIGHT) {
+        return { ok: false, message: `体重请在 ${MIN_WEIGHT}-${MAX_WEIGHT} kg 之间` }
+    }
+    return { ok: true, value: formatMeasure(num) }
+}
+
+export function parseBirthdayChinese(birthday) {
+    const match = String(birthday ?? '').match(/(\d{4})年(\d{2})月(\d{2})日/)
+    if (!match) return null
+    return {
+        year: Number(match[1]),
+        month: Number(match[2]),
+        day: Number(match[3])
+    }
+}
+
+export function validateBirthday(birthday) {
+    const parts = parseBirthdayChinese(birthday)
+    if (!parts) {
+        return { ok: false, message: '请选择生日' }
+    }
+    const { year, month, day } = parts
+    if (year < MIN_BIRTH_YEAR) {
+        return { ok: false, message: '生日年份不合理' }
+    }
+
+    const date = new Date(year, month - 1, day)
+    if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+    ) {
+        return { ok: false, message: '生日日期无效' }
+    }
+
+    const today = new Date()
+    today.setHours(0, 0, 0, 0)
+    if (date > today) {
+        return { ok: false, message: '生日不能晚于今天' }
+    }
+
+    const minBirth = new Date(
+        today.getFullYear() - MIN_AGE,
+        today.getMonth(),
+        today.getDate()
+    )
+    if (date > minBirth) {
+        return { ok: false, message: `需年满 ${MIN_AGE} 周岁` }
+    }
+
+    return { ok: true, value: `${year}年${String(month).padStart(2, '0')}月${String(day).padStart(2, '0')}日` }
+}
+
+export function validateGender(gender) {
+    if (gender === 'male' || gender === 'female') {
+        return { ok: true, value: gender }
+    }
+    return { ok: false, message: '请选择性别' }
+}
+
+export function validateFitnessGoals(goals, options = []) {
+    const list = Array.isArray(goals) ? goals : []
+    const allowed = new Set(options)
+    const invalid = list.filter((g) => !allowed.has(g))
+    if (invalid.length) {
+        return { ok: false, message: '健身目标选项无效' }
+    }
+    if (list.length > MAX_FITNESS_GOALS) {
+        return { ok: false, message: `最多选择 ${MAX_FITNESS_GOALS} 个健身目标` }
+    }
+    return { ok: true, value: [...list] }
+}
+
+export function validateUserProfile(profile, goalOptions = []) {
+    const nameResult = validateName(profile.name)
+    if (!nameResult.ok) return nameResult
+
+    const phoneResult = validatePhone(profile.phone)
+    if (!phoneResult.ok) return phoneResult
+
+    const genderResult = validateGender(profile.gender)
+    if (!genderResult.ok) return genderResult
+
+    const birthdayResult = validateBirthday(profile.birthday)
+    if (!birthdayResult.ok) return birthdayResult
+
+    const heightResult = validateHeight(profile.height)
+    if (!heightResult.ok) return heightResult
+
+    const weightResult = validateWeight(profile.weight)
+    if (!weightResult.ok) return weightResult
+
+    const goalsResult = validateFitnessGoals(profile.fitnessGoals, goalOptions)
+    if (!goalsResult.ok) return goalsResult
+
+    return {
+        ok: true,
+        value: {
+            ...profile,
+            name: nameResult.value,
+            phone: phoneResult.value,
+            gender: genderResult.value,
+            birthday: birthdayResult.value,
+            height: heightResult.value,
+            weight: weightResult.value,
+            fitnessGoals: goalsResult.value
+        }
+    }
+}
+
+export function showValidationError(message) {
+    uni.showToast({ title: message, icon: 'none' })
+}