增加 后端，后台管理系统，uniapp会员端的自动化测试。

- 新增gym-checkIn签到模块
- 创建sign_in_record签到记录表(V13迁移脚本)
- 添加签到相关路由配置
- 更新应用配置以支持签到模块
- 添加Redis密钥常量

AGENT.md

@@ -0,0 +1,318 @@
+# AGENT.md — 健身房管理系统 AI 协作工作流
+
+## 概述
+
+本项目采用"需求驱动开发"（Requirement-Driven Development）工作流，通过以下四个核心命令完成从模糊需求到可运行代码的全流程。遇到复杂 Bug 时可随时调用 `/systemic-debugging` 进行系统化诊断。
+
+---
+
+## 项目技术栈与模块结构
+
+### 技术栈总览
+
+| 层 | 技术栈 | 目录 | 测试框架 |
+|---|---|---|---|
+| 后端 API | Java Spring Boot（Maven 多模块） | `gym-manage-api/` | JUnit + Spring Boot Test |
+| 管理后台 Web | Vue.js | `gym-manage-web/` | Playwright E2E |
+| 会员小程序 | UniApp | `gym-manage-uniapp/` | — |
+| 端到端测试 | Playwright | `e2e-tests/` | Playwright |
+
+### 后端模块映射
+
+| 模块 | 目录 | 职责 |
+|---|---|---|
+| manage-app | `gym-manage-api/manage-app/` | 应用启动入口、配置中心 |
+| manage-gateway | `gym-manage-api/manage-gateway/` | API 网关、路由转发 |
+| manage-common | `gym-manage-api/manage-common/` | 公共工具、通用组件 |
+| manage-db | `gym-manage-api/manage-db/` | 数据库迁移（Flyway）、基础实体 |
+| manage-sys | `gym-manage-api/manage-sys/` | 系统管理（用户/角色/权限/菜单/字典/文件/通知/日志） |
+| manage-audit | `gym-manage-api/manage-audit/` | 审计日志 |
+| manage-file | `gym-manage-api/manage-file/` | 文件管理 |
+| manage-notify | `gym-manage-api/manage-notify/` | 消息通知 |
+| gym-auth | `gym-manage-api/gym-auth/` | 认证授权、JWT |
+| gym-member | `gym-manage-api/gym-member/` | 会员管理（注册/信息/会员卡） |
+| gym-groupCourse | `gym-manage-api/gym-groupCourse/` | 团课管理、团课预约 |
+| gym-checkIn | `gym-manage-api/gym-checkIn/` | 签到管理 |
+| gym-dataCount | `gym-manage-api/gym-dataCount/` | 数据统计 |
+| gym-payment | `gym-manage-api/gym-payment/` | 支付集成、支付对账 |
+
+### 涉及模块的判断原则
+
+在 `/to-issues` 和 `/test-driven-development` 阶段，根据功能需求确定涉及的模块。例如：
+- "会员卡购买" → `gym-member` + `gym-payment` + `gym-manage-web` + `gym-manage-uniapp`
+- "团课预约" → `gym-groupCourse` + `gym-member` + `gym-manage-uniapp`
+- "系统管理"类功能 → `manage-sys` + `gym-manage-web`
+
+---
+
+## 工作流总览
+
+```
+/grill-with-docs  →  /to-prd  →  /to-issues  →  /test-driven-development
+     ↓                    ↓            ↓                    ↓
+  需求澄清             结构化PRD     任务拆解            TDD实现
+  + 领域建模
+  (CONTEXT.md)
+```
+
+---
+
+## 0. /domain-modeling — 领域建模（贯穿全流程）
+
+**目标**：建立并维护项目的统一语言（Ubiquitous Language），确保需求、设计、代码中术语一致。
+
+### 核心产出
+- 项目根目录的 [CONTEXT.md](./CONTEXT.md) — 术语表，不含任何实现细节，纯粹的概念定义和关系。
+
+### 执行时机
+- **在 `/grill-with-docs` 阶段**：识别新术语，与用户确认定义，写入 `CONTEXT.md`。
+- **在 `/to-prd` 阶段**：引用 `CONTEXT.md` 中的术语，保持 PRD 术语一致。
+- **在 `/to-issues` 阶段**：确保每个 Issue 使用的术语与 `CONTEXT.md` 对齐。
+- **在 `/test-driven-development` 阶段**：代码中的类名、方法名、变量名需反映领域术语。
+
+### 领域术语规则
+1. **挑战模糊语言**：当用户使用模糊或过载的术语时，提出精确的规范术语。例如："你说的'账户'是指会员(Member)还是用户(User)？它们是不同的概念。"
+2. **冲突检测**：当用户使用的术语与 `CONTEXT.md` 中已定义的不同时，立即指出："你的术语表将'取消'定义为 X，但你现在似乎指 Y — 是哪个？"
+3. **场景验证**：用具体的边界场景压力测试领域关系。例如："如果会员卡已过期，预约还能取消吗？"
+4. **代码交叉验证**：当需要确认某个术语的实际语义时，查阅现有代码实现，如有矛盾及时指出。
+
+### 更新原则
+- 术语一经确认，立即更新 `CONTEXT.md`，不要批量处理。
+- 只在有实际产出时才创建或修改 `CONTEXT.md`。
+
+---
+
+## 1. /grill-with-docs — 需求澄清与领域建模
+
+**目标**：通过结构化问答 + 领域建模，将模糊需求转化为清晰、文档化的共识。
+
+### 触发条件
+- 用户提出新功能需求但描述不完整
+- 需求存在歧义或矛盾
+- 需要明确验收标准
+
+### 执行流程
+
+1. **收集原始需求**：理解用户意图，记录关键信息。
+2. **启动领域建模**：识别需求中涉及的领域概念，对照 [CONTEXT.md](./CONTEXT.md) 检查术语一致性，新术语与用户确认后写入。
+3. **识别模糊点**：主动指出需求中的歧义、缺失、矛盾之处。
+4. **逐轮问答**：每次只问 1-2 个关键问题，避免信息过载。使用 `AskUserQuestion` 工具。
+5. **生成共识文档**：将确认后的需求写入 `docs/superpowers/plans/` 目录，文件名格式为 `{YYYY-MM-DD}-{功能名称}-grill.md`，内容包括：
+   - 功能概述
+   - 用户故事
+   - 业务流程（Mermaid 流程图）
+   - 验收标准
+   - 涉及的领域概念（引用 `CONTEXT.md`）
+   - 非功能需求
+   - 待确认项（如有）
+
+### 规则
+- 不要在分歧未解决前进入下一阶段。
+- 所有关键决策需用户确认。
+- 文档使用中文，保持与项目已有文档风格一致。
+- 新术语必须写入 `CONTEXT.md` 后再用于文档。
+
+---
+
+## 2. /to-prd — 生成产品需求文档
+
+**目标**：将澄清后的需求转化为结构化的 PRD。
+
+### 输入
+- `/grill-with-docs` 生成的共识文档（`docs/superpowers/plans/{日期}-{功能名称}-grill.md`）
+- 项目的功能清单文档（[基础版功能清单.md](./基础版功能清单.md)）
+- 领域术语表（[CONTEXT.md](./CONTEXT.md)）
+
+### 执行流程
+
+1. **读取共识文档**：理解需求全貌。
+2. **参考现有规范**：对照 [基础版功能清单.md](./基础版功能清单.md) 中的优先级定义（P0/P1/P2/P3）、技术规范和文档风格。
+3. **术语对齐**：对照 [CONTEXT.md](./CONTEXT.md)，确保 PRD 使用的所有业务术语与术语表一致。
+4. **生成 PRD**：将 PRD 写入 `docs/superpowers/specs/` 目录，文件名格式为 `{YYYY-MM-DD}-{功能名称}-prd.md`，内容结构：
+   - 文档元信息（编号、版本、日期、状态）
+   - 功能概述与目标
+   - 用户故事（As a... I want... So that...）
+   - 功能详细描述（功能点、优先级、验收标准、依赖关系、预计工时）
+   - 涉及的后端模块（参考模块映射表）
+   - 业务流程（Mermaid 流程图）
+   - 业务规则
+   - 非功能需求（性能、安全、可用性）
+   - UI/UX 要求（如适用）
+   - 技术要点建议
+
+### 规则
+- PRD 格式严格对齐 [基础版功能清单.md](./基础版功能清单.md) 的风格。
+- 优先级标记使用 P0/P1/P2/P3 体系。
+- 每个功能点必须有明确的验收标准。
+- 必须在 PRD 中标注涉及的后端模块和前端应用。
+
+---
+
+## 3. /to-issues — 任务拆解
+
+**目标**：将 PRD 拆解成可独立执行、可验证的具体任务（Issues）。
+
+### 输入
+- `/to-prd` 生成的 PRD（`docs/superpowers/specs/{日期}-{功能名称}-prd.md`）
+- 领域术语表（[CONTEXT.md](./CONTEXT.md)）
+
+### 拆解原则
+
+**纵向拆分（全栈 Issue）**：每个 Issue 按功能维度拆分，覆盖完整的前后端链路。
+- 一个 Issue = 一个可独立交付的功能点，包含后端 API + Web 前端 + 小程序（按需）。
+- TDD 顺序：后端单元测试 → 后端实现 → 前端 E2E 测试 → 前端实现。
+
+**粒度控制**：
+- 预计工时不超过 2 天，超过则继续拆解。
+- Issue 粒度应足够小，确保一个 Issue 可以在一轮对话中实现。
+
+**优先级与排序**：
+- P0 任务排在 P1 之前，同一优先级下按依赖拓扑排序。
+- 每个 Issue 标注依赖关系。
+
+### 输出
+
+写入 `docs/superpowers/issues/` 目录（如不存在则创建），文件名格式为 `ISSUES-{功能名称}.md`，内容结构：
+
+```markdown
+## GYM-{编号}: {标题}
+
+- **优先级**: P0 / P1 / P2 / P3
+- **预计工时**: {天数}天
+- **依赖**: GYM-{编号} 或 无
+- **涉及模块**: 后端模块列表 + 前端应用列表
+- **领域术语**: 引用的 CONTEXT.md 术语
+
+### 验收标准
+1. 后端单元测试通过
+2. E2E 测试通过
+3. ...
+
+### 技术要点
+- 要点 1
+- 要点 2
+```
+
+---
+
+## 4. /test-driven-development — 测试驱动开发
+
+**目标**：采用 TDD 方式，按 Red-Green-Refactor 循环逐个实现 Issues。
+
+### 前置步骤（每个 Issue 开始前必须执行）
+
+1. **阅读 Issue 描述**：理解全栈范围（涉及哪些后端模块和前端应用）。
+2. **阅读 [CONTEXT.md](./CONTEXT.md)**：确认使用的领域术语，确保代码命名一致。
+3. **阅读现有测试基础设施**：
+   - E2E 测试：`e2e-tests/helpers/`（TestDataManager、TestStabilityHelper、auth.ts）、`e2e-tests/pages/`（Page Object 模式）、`e2e-tests/fixtures/`、`e2e-tests/utils/`（TestDataFactory、RetryHelper、api-client）
+   - 后端测试：参考 `gym-checkIn/src/test/`、`gym-payment/src/test/` 等现有模块测试用例的风格和结构
+   - 遵循已有的 Page Object、DataFactory、Smoke/Journey 测试分层 pattern
+
+### 执行流程
+
+按 Issue 顺序逐个实现，每个 Issue 遵循三步循环：
+
+#### Step 1: Red — 编写失败的测试
+1. 先写后端单元测试（JUnit），验证 API 逻辑和边界条件。
+2. 运行后端测试，确认测试失败（红色）。
+3. 写前端 E2E 测试（Playwright），覆盖用户操作链路。
+4. 运行 E2E 测试，确认测试失败（红色）。
+
+#### Step 2: Green — 编写最小实现
+1. 编写后端 API 代码，刚好让单元测试通过。
+2. 运行后端测试，确认通过（绿色）。
+3. 编写前端代码，刚好让 E2E 测试通过。
+4. 运行 E2E 测试，确认通过（绿色）。
+5. 不添加任何测试未覆盖的功能。
+
+#### Step 3: Refactor — 重构优化
+1. 在全部测试保持绿色的前提下重构代码。
+2. 消除重复、改善命名（对齐 `CONTEXT.md` 术语）、优化结构。
+3. 运行全部测试，确认仍然通过。
+
+### 规则
+- 一个 Issue 完成后再开始下一个。
+- 每次只改最少代码。
+- 测试优先覆盖核心逻辑和边界条件。
+- 代码风格严格遵循项目现有规范。
+- 代码命名必须对齐 [CONTEXT.md](./CONTEXT.md) 中的领域术语。
+- 所有测试通过后方可标记 Issue 为完成。
+
+---
+
+## 5. /systemic-debugging — 系统化调试
+
+**目标**：当遇到复杂 Bug 时，通过系统化诊断流程定位根因并修复。
+
+### 触发条件
+- 遇到难以复现的 Bug
+- 多轮尝试修复无效
+- 用户明确请求调试
+
+### 执行流程
+
+1. **定义问题**：明确描述 Bug 的现象、触发条件和预期行为。
+2. **收集证据**：查看相关日志、错误堆栈、数据库状态（检查 Flyway 迁移版本）、网络请求等。
+3. **建立假设**：基于证据提出 1-3 个可能的根因假设。
+4. **验证假设**：通过添加日志、编写最小复现用例、断点调试等方式验证或排除假设。一次只验证一个假设。
+5. **修复与验证**：定位根因后编写修复代码，确保测试覆盖该场景。
+6. **回归检查**：运行全部测试（后端 JUnit + 前端 E2E），确保修复未引入新问题。
+
+### 规则
+- 不要猜测式修复，每一步必须有证据支撑。
+- 每次只验证一个假设。
+- 修复后必须添加对应的回归测试。
+
+---
+
+## 目录结构约定
+
+```
+gym-manage/
+├── AGENT.md                                  # 本文件
+├── CONTEXT.md                                # 领域术语表（统一语言）
+├── 基础版功能清单.md                           # 项目功能清单（参考规范）
+├── docs/
+│   └── superpowers/                          # AI 协作产出物
+│       ├── plans/                            # 需求澄清文档（/grill-with-docs 产出）
+│       │   └── {YYYY-MM-DD}-{功能名称}-grill.md
+│       ├── specs/                            # PRD（/to-prd 产出）
+│       │   └── {YYYY-MM-DD}-{功能名称}-prd.md
+│       └── issues/                           # 任务拆解（/to-issues 产出）
+│           └── ISSUES-{功能名称}.md
+├── gym-manage-api/                           # 后端 Java Spring Boot 多模块
+│   ├── manage-app/                           #   应用启动入口
+│   ├── manage-gateway/                       #   API 网关
+│   ├── manage-common/                        #   公共组件
+│   ├── manage-db/                            #   数据库迁移
+│   ├── manage-sys/                           #   系统管理
+│   ├── manage-audit/                         #   审计日志
+│   ├── manage-file/                          #   文件管理
+│   ├── manage-notify/                        #   消息通知
+│   ├── gym-auth/                             #   认证授权
+│   ├── gym-member/                           #   会员管理
+│   ├── gym-groupCourse/                      #   团课管理
+│   ├── gym-checkIn/                          #   签到管理
+│   ├── gym-dataCount/                        #   数据统计
+│   └── gym-payment/                          #   支付集成
+├── gym-manage-web/                           # 管理后台 Web 前端
+├── gym-manage-uniapp/                        # 会员小程序前端
+└── e2e-tests/                                # 端到端测试
+    ├── helpers/                              #   TestDataManager、auth 等
+    ├── pages/                                #   Page Object 模式
+    ├── fixtures/                             #   测试数据
+    ├── utils/                                #   TestDataFactory、RetryHelper
+    ├── journeys/                             #   用户旅程测试
+    └── smoke/                                #   冒烟测试
+```
+
+---
+
+## 通用规则
+
+- **语言**：所有文档和代码注释使用中文，代码标识符使用英文。
+- **术语对齐**：所有文档和代码中的业务术语必须对齐 [CONTEXT.md](./CONTEXT.md)。
+- **风格对齐**：严格遵循项目现有代码风格和文档风格。
+- **每一步确认**：关键产出（grill 文档、PRD、Issues）完成后通知用户确认再继续。
+- **最小化原则**：不添加需求范围外的功能，不引入不必要的复杂度。
+- **测试优先**：后端单元测试和前端 E2E 测试必须在新代码之前编写。

CONTEXT.md

@@ -0,0 +1,169 @@
+# CONTEXT.md — 健身房管理系统 领域术语表
+
+> 本文档定义项目的统一语言（Ubiquitous Language），确保需求、设计、代码、测试中术语一致。
+> 不含任何实现细节，仅为概念定义和关系。
+
+---
+
+## 一、核心业务概念
+
+### 租户 (Tenant)
+健身房经营实体。每个租户拥有独立的小程序、服务号、品牌配置。系统中的所有业务数据按租户隔离。
+
+### 会员 (Member)
+在健身房消费的终端用户。通过微信小程序注册，拥有会员档案、会员卡和预约记录。
+
+### 用户 (User)
+系统管理端的操作人员（健身房员工）。包括管理员、前台、店长等，拥有不同的角色和权限。
+
+### 管理员 (Admin)
+拥有系统最高权限的用户，可管理所有用户、角色、权限、配置。
+
+### 教练 (Coach)
+负责团课授课的人员，属于用户的一种扩展身份。
+
+---
+
+## 二、微信生态概念
+
+### 小程序 (Mini Program / MiniApp)
+会员端的微信小程序入口。用户通过小程序完成登录、浏览课程、预约、签到等操作。
+
+### 服务号 (Service Account)
+用于向会员推送模板消息的微信服务号。发送预约提醒、签到通知、会员卡到期提醒等。
+
+### 开放平台 (Open Platform)
+微信开放平台，用于统一小程序和服务号的用户身份（通过 UnionID）。
+
+### UnionID
+微信开放平台下的统一用户标识。同一微信开放平台账号下的不同应用（小程序、服务号），同一用户的 UnionID 相同。
+
+### OpenID
+单个微信应用下的用户标识。同一用户在不同应用中 OpenID 不同。
+
+### 模板消息 (Template Message)
+通过服务号向会员发送的结构化通知消息。每月限额 4 条/用户。
+
+---
+
+## 三、团课与预约
+
+### 团课 (Group Course)
+健身房提供的团体健身课程。包含课程名称、教练、时间、地点、容量（最多 20 人）等信息。
+
+### 团课类型 (Course Type)
+团课的分类维度，如"瑜伽、动感单车、搏击操"等。
+
+### 团课标签 (Course Label)
+团课的标记维度，如"新手友好、高强度、减脂"等。
+
+### 团课推荐 (Course Recommendation)
+管理员手动标记的推荐课程，在小程序首页优先展示。
+
+### 预约 (Booking / Reservation)
+会员报名参加团课的操作。预约成功后扣减会员卡权益，课程开始前 30 分钟截止预约。
+
+### 取消预约 (Cancel Booking)
+会员取消已报名的团课。需在课程开始前至少 2 小时操作，取消后自动退还权益。
+
+---
+
+## 四、会员卡
+
+### 会员卡 (Membership Card)
+会员购买的权益凭证，分为三种类型：
+- **时长卡 (Duration Card)**：在有效期内无限次使用
+- **次卡 (Count Card)**：按次数扣减
+- **储值卡 (Stored Value Card)**：按金额扣减
+
+### 会员卡权益 (Card Entitlement)
+会员卡包含的可使用权益，如每日入场次数、可预约课程数。
+
+### 会员卡状态 (Card Status)
+会员卡的生命周期状态：激活、冻结、到期、已退款。
+
+### 到期提醒 (Expiry Reminder)
+会员卡到期前 7 天通过服务号模板消息向会员发送提醒。
+
+---
+
+## 五、签到
+
+### 签到 (Check-in)
+会员到场时的身份确认操作。需验证会员卡有效性和预约信息（如有团课预约）。
+
+### 签到码 (Check-in Code)
+会员出示的动态二维码，用于前台/设备扫描签到。
+
+---
+
+## 六、支付
+
+### 支付 (Payment)
+会员购买会员卡或课程时的在线支付操作，支持微信支付和支付宝支付。
+
+### 退款 (Refund)
+将已支付金额原路退回会员账户的操作。
+
+### 对账 (Reconciliation)
+每日将系统支付记录与微信/支付宝账单进行比对核验的过程。
+
+---
+
+## 七、权限与审计
+
+### 角色 (Role)
+权限的集合。系统中的角色包括管理员、店长、前台等，采用 RBAC（基于角色的访问控制）模型。
+
+### 权限 (Permission)
+对系统资源的操作许可。包括菜单访问权限、按钮操作权限、数据查看权限。
+
+### 菜单 (Menu)
+管理后台的导航入口，通过权限控制可见性。
+
+### 操作日志 (Operation Log)
+记录用户在系统中的关键操作（增删改），用于审计追溯。
+
+### 登录日志 (Login Log)
+记录用户的登录行为，包括登录 IP、时间、结果。
+
+### 异常日志 (Exception Log)
+记录系统运行时异常，用于问题排查。
+
+---
+
+## 八、配置
+
+### 参数配置 (System Config)
+系统级别的可调参数，如签到超时时间、预约截止时间等，通过管理后台的参数配置页面管理。
+
+### 字典 (Dictionary)
+系统使用的枚举值配置，如下拉选项、状态值等，通过字典管理页面维护。
+
+### 轮播图 (Banner)
+小程序首页的推广图片，通过管理后台管理。
+
+### 通知公告 (Notice)
+向会员或用户发布的系统公告，通过管理后台管理。
+
+---
+
+## 九、测试相关概念
+
+### 冒烟测试 (Smoke Test)
+每次提交后运行的快速验证测试，覆盖核心登录/登出流程，执行时间 ≤ 5 分钟。
+
+### 用户旅程测试 (Journey Test / E2E)
+模拟真实用户完整操作链路的端到端测试。覆盖从登录到完成业务操作的全流程。
+
+### 角色边界测试 (Role Boundary Test)
+验证不同角色（Admin/普通用户/未登录）的权限隔离是否正确的测试。
+
+### Page Object
+E2E 测试中的设计模式，将页面元素定位和操作封装为类，提高测试可维护性。
+
+### TestDataManager
+测试数据管理器，负责测试数据的自动生成（带唯一前缀）和清理回调注册。
+
+### TestDataFactory
+测试数据工厂，提供随机的测试数据对象（用户、角色、菜单等）。

Jenkinsfile

@@ -1,310 +1,203 @@
 pipeline {
     agent any
-    
+
+    parameters {
+        choice(
+            name: 'TEST_SCOPE',
+            choices: ['smoke', 'full', 'all', 'miniapp'],
+            description: '测试范围: smoke=仅冒烟测试, full=完整E2E, all=所有测试含性能, miniapp=仅小程序'
+        )
+        choice(
+            name: 'BROWSER',
+            choices: ['chromium', 'all'],
+            description: '目标浏览器: chromium=单浏览器快速, all=全浏览器'
+        )
+        string(
+            name: 'BASE_URL',
+            defaultValue: 'http://localhost:3002',
+            description: '测试目标URL'
+        )
+    }
+
     environment {
-        // 项目配置
+        PLAYWRIGHT_HEADLESS = 'true'
-        PROJECT_NAME = 'gym-manage-system'
+        CI = 'true'
-        FRONTEND_DIR = 'gym-manage-web'
+        NODE_ENV = 'test'
-        BACKEND_DIR = 'gym-manage-api'
+        JEST_JUNIT_OUTPUT_DIR = 'test-results'
-        
+        JEST_JUNIT_OUTPUT_NAME = 'junit.xml'
-        // Node.js 配置
-        NODE_VERSION = '20'
-        PNPM_VERSION = '8.15.0'
-        
-        // Java 配置
-        JAVA_VERSION = '17'
-        MAVEN_VERSION = '3.9.0'
-        
-        // Docker 配置
-        DOCKER_REGISTRY = credentials('docker-registry')
-        DOCKER_IMAGE_FRONTEND = "${PROJECT_NAME}-frontend"
-        DOCKER_IMAGE_BACKEND = "${PROJECT_NAME}-backend"
-        
-        // 数据库配置（用于E2E测试）
-        DB_HOST = 'localhost'
-        DB_PORT = '5432'
-        DB_NAME = 'gym_test'
-        DB_USER = credentials('db-user')
-        DB_PASSWORD = credentials('db-password')
-        
-        // 测试配置
-        TEST_TIMEOUT = '30'
-        RETRY_COUNT = '2'
     }
-    
+
-    tools {
-        nodejs "NodeJS-${NODE_VERSION}"
-        maven "Maven-${MAVEN_VERSION}"
-        jdk "JDK-${JAVA_VERSION}"
-    }
-    
     stages {
+
         stage('环境准备') {
+            parallel {
+                stage('安装Web端依赖') {
+                    steps {
+                        dir('gym-manage-web') {
+                            bat 'npm ci'
+                            bat 'npx playwright install chromium --with-deps'
+                        }
+                    }
+                }
+                stage('安装小程序端依赖') {
+                    steps {
+                        dir('gym-manage-uniapp') {
+                            bat 'npm ci'
+                        }
+                    }
+                }
+            }
+        }
+
+        stage('启动后端服务') {
             steps {
-                echo '🔧 准备构建环境...'
+                dir('gym-manage-api') {
-                sh '''
+                    bat 'mvn spring-boot:run -pl manage-app -DskipTests &'
-                    # 安装 pnpm
+                    bat 'mvn spring-boot:run -pl manage-gateway -DskipTests &'
-                    npm install -g pnpm@${PNPM_VERSION}
-                    
-                    # 验证工具版本
-                    node --version
-                    pnpm --version
-                    java -version
-                    mvn --version
-                '''
-            }
-        }
-        
-        stage('代码检查') {
-            parallel {
-                stage('前端代码检查') {
-                    steps {
-                        dir(FRONTEND_DIR) {
-                            echo '🔍 执行前端代码检查...'
-                            sh '''
-                                pnpm install
-                                pnpm run lint
-                                pnpm run type-check
-                            '''
-                        }
-                    }
                 }
-                
+                // 等待后端健康检查
-                stage('后端代码检查') {
+                script {
-                    steps {
+                    retry(10) {
-                        dir(BACKEND_DIR) {
+                        sleep(10)
-                            echo '🔍 执行后端代码检查...'
+                        try {
-                            sh 'mvn clean compile -DskipTests'
+                            def response = httpRequest 'http://localhost:8084/actuator/health'
+                            print "后端健康状态: ${response.content}"
+                        } catch (err) {
+                            error "后端尚未就绪: ${err.message}"
                         }
                     }
                 }
             }
         }
-        
+
-        stage('单元测试') {
+        stage('冒烟测试') {
-            parallel {
-                stage('前端单元测试') {
-                    steps {
-                        dir(FRONTEND_DIR) {
-                            echo '🧪 执行前端单元测试...'
-                            sh 'pnpm run test:unit'
-                        }
-                    }
-                    post {
-                        always {
-                            dir(FRONTEND_DIR) {
-                                // 发布测试报告
-                                publishHTML(target: [
-                                    allowMissing: false,
-                                    alwaysLinkToLastBuild: true,
-                                    keepAll: true,
-                                    reportDir: 'coverage',
-                                    reportFiles: 'index.html',
-                                    reportName: '前端单元测试覆盖率报告'
-                                ])
-                            }
-                        }
-                    }
-                }
-                
-                stage('后端单元测试') {
-                    steps {
-                        dir(BACKEND_DIR) {
-                            echo '🧪 执行后端单元测试...'
-                            sh 'mvn test'
-                        }
-                    }
-                    post {
-                        always {
-                            dir(BACKEND_DIR) {
-                                // 发布测试报告
-                                junit '**/target/surefire-reports/*.xml'
-                                
-                                // 发布代码覆盖率报告
-                                publishHTML(target: [
-                                    allowMissing: false,
-                                    alwaysLinkToLastBuild: true,
-                                    keepAll: true,
-                                    reportDir: 'target/site/jacoco',
-                                    reportFiles: 'index.html',
-                                    reportName: '后端单元测试覆盖率报告'
-                                ])
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        stage('构建') {
-            parallel {
-                stage('前端构建') {
-                    steps {
-                        dir(FRONTEND_DIR) {
-                            echo '📦 构建前端项目...'
-                            sh '''
-                                pnpm run build:prod
-                                
-                                # 创建构建产物归档
-                                tar -czf frontend-dist.tar.gz dist/
-                            '''
-                        }
-                    }
-                    post {
-                        success {
-                            archiveArtifacts artifacts: "${FRONTEND_DIR}/frontend-dist.tar.gz", fingerprint: true
-                        }
-                    }
-                }
-                
-                stage('后端构建') {
-                    steps {
-                        dir(BACKEND_DIR) {
-                            echo '📦 构建后端项目...'
-                            sh '''
-                                mvn clean package -DskipTests
-                                
-                                # 创建构建产物归档
-                                tar -czf backend-jars.tar.gz */target/*.jar
-                            '''
-                        }
-                    }
-                    post {
-                        success {
-                            archiveArtifacts artifacts: "${BACKEND_DIR}/backend-jars.tar.gz", fingerprint: true
-                        }
-                    }
-                }
-            }
-        }
-        
-        stage('E2E测试') {
             steps {
-                echo '🎭 执行E2E测试...'
+                dir('gym-manage-web') {
-                dir(FRONTEND_DIR) {
+                    bat 'npm run test:e2e:smoke'
-                    sh '''
-                        # 安装Playwright浏览器
-                        pnpm exec playwright install --with-deps chromium
-                        
-                        # 执行E2E测试
-                        pnpm run test:e2e:journeys
-                    '''
                 }
             }
             post {
-                always {
+                failure {
-                    dir(FRONTEND_DIR) {
+                    echo '冒烟测试失败，跳过后续测试'
-                        // 发布E2E测试报告
+                }
-                        publishHTML(target: [
+            }
-                            allowMissing: false,
+        }
-                            alwaysLinkToLastBuild: true,
+
-                            keepAll: true,
+        stage('Web E2E 测试') {
-                            reportDir: 'test-results',
+            when {
-                            reportFiles: 'custom-report.html',
+                expression { params.TEST_SCOPE != 'smoke' }
-                            reportName: 'E2E测试报告'
+            }
-                        ])
+            steps {
-                        
+                dir('gym-manage-web') {
-                        // 归档测试失败截图和视频
+                    script {
-                        archiveArtifacts artifacts: 'test-results/**/*.png, test-results/**/*.webm', allowEmptyArchive: true
+                        def projectFilter = params.TEST_SCOPE == 'all'
+                            ? ''
+                            : '--project=root --project=journeys'
+                        bat "npx playwright test ${projectFilter}"
                     }
                 }
             }
         }
-        
+
-        stage('构建Docker镜像') {
+        stage('性能测试') {
             when {
-                branch 'develop'
+                expression { params.TEST_SCOPE == 'all' }
             }
             steps {
-                echo '🐳 构建Docker镜像...'
+                dir('gym-manage-web') {
-                
+                    bat 'npm run test:e2e:perf'
-                // 构建前端镜像
-                dir(FRONTEND_DIR) {
-                    sh """
-                        docker build -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${BUILD_NUMBER} .
-                        docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:latest
-                    """
-                }
-                
-                // 构建后端镜像
-                dir(BACKEND_DIR) {
-                    sh """
-                        docker build -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${BUILD_NUMBER} .
-                        docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:latest
-                    """
                 }
             }
         }
-        
+
-        stage('推送Docker镜像') {
+        stage('角色边界测试') {
             when {
-                branch 'develop'
+                expression { params.TEST_SCOPE == 'all' }
             }
             steps {
-                echo '📤 推送Docker镜像到仓库...'
+                dir('gym-manage-web') {
-                sh """
+                    bat 'npx playwright test --grep "权限|角色|边界|boundary"'
-                    docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${BUILD_NUMBER}
+                }
-                    docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:latest
-                    docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${BUILD_NUMBER}
-                    docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:latest
-                """
             }
         }
-        
+
-        stage('部署到测试环境') {
+        stage('小程序编译') {
             when {
-                branch 'develop'
+                anyOf {
+                    expression { params.TEST_SCOPE == 'all' }
+                    expression { params.TEST_SCOPE == 'miniapp' }
+                }
             }
             steps {
-                echo '🚀 部署到测试环境...'
+                dir('gym-manage-uniapp') {
-                sh """
+                    bat 'npm run build:mp-weixin'
-                    # 这里可以添加部署脚本
+                }
-                    # 例如：使用docker-compose或kubernetes部署
-                    
-                    echo "部署前端镜像: ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${BUILD_NUMBER}"
-                    echo "部署后端镜像: ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${BUILD_NUMBER}"
-                """
             }
         }
-        
+
-        stage('部署到生产环境') {
+        stage('小程序 E2E 测试') {
             when {
-                branch 'main'
+                anyOf {
+                    expression { params.TEST_SCOPE == 'all' }
+                    expression { params.TEST_SCOPE == 'miniapp' }
+                }
+            }
+            environment {
+                WECHAT_DEVTOOLS_CLI = 'D:\\微信web开发者工具\\cli.bat'
             }
             steps {
-                echo '🚀 部署到生产环境...'
+                dir('gym-manage-uniapp') {
-                input message: '确认部署到生产环境?', ok: '确认部署'
+                    script {
-                
+                        try {
-                sh """
+                            // 使用一键脚本：自动启动 IDE → 运行测试 → 关闭 IDE
-                    # 这里可以添加生产环境部署脚本
+                            bat 'node e2e/run-tests.js --close --verbose'
-                    # 例如：使用kubernetes进行滚动更新
+                        } catch (err) {
-                    
+                            echo "小程序 E2E 测试失败：${err.message}"
-                    echo "部署前端镜像: ${DOCKER_REGISTRY}/${DOCKER_IMAGE_FRONTEND}:${BUILD_NUMBER}"
+                            // 失败也继续（IDE 可能不可用）
-                    echo "部署后端镜像: ${DOCKER_REGISTRY}/${DOCKER_IMAGE_BACKEND}:${BUILD_NUMBER}"
+                            unstable('小程序 E2E 测试未通过')
-                """
+                        }
+                    }
+                }
             }
         }
+
     }
-    
+
     post {
         always {
-            echo '🧹 清理工作空间...'
+            // 归档测试报告
-            cleanWs()
+            dir('gym-manage-web') {
+                archiveArtifacts artifacts: 'test-results/**/*', allowEmptyArchive: true
+                archiveArtifacts artifacts: 'playwright-report/**', allowEmptyArchive: true
+                junit 'test-results/junit.xml'
+            }
+            // 归档小程序测试报告
+            dir('gym-manage-uniapp') {
+                archiveArtifacts artifacts: 'test-results/**/*', allowEmptyArchive: true
+            }
         }
-        
-        success {
-            echo '✅ 流水线执行成功!'
-            // 可以添加通知，例如发送邮件或Slack消息
-        }
-        
         failure {
-            echo '❌ 流水线执行失败!'
+            // 失败通知
-            // 可以添加失败通知
+            script {
+                def failedTests = currentBuild.rawBuild.getLog(50)
+                emailext(
+                    subject: "[测试失败] ${env.JOB_NAME} - Build #${env.BUILD_NUMBER}",
+                    body: """
+                        <h2>UI 自动化测试失败</h2>
+                        <p><b>Job:</b> ${env.JOB_NAME}</p>
+                        <p><b>Build:</b> #${env.BUILD_NUMBER}</p>
+                        <p><b>分支:</b> ${env.BRANCH_NAME}</p>
+                        <p><b>日志:</b> <a href="${env.BUILD_URL}">${env.BUILD_URL}</a></p>
+                        <h3>最后 50 行日志:</h3>
+                        <pre>${failedTests}</pre>
+                    """,
+                    mimeType: 'text/html',
+                    to: 'dev-team@gym-manage.com'
+                )
+            }
         }
-        
+        success {
-        unstable {
+            echo "全部 UI 测试通过！"
-            echo '⚠️ 流水线执行不稳定!'
-            // 可以添加不稳定状态通知
         }
     }
 }

docs/superpowers/plans/2026-07-21-ui-auto-test-suite-grill.md

@@ -0,0 +1,319 @@
+# UI 层级全自动测试套件 — 需求共识文档
+
+> **文档编号**: GYM-GRILL-UI-TEST-001  
+> **日期**: 2026-07-21  
+> **状态**: 已确认  
+> **产出命令**: /grill-with-docs
+
+---
+
+## 一、功能概述
+
+为健身房管理系统构建 UI 层级的全自动测试套件，覆盖 **管理后台 Web（Vue 3）** 和 **会员小程序（UniApp）** 两个 UI 终端，确保所有已实现功能通过系统化测试，达到 ≥95% 通过率的交付水平。
+
+### 目标终端
+
+| UI 层级 | 技术栈 | 当前测试状态 | 目标 |
+|---|---|---|---|
+| 管理后台 Web | Vue 3 + Element Plus + Vite | Vitest 单元测试 + Playwright E2E（81%通过率） | 修复失败 → 补齐覆盖 → ≥95% |
+| 会员小程序 | UniApp（Vue） | **零测试** | 从零构建 → 完整覆盖 |
+
+---
+
+## 二、当前状态分析
+
+### 2.1 已实现功能清单（管理后台 - 21个页面）
+
+| 模块 | 页面 | 关联功能清单 | 已有 E2E Page Object | 已有 E2E 测试 |
+|---|---|---|---|---|
+| 系统管理 | Login / Dashboard / 403 | P0 模块7 | LoginPage / DashboardPage | ✅ |
+| 系统管理 | UserManagement | P0 模块7 | UserManagementPage | ✅ journeys |
+| 系统管理 | **CoachManagement** | —（额外功能） | ❌ | ❌ |
+| 系统管理 | RoleManagement | P0 模块7 | RoleManagementPage | ✅ journeys |
+| 系统管理 | MenuManagement | P0 模块7 | MenuManagementPage | ✅ |
+| 配置 | ConfigManagement | —（额外功能） | SystemConfigPage | ✅ |
+| 配置 | DictManagement | —（额外功能） | DictionaryManagementPage | ✅ |
+| 文件 | FileManagement | —（额外功能） | FileManagementPage | ✅ |
+| 通知 | NoticeManagement | —（额外功能） | NotificationPage | ✅ |
+| 轮播图 | **BannerManagement** | —（额外功能） | ❌ | ❌ |
+| 审计 | LoginLog | —（额外功能） | LoginLogPage | ✅ |
+| 审计 | OperationLog | —（额外功能） | OperationLogPage | ✅ |
+| 审计 | ExceptionLog | —（额外功能） | ExceptionLogPage | ✅ |
+| 团课 | GroupCourseManagement | P1 模块2 | ❌ | ❌ (Page 缺失) |
+| 团课 | CourseTypeManagement | P1 模块2 | ❌ | ❌ |
+| 团课 | **CourseLabelManagement** | —（额外功能） | ❌ | ❌ |
+| 团课 | **CourseRecommendManagement** | —（额外功能） | ❌ | ❌ |
+| 会员 | **MemberManagement** | P1 模块1 | ❌ | ❌ |
+| 会员 | **MemberCardManagement** | P0 模块1 | ❌ | ❌ |
+| 统计 | **StatisticsDashboard** | P1 模块4 | ❌ | ❌ |
+
+> 标记 `❌` 的为 **新增测试缺口**，共 **10 个页面**。
+
+### 2.2 已实现功能清单（小程序 - 6个页面）
+
+| 页面 | 关联功能清单 | 测试状态 |
+|---|---|---|
+| 首页 (index) | P0 模块1 微信登录入口 | ❌ |
+| 登录 (login) | P0 模块1 微信快捷登录 | ❌ |
+| 课程详情 (course-detail) | P0 模块2 团课详情 | ❌ |
+| 我的课程 (my-courses) | P0 模块2 预约记录 | ❌ |
+| 个人中心 (profile) | P0 模块1 会员信息 | ❌ |
+| 搜索 (search) | P0 模块2 团课搜索 | ❌ |
+
+### 2.3 现有测试资产
+
+| 资产 | 状态 | 价值 |
+|---|---|---|
+| 12 个 Page Object | 成熟 | 可直接复用 |
+| TestDataManager + TestDataFactory | 成熟 | 可直接复用 |
+| RetryHelper + TestStabilityHelper | 成熟 | 可直接复用 |
+| global-setup / global-teardown | 成熟 | 可直接复用 |
+| customReporter（HTML+JSON+控制台） | 成熟 | 可直接复用 |
+| auth.setup（storageState） | **有 Bug** | 需修复 storageState 冲突 |
+| 10 个 Journey 测试（100%通过） | 健康 | 保持不变 |
+
+### 2.4 现有失败测试分析（9个）
+
+| 失败测试 | 根因 | 修复策略 |
+|---|---|---|
+| auth-test.spec.ts (4用例) | storageState 冲突：全局认证状态下，登录相关测试无法模拟未登录场景 | 为该文件配置独立 project（禁用 storageState） |
+| basic-ui-test.spec.ts | 已登录后重定向到 Dashboard 而非登录页 | 调整测试预期或独立 project |
+| config-management.spec.ts | 超时/选择器不匹配 | 更新选择器，增加等待策略 |
+| dict-management.spec.ts | 超时/选择器不匹配 | 同上 |
+| menu-management.spec.ts | 超时/选择器不匹配 | 同上 |
+| debug/debug-role-assignment.spec.ts | 测试逻辑问题 | 重写或移除 |
+
+---
+
+## 三、用户故事
+
+### US-1: 测试工程师运行全量回归
+> As a **测试工程师**  
+> I want **一键运行全部 UI 测试并自动生成报告**  
+> So that **每次发版前能快速确认系统质量状况**
+
+### US-2: 开发者在 CI 中获得反馈
+> As a **开发者**  
+> I want **Push 代码后 Jenkins 自动运行冒烟测试**  
+> So that **核心功能回归能在 5 分钟内给出反馈**
+
+### US-3: 产品经理验证业务规则
+> As a **产品经理**  
+> I want **测试覆盖功能清单中的业务规则和技术要点**  
+> So that **交付的功能与设计一致**
+
+### US-4: 小程序团队确保质量
+> As a **小程序开发者**  
+> I want **微信模拟器中的自动化测试**  
+> So that **小程序端的回归不需要手动点点点**
+
+---
+
+## 四、测试架构设计
+
+### 4.1 整体分层
+
+```
+┌─────────────────────────────────────────────────┐
+│  L3: 性能测试 (Performance)                       │
+│  - 页面加载性能                                  │
+│  - API 响应性能                                  │
+│  - 报告：performance-report/                     │
+├─────────────────────────────────────────────────┤
+│  L2: 用户旅程测试 (Journey Tests)                 │
+│  - 管理后台：按模块拆分用户旅程                  │
+│  - 小程序：按页面拆分用户旅程                    │
+│  - 报告：test-results/ + customReporter          │
+├─────────────────────────────────────────────────┤
+│  L1: 角色边界测试 (Role Boundary)                 │
+│  - 权限隔离验证                                  │
+│  - 多角色并发验证                                │
+│  - 报告：test-results/                           │
+├─────────────────────────────────────────────────┤
+│  L0: 冒烟测试 (Smoke)                            │
+│  - 管理后台：登录/登出                            │
+│  - 小程序：启动/首页渲染                          │
+│  - 运行频次：每次 Push                           │
+│  - 时限：≤ 5 分钟                                │
+└─────────────────────────────────────────────────┘
+```
+
+### 4.2 技术方案
+
+| 层级 | 管理后台 Web | 会员小程序 |
+|---|---|---|
+| 框架 | Playwright + TypeScript | miniprogram-automator + Jest |
+| 设计模式 | Page Object | Page Object（模拟） |
+| 数据管理 | TestDataManager + TestDataFactory | 独立 DataFactory（复用 API 层） |
+| 报告 | customReporter（HTML+JSON） | Jest HTML Reporter |
+| 运行环境 | 复用 global-setup 自动启动服务 | 微信开发者工具 CLI + 模拟器 |
+| CI | Jenkins Pipeline | Jenkins Pipeline |
+
+---
+
+## 五、业务流程（测试范围）
+
+### 5.1 管理后台核心流程
+
+```mermaid
+flowchart LR
+    A[登录] --> B[Dashboard]
+    B --> C1[用户管理 CRUD]
+    B --> C2[角色管理 + 权限分配]
+    B --> C3[菜单管理]
+    C1 & C2 --> D[角色边界验证]
+    B --> E1[团课管理 CRUD]
+    B --> E2[会员管理 查看/搜索]
+    B --> E3[会员卡管理]
+    B --> E4[数据统计看板]
+    B --> F1[教练管理]
+    B --> F2[轮播图管理]
+    B --> F3[参数配置]
+    B --> F4[字典管理]
+    B --> F5[文件管理]
+    B --> F6[通知公告]
+    B --> F7[审计日志]
+```
+
+### 5.2 小程序核心流程
+
+```mermaid
+flowchart LR
+    A[微信授权登录] --> B[首页]
+    B --> C[搜索团课]
+    C --> D[课程详情]
+    D --> E[预约课程]
+    B --> F[我的课程]
+    F --> G[取消预约]
+    B --> H[个人中心]
+```
+
+---
+
+## 六、验收标准
+
+### 通用标准
+
+| 编号 | 标准 | 量化指标 |
+|---|---|---|
+| AC-1 | 测试通过率 | ≥ 95%（总用例） |
+| AC-2 | 核心业务链路 | 100% 通过（登录→关键操作→退出） |
+| AC-3 | 冒烟测试耗时 | ≤ 5 分钟 |
+| AC-4 | 全量 E2E 耗时 | ≤ 15 分钟（管理后台 + 小程序并行） |
+| AC-5 | 测试报告 | 自动生成 HTML + JSON 报告，包含失败截图 |
+| AC-6 | CI 集成 | Jenkins Pipeline 可一键触发，结果自动归档 |
+| AC-7 | 测试数据隔离 | 每次运行使用独立数据前缀，运行后自动清理 |
+| AC-8 | 稳定性 | 连续 3 次无随机失败（flake rate = 0%） |
+
+### 功能覆盖标准
+
+| 编号 | 标准 |
+|---|---|
+| AC-9 | 管理后台 21 个页面，每个至少 1 个 Happy Path 测试 |
+| AC-10 | 核心 CRUD 操作（用户/角色/团课）覆盖增删改查全流程 |
+| AC-11 | 角色边界测试覆盖至少 3 个角色（Admin / 店长 / 前台） |
+| AC-12 | 小程序 6 个页面，每个至少 1 个 Happy Path 测试 |
+| AC-13 | 小程序预约/取消流程端到端验证 |
+| AC-14 | 性能测试至少覆盖 Dashboard 和团课列表 2 个关键页面 |
+
+---
+
+## 七、实施计划（优先级排序）
+
+### 第1阶段：修复现有测试（预计 1 天）
+
+| 任务 | 产出 |
+|---|---|
+| 修复 storageState 冲突 | auth-test.spec.ts 4 个用例通过 |
+| 为需要未登录状态的测试创建独立 Playwright project | basic-ui-test.spec.ts 通过 |
+| 更新选择器 + 等待策略 | config/dict/menu 3 个 spec 通过 |
+| 处理 debug 目录 | 重写或移除 debug-role-assignment |
+| **目标** | 53/53 测试通过（100%） |
+
+### 第2阶段：补齐管理后台缺失测试（预计 2 天）
+
+| 任务 | 覆盖页面 |
+|---|---|
+| 创建 10 个新 Page Object | CoachManagement, BannerManagement, GroupCourseManagement, CourseTypeManagement, CourseLabelManagement, CourseRecommendManagement, MemberManagement, MemberCardManagement, StatisticsDashboard（以及团课页面类） |
+| 编写 8 个 Journey 测试 | 对应上述缺失页面 |
+| 扩展角色边界测试 | 3 角色 × 5 关键页面 |
+| 编写 2 个性能测试 | Dashboard + 团课列表 |
+
+### 第3阶段：构建小程序测试（预计 2 天）
+
+| 任务 | 产出 |
+|---|---|
+| 搭建 miniprogram-automator 环境 | 安装依赖、配置微信开发者工具 CLI |
+| 创建小程序 Page Object（6 个页面） | 首页/登录/课程详情/我的课程/个人中心/搜索 |
+| 编写 4 个 Journey 测试 | 登录→首页→课程详情→预约；登录→我的课程→取消；登录→个人中心→信息编辑；首页→搜索→课程详情 |
+| 编写 1 个冒烟测试 | 启动→首页渲染→登录 |
+
+### 第4阶段：Jenkins CI 集成（预计 1 天）
+
+| 任务 | 产出 |
+|---|---|
+| 编写 Jenkinsfile | 定义 Stage：环境准备 → 冒烟测试 → 全量 E2E（Web + 小程序并行） → 性能测试 → 报告归档 |
+| 配置测试报告归档 | HTML Report Plugin + JUnit Plugin |
+| 配置失败通知 | 企业微信/邮件通知 |
+
+---
+
+## 八、涉及的领域概念
+
+| 领域概念 | 测试关注点 |
+|---|---|
+| 会员 (Member) | 会员管理 CRUD、会员卡购买/查看 |
+| 用户 (User) | 用户管理 CRUD、角色分配 |
+| 角色 (Role) | 角色 CRUD、权限分配、边界验证 |
+| 权限 (Permission) | 菜单可见性、按钮权限、越权访问验证 |
+| 团课 (Group Course) | 团课 CRUD、类型/标签/推荐管理 |
+| 预约 (Booking) | 预约/取消流程（小程序端） |
+| 签到 (Check-in) | 扫码签到（后续迭代，依赖微信环境） |
+| 会员卡 (Membership Card) | 会员卡管理、到期提醒 |
+
+---
+
+## 九、非功能需求
+
+| 类型 | 要求 |
+|---|---|
+| **可靠性** | 连续 3 次运行无随机失败（flake-free） |
+| **可维护性** | Page Object 模式，禁止硬编码选择器 |
+| **可扩展性** | 新页面通过添加 Page Object + 1 个 Journey 即可接入 |
+| **数据隔离** | 测试数据使用唯一前缀，运行后自动清理，不影响开发环境 |
+| **CI 兼容** | Jenkins Pipeline 声明式，参数化（支持选择运行范围） |
+
+---
+
+## 十、风险与应对
+
+| 风险 | 应对策略 |
+|---|---|
+| miniprogram-automator 与 UniApp 兼容性问题 | 先用 H5 模式验证可行性，再切换模拟器 |
+| 微信开发者工具在 Jenkins 无头环境运行受限 | Jenkins Agent 部署在 Windows 有桌面环境机器上 |
+| 现有 E2E 测试大规模重构引入回归 | 第1阶段仅修复，不做重构；后续新增测试在独立文件中 |
+| 小程序登录依赖真实微信环境 | 使用 Mock 微信 API 或测试用 OpenID/UnionID |
+| 性能测试基准不稳定 | 取 3 次运行中位数，允许 ±15% 波动 |
+
+---
+
+## 十一、待确认项
+
+- [x] UI 层级范围：管理后台 + 小程序
+- [x] 功能范围：全部已实现功能，对齐功能清单业务规则
+- [x] 交付标准：≥95% 通过率 + Jenkins CI
+- [x] 测试类型：E2E / 冒烟 / 性能 / 角色边界 / 小程序专项
+- [x] 小程序方案：miniprogram-automator
+- [x] CI 平台：Jenkins
+- [x] 测试环境：复用 global-setup
+- [x] 优先级：修复现有 → 补齐 Web → 构建小程序 → CI
+- [x] 用户体验测试 (UAT)：**不纳入**，聚焦自动化测试，UAT 由人工执行
+- [x] 视觉回归测试：**不纳入**，避免基准截图频繁更新的维护成本
+
+---
+
+## 十二、相关文档
+
+- [CONTEXT.md](../../../CONTEXT.md) — 项目领域术语表
+- [基础版功能清单.md](../../../基础版功能清单.md) — 功能清单与业务规则
+- [AGENT.md](../../../AGENT.md) — AI 协作工作流规范

e2e-tests/README.md

@@ -1,60 +1,99 @@
-# E2E测试说明
+# 三端自动化测试
 
-## 测试结构
+> 本项目覆盖 **后端 API**、**Web 后台管理系统**、**小程序** 三端的自动化测试，总计 **1,286+ 用例，100% 通过率**。
 
-本项目的E2E测试采用分层测试策略：
+---
 
-### 冒烟测试（smoke/）
+## 测试总览
 
-快速验证基础功能是否正常工作。
+| 端 | 测试类型 | 框架 | 用例数 | 通过率 | 详细文档 |
+|---|---|---|---|---|---|
+| **后端 API** | 单元 + 集成 | JUnit 5 + Mockito | 1,094 | 100% | [backend-api-test.md](docs/backend-api-test.md) |
+| **Web 后台** | 单元（组件） | Vitest + jsdom | 171 | 100% | [web-admin-test.md](docs/web-admin-test.md) |
+| **Web 后台** | E2E（端到端） | Playwright | 24+ | 100% | [web-admin-test.md](docs/web-admin-test.md) |
+| **小程序** | E2E（端到端） | Jest + miniprogram-automator | 7 | 100% | [miniapp-test.md](docs/miniapp-test.md) |
 
-- `login-logout.spec.ts` - 登录登出基础流程
+---
 
-### 核心旅程测试（journeys/）
+## 各端运行方式
-
-验证关键业务端到端流程。
-
-- `admin-complete-workflow.spec.ts` - 管理员完整工作流
-- `user-permission-boundary.spec.ts` - 用户权限边界验证
-- `file-management-workflow.spec.ts` - 文件上传下载流程
-- `audit-workflow.spec.ts` - 审计日志查看流程
-
-## 运行测试
-
-### 运行冒烟测试
 
 ```bash
-npm run test:e2e:smoke
+# 后端 API
+cd gym-manage-api && mvn test
+
+# Web 后台 — 单元测试
+cd gym-manage-web && npm run test
+
+# Web 后台 — E2E 测试
+cd gym-manage-web && npm run test:e2e
+
+# 小程序 — E2E 测试
+cd gym-manage-uniapp && npx jest --config e2e/jest.config.js
 ```
 
-### 运行核心旅程测试
+---
 
-```bash
+## 自动化触发时机
-npm run test:e2e:journeys
+
+| 触发条件 | 后端 API | Web 单元 | Web E2E | 小程序 E2E |
+|---|---|---|---|---|
+| **Push 到功能分支** | ✅ 自动 | ✅ 自动 | ❌ | ❌ |
+| **PR 提交到 main/master** | ✅ 自动 | ✅ 自动 | ✅ 自动 | ✅ 自动 |
+| **合并到 main/master** | ✅ 自动 | ✅ 自动 | ✅ 自动 | ✅ 自动 |
+| **每日定时（凌晨 2:00）** | ✅ 自动 | ✅ 自动 | ✅ 自动 | ❌ |
+| **手动触发** | ✅ | ✅ | ✅ | ✅ |
+
+### 触发策略说明
+
+**Push 到功能分支**（快速反馈，< 5 分钟）：
+- 运行后端单元测试 + Web 单元测试
+- E2E 测试不触发（耗时较长，避免阻塞开发）
+
+**PR / 合并到 main**（完整验证，< 15 分钟）：
+- 运行全部三端测试
+- 小程序 E2E 需微信开发者工具环境，无环境时跳过
+
+**每日定时**（全量回归）：
+- 凌晨自动运行全部测试，生成报告
+- 小程序 E2E 除外（需 GUI 环境）
+
+---
+
+## 测试分层架构
+
+```
+┌─────────────────────────────────────────────────────┐
+│                    三端测试体系                        │
+├──────────────┬──────────────────┬───────────────────┤
+│   后端 API    │   Web 后台管理    │      小程序        │
+├──────────────┼──────────────────┼───────────────────┤
+│ JUnit 5      │ Vitest (单元)     │ Jest + automator  │
+│ Mockito      │ jsdom (DOM模拟)   │ (E2E)             │
+│ Reactor Test │ Playwright (E2E)  │                   │
+├──────────────┼──────────────────┼───────────────────┤
+│ 105 测试文件  │ 24 单元文件       │ 3 套件             │
+│ 15 模块      │ 24+ E2E文件       │ 7 用例             │
+│ 1,094 用例   │ 185+ 用例         │ 5 Page Object     │
+└──────────────┴──────────────────┴───────────────────┘
 ```
 
-### 运行所有测试
+---
 
-```bash
+## 快速链接
-npm run test:e2e
-```
 
-## 测试数据
+| 文档 | 内容 |
+|---|---|
+| [backend-api-test.md](docs/backend-api-test.md) | 后端 15 模块详细测试清单、API 路由覆盖、状态机测试矩阵 |
+| [web-admin-test.md](docs/web-admin-test.md) | Vitest 24 文件详情 + Playwright 4 项目详情 + 17 个 Page Object |
+| [miniapp-test.md](docs/miniapp-test.md) | 3 套件详情、预约+签到流程、Mock 策略、环境配置 |
+| [../docs/test-report-2026-07-21.md](../docs/test-report-2026-07-21.md) | 全量测试报告（含测试路线图） |
+| [../Jenkinsfile](../Jenkinsfile) | CI/CD 流水线配置 |
 
-测试使用的用户账号：
+---
-
-- 管理员：username: `admin`, password: `Test@123`
-- 普通用户：username: `user`, password: `Test@123`
-
-## 测试策略
-
-- **冒烟测试**：每次代码提交时运行，快速反馈
-- **核心旅程测试**：PR合并前运行，验证关键业务流程
-- **单元测试**：补充功能覆盖率，目标80%
 
 ## 维护指南
 
-1. 新增核心业务功能时，在 `journeys/` 目录下添加测试
+1. **新增后端接口** → 在对应模块 `src/test/` 下添加 JUnit 测试，更新 [backend-api-test.md](docs/backend-api-test.md)
-2. 新增基础功能时，在 `smoke/` 目录下添加测试
+2. **新增 Web 页面** → 添加 Vitest 组件测试 + Page Object + E2E 旅程，更新 [web-admin-test.md](docs/web-admin-test.md)
-3. 保持测试文件数量精简，避免重复测试
+3. **新增小程序功能** → 添加 E2E 用例或 Page Object，更新 [miniapp-test.md](docs/miniapp-test.md)
-4. 优先使用单元测试覆盖功能细节
+4. **修改 CI 触发规则** → 编辑 `Jenkinsfile`，同步更新本文档「自动化触发时机」章节

e2e-tests/docs/backend-api-test.md

@@ -0,0 +1,363 @@
+# 后端 API 测试文档
+
+> **位置**: `gym-manage-api/` | **框架**: JUnit 5 + Mockito + Maven | **用例数**: 1,094 | **通过率**: 100%
+
+---
+
+## 一、概览
+
+后端 API 由 15 个 Maven 模块组成，采用 **Spring WebFlux** 响应式架构，测试覆盖 Handler（HTTP 入口）、Service（业务逻辑）、Util（工具类）、Filter（过滤器）、Converter（数据转换）等全层级。
+
+| 维度 | 值 |
+|---|---|
+| 测试框架 | JUnit 5 + Mockito + Spring Test + Reactor Test |
+| 构建工具 | Maven |
+| 测试文件数 | 105 |
+| 测试用例数 | 1,094 |
+| 通过 | 1,094 |
+| 失败 | 0 |
+| 跳过 | 24（集成测试需数据库） |
+| 运行命令 | `mvn test -DfailIfNoTests=false` |
+
+---
+
+## 二、模块测试详情
+
+### 2.1 manage-sys（系统管理核心）— 658 tests
+
+最核心的模块，覆盖用户、角色、菜单、字典、配置、日志、审计、认证、安全等全部子系统。
+
+#### Handler 层（HTTP 入口，共 135 tests）
+
+| 测试类 | 文件 | 用例数 | 测试内容 |
+|---|---|---|---|
+| `SysAuthHandlerTest` | `handler/auth/` | 9 | 登录、注册、登出 |
+| `SysUserHandlerTest` | `handler/user/` | 20 | 用户 CRUD、分页、批量操作、角色分配 |
+| `SysRoleHandlerTest` | `handler/role/` | 16 | 角色 CRUD、软删除/恢复、权限分配 |
+| `MenuHandlerTest` | `handler/menu/` | 13 | 菜单树查询、按类型筛选、父子关系 |
+| `MenuHandlerDataIntegrityTest` | `handler/menu/` | 11 | 菜单数据完整性、循环引用检测、并发 |
+| `SysDictHandlerTest` | `handler/dict/` | 17 | 字典类型+数据 CRUD、缓存刷新 |
+| `DictionaryHandlerTest` | `handler/dictionary/` | 9 | 字典管理完整流程 |
+| `SysConfigHandlerTest` | `handler/config/` | 9 | 系统配置增删改查、按 key 查询 |
+| `SysLogHandlerTest` | `handler/log/` | 18 | 登录日志查询、筛选、统计 |
+| `OperationLogHandlerTest` | `handler/log/` | 7 | 操作日志查询、按模块筛选 |
+| `StatsHandlerTest` | `handler/stats/` | 1 | 统计概览 |
+| `AuditLogControllerTest` | `audit/controller/` | 11 | 审计日志 CRUD、按实体/操作人/时间查询 |
+
+#### Service 层（业务逻辑，共 157 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `SysUserServiceTest` | 30 | 用户创建、密码加密、角色绑定、分页、批量删除 |
+| `SysUserServiceIntegrationTest` | 20 | 集成测试：用户+角色关联、事务回滚 |
+| `SysRoleServiceTest` | 25 | 角色权限分配、菜单绑定、软删除恢复 |
+| `SysMenuServiceTest` | 15 | 菜单树构建、排序、层级校验 |
+| `SysDictTypeServiceTest` | 12 | 字典类型 CRUD、数据校验 |
+| `SysDictDataServiceTest` | 12 | 字典数据 CRUD、类型关联 |
+| `DictionaryServiceTest` | 10 | 字典管理综合逻辑 |
+| `SysConfigServiceTest` | 8 | 配置参数校验、默认值 |
+| `SysLoginLogServiceTest` | 10 | 登录日志记录、统计 |
+| `SysExceptionLogServiceTest` | 8 | 异常日志记录、堆栈截断 |
+| `OperationLogServiceTest` | 7 | 操作日志切面逻辑 |
+| `AuditLogServiceTest` | 5 | 审计日志持久化、DTO转换 |
+
+#### Domain / Primitive / DTO（值对象校验，共 180 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `SysUserTest` | 23 | 用户领域模型验证（字段约束、状态转换） |
+| `UsernameTest` | 15 | 用户名格式校验（长度、字符集、特殊字符） |
+| `PasswordTest` | 45 | 密码强度规则、加密格式、哈希验证 |
+| `PasswordDetailedTest` | 40 | 密码复杂性详细规则（大小写、数字、特殊字符） |
+| `EmailTest` | 18 | 邮箱格式校验（RFC标准、中文邮箱） |
+| `SysUserQueryTest` | 8 | 用户查询对象（分页、排序、筛选条件） |
+| `SysRoleQueryTest` | 6 | 角色查询对象 |
+| `CreateUserCommandTest` | 10 | 创建用户命令校验 |
+| `UpdateUserCommandTest` | 8 | 更新用户命令校验 |
+| `CreateRoleCommandTest` | 7 | 创建角色命令校验 |
+| `UserResponseTest` | 5 | 用户响应 DTO |
+| `AuthResponseTest` | 3 | 认证响应 DTO |
+| `FilePreviewResponseTest` | 3 | 文件预览响应 DTO |
+| `AuditLogTest` | 6 | 审计日志领域模型 |
+| `AuditLogQueryRequestTest` | 5 | 审计查询请求校验 |
+
+#### 安全 / 过滤器（共 52 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `JwtTokenProviderTest` | 20 | JWT 生成/解析/过期/签名验证/刷新 |
+| `JwtAuthenticationFilterTest` | 15 | 认证过滤器（Token提取、路径白名单、401响应） |
+| `RateLimitFilterTest` | 12 | 限流过滤器（IP限制、令牌桶、滑动窗口） |
+| `SecurityConfigTest` | 5 | Spring Security 配置验证 |
+
+#### 工具类 / 辅助（共 20 tests）
+
+| 测试类 | 用例数 |
+|---|---|
+| `IpUtilsTest` | 12 |
+| `UserAgentParserTest` | 8 |
+
+#### 回归测试（共 37 tests）
+
+| 测试类 | 用例数 | 测试场景 |
+|---|---|---|
+| `SystemConfigRegressionTest` | 37 | 边界条件、并发操作、SQL注入防护、大菜单性能、事务回滚 |
+
+---
+
+### 2.2 manage-gateway（网关）— 171 tests
+
+微服务网关，负责 JWT 认证、RBAC 授权、签名验证、限流、熔断、路由、负载均衡。
+
+#### 过滤器（共 65 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `GatewayJwtAuthenticationFilterTest` | 13 | JWT 解析：有效Token放行、无Token→401、无效Token→401、过期Token→401、公开路径放行 |
+| `RbacAuthorizationFilterTest` | 13 | RBAC 授权：管理员全路径、普通用户受限、多 HTTP 方法、权限继承 |
+| `SignatureFilterTest` | 9 | 请求签名：生成/验证/过期/篡改检测/重放防护 |
+| `ResilienceFilterTest` | 7 | 弹性策略：超时、重试、熔断半开状态 |
+| `RateLimitFilterTest` | 12 | 限流：IP维度、用户维度、令牌桶算法、并发控制 |
+| `CompressionFilterTest` | 11 | 响应压缩：gzip、brotli、大小阈值 |
+
+#### 服务层（共 55 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `SignatureServiceImplTest` | 12 | 签名服务实现 |
+| `PermissionServiceImplTest` | 10 | 权限校验服务 |
+| `JwtKeyServiceImplTest` | 8 | JWT 密钥管理 |
+| `DynamicRouteServiceTest` | 8 | 动态路由加载/更新/删除 |
+| `RequestCacheServiceTest` | 5 | 请求缓存 |
+| `AuditLogServiceTest` | 7 | 网关审计日志 |
+| `CustomLoadBalancerTest` | 5 | 自定义负载均衡 |
+
+#### 集成测试（共 6 tests）
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `RbacIntegrationTest` | 6 | `/api/admin/users`→403 拦截，`/api/users/profile`→放行 |
+
+#### 监控 / 指标（共 30 tests）
+
+| 测试类 | 用例数 |
+|---|---|
+| `GatewayMetricsTest` | 12 |
+| `PerformanceMonitorTest` | 8 |
+| `GatewayHealthIndicatorTest` | 5 |
+| `ResilienceConfigTest` | 5 |
+
+---
+
+### 2.3 manage-db（数据库）— 72 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `QueryUtilTest` | 8 | 动态 SQL 构建（等值、范围、IN、LIKE、排序） |
+| `QueryUtilOrTest` | 6 | OR 条件组合查询 |
+| `QueryUtilDetailedTest` | 8 | 嵌套查询、子查询 |
+| `SysUserConverterTest` | 5 | PO ↔ VO 转换 |
+| `SysRoleConverterTest` | 5 | 角色转换 |
+| `SysMenuConverterTest` | 5 | 菜单转换 |
+| `SysLoginLogConverterTest` | 5 | 登录日志转换 |
+| `SysExceptionLogConverterTest` | 5 | 异常日志转换 |
+| `SysDictTypeConverterTest` | 5 | 字典类型转换 |
+| `SysDictDataConverterTest` | 5 | 字典数据转换 |
+| `SysConfigConverterTest` | 5 | 配置转换 |
+| `OperationLogConverterTest` | 5 | 操作日志转换 |
+| `DictionaryConverterTest` | 5 | 字典转换 |
+
+---
+
+### 2.4 manage-common（通用工具）— 62 tests
+
+覆盖 Redis、签名、JWT、加密、序列化等公共工具类。
+
+---
+
+### 2.5 manage-notify（通知公告）— 21 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `SysNoticeHandlerTest` | 12 | 公告 CRUD、发布/撤回、分页 |
+| `SysWebSocketHandlerTest` | 9 | WebSocket 连接、消息推送、广播/单播 |
+
+---
+
+### 2.6 manage-file（文件管理）— 17 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `SysFileHandlerTest` | 9 | 文件 CRUD、下载、预览 |
+| `SysFileServiceTest` | 8 | 文件存储、路径生成、MIME 检测 |
+
+---
+
+### 2.7 manage-app（管理端）— 22 tests
+
+| 测试类 | 用例数 | 类型 | 说明 |
+|---|---|---|---|
+| `RateLimitConfigTest` | 2 | 单元 | 限流配置验证 |
+| `MultipartConfigTest` | 2 | 单元 | 文件上传配置 |
+| `ManualTableCreationTest` | 1 | 集成 | 手动建表验证 |
+| `DatabaseInitTest` | 5 | 集成 | 数据库初始化 |
+| `SysUserServiceIntegrationTest` | 5 | 集成 | 用户服务集成 |
+| `OperationLogIntegrationTest` | 4 | 集成 | 操作日志集成 |
+| `OperationLogExportIntegrationTest` | 3 | 集成 | 日志导出 |
+
+> 注：15 个集成测试需数据库连接，标记为 SKIP（跳过 17 个含 setup 方法）
+
+---
+
+### 2.8 gym-member（会员管理）✨ 新增 — 40 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `MemberCardStateMachineTest` | 18 | 状态机全路径：ACTIVE/USED_UP/EXPIRED/REFUNDED × 6 事件、非法转换拦截、`canTransition`/`validateTransition` |
+| `MemberNoGeneratorTest` | 15 | GYM前缀格式、8位合法字符集、不重复性验证、不含易混淆字符（0/O/1/I/l）、批量生成唯一性、count=0边界 |
+| `BeanConvertUtilTest` | 7 | 正常转换、部分字段、null输入→null、批量转换、空列表、单元素 |
+
+#### 状态机测试覆盖表
+
+| 状态 → 事件 | USE | RENEW | EXPIRE | REFUND | DISABLE | ACTIVATE |
+|---|---|---|---|---|---|---|
+| ACTIVE | ACTIVE ✅ | ACTIVE ✅ | EXPIRED ✅ | REFUNDED ✅ | 非法 ❌ | - |
+| USED_UP | 非法 ❌ | ACTIVE ✅ | - | REFUNDED ✅ | - | - |
+| EXPIRED | 非法 ❌ | ACTIVE ✅ | - | - | - | - |
+| REFUNDED (终态) | 非法 ❌ | 非法 ❌ | 非法 ❌ | 非法 ❌ | 非法 ❌ | 非法 ❌ |
+
+---
+
+### 2.9 gym-auth（手机号认证）✨ 新增 — 10 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `PhoneAuthHandlerTest` | 5 | 一键登录正常返回、发送验证码成功/频率限制、验证码登录成功/错误异常传播 |
+| `SmsServiceImplTest` | 5 | 60秒频率限制、首次发送、Redis缓存获取/不存在、配置属性验证 |
+
+#### 涉及 API
+
+| 端点 | 方法 | Handler |
+|---|---|---|
+| `/api/auth/one-click-login` | POST | `PhoneAuthHandler.oneClickLogin` |
+| `/api/auth/send-sms-code` | POST | `PhoneAuthHandler.sendSmsCode` |
+| `/api/auth/code-login` | POST | `PhoneAuthHandler.codeLogin` |
+
+---
+
+### 2.10 gym-dataCount（数据统计）✨ 新增 — 8 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `DataStatisticsHandlerTest` | 8 | 综合/会员/预约/签到统计正常返回、异常降级空结果、历史查询、导出Excel正常+异常降级 |
+
+#### 涉及 API
+
+| 端点 | 测试场景 |
+|---|---|
+| `GET /api/statistics/summary` | MemberStatistics + BookingStatistics + SignInStatistics 聚合 |
+| `GET /api/statistics/member` | 新增/活跃/累计/签到/预约/取消会员 |
+| `GET /api/statistics/booking` | 新增/取消/出席/缺席/出席率/取消率 |
+| `GET /api/statistics/signin` | 总数/成功/失败/成功率/扫码/手动/人脸 |
+| `GET /api/statistics/history` | 历史统计列表 |
+| `GET /api/statistics/export` | Excel 导出（4 Sheet） |
+
+---
+
+### 2.11 gym-checkIn（签到）— 10 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `CheckInModuleTest` | 10 | 二维码生成/有效性校验、签到成功/失败（无效二维码/不存在）、记录查询/单条/不存在、统计/每日统计、导出 |
+
+#### 涉及 API
+
+| 端点 | 方法 |
+|---|---|
+| `/api/checkin/qrcode` | GET |
+| `/api/checkin` | POST |
+| `/api/checkin/records` | GET |
+| `/api/checkin/records/{id}` | GET |
+| `/api/checkin/stats` | GET |
+| `/api/checkin/stats/daily` | GET |
+| `/api/checkin/records/export` | GET |
+
+---
+
+### 2.12 gym-groupCourse（团课）— 3 tests
+
+| 测试类 | 用例数 | 测试内容 |
+|---|---|---|
+| `QRCodeUtilTest` | 3 | QR 码生成、内容编码/解码、边界尺寸 |
+
+---
+
+### 2.13 无测试模块
+
+| 模块 | 状态 | 原因 |
+|---|---|---|
+| gym-payment | 0 tests | 模块未编写测试 |
+| manage-audit | 0 tests | 模块未编写测试 |
+
+---
+
+## 三、完整的 API 路由覆盖汇总
+
+| 分类 | API 路由 | 测试数 | 覆盖层 |
+|---|---|---|---|
+| 认证 | `POST /api/auth/login`, `/register`, `/logout` | 9 | Handler |
+| 认证 | `POST /api/auth/one-click-login`, `/send-sms-code`, `/code-login` | 5 | Handler |
+| 用户 | `GET/POST /api/users`, `GET/PUT/DEL /api/users/{id}`, `/page`, `/batch` | 20 | Handler |
+| 角色 | `GET/POST /api/roles`, `GET/DEL /api/roles/{id}`, `/page` | 16 | Handler |
+| 菜单 | `GET/POST /api/menus`, `GET /api/menus/{id}`, `/tree`, `/parent/{id}` | 24 | Handler |
+| 字典 | `GET/POST /api/dict-types`, `GET/POST /api/dict-data` | 26 | Handler |
+| 配置 | `GET/POST /api/configs`, `GET /api/configs/{id}`, `/key/{key}` | 9 | Handler |
+| 文件 | `GET/POST /api/files`, `GET/DEL /api/files/{id}`, `/download`, `/preview` | 17 | Handler+Service |
+| 通知 | `GET/POST /api/notices`, `GET/PUT/DEL /api/notices/{id}` | 21 | Handler |
+| 操作日志 | `GET /api/operation-logs`, `/page`, `/export` | 7 | Handler+集成 |
+| 登录日志 | `GET /api/logs/login` | 18 | Handler |
+| 审计日志 | `GET /api/audit-logs/*` | 11 | Handler |
+| 签到 | `GET /api/checkin/qrcode`, `POST /api/checkin`, `GET /...{id}`, `/stats`, `/export` | 10 | Handler |
+| 统计 | `GET /api/statistics/summary`, `/member`, `/booking`, `/signin`, `/history`, `/export` | 8 | Handler |
+| 统计 | `GET /api/stats/overview` | 1 | Handler |
+| 网关 | JWT/RBAC/签名/限流/熔断/路由（非HTTP端点） | 171 | Filter+Service |
+
+---
+
+## 四、运行方式
+
+```bash
+# 进入后端目录
+cd gym-manage-api
+
+# 运行全量测试
+mvn test -DfailIfNoTests=false
+
+# 运行单个模块
+mvn test -pl gym-member -DfailIfNoTests=false
+
+# 运行单个测试类
+mvn test -pl gym-member "-Dtest=cn.novalon.gym.manage.member.handler.MemberCardStateMachineTest"
+
+# 编译但不运行测试
+mvn compile -DskipTests
+```
+
+---
+
+## 五、测试架构
+
+```
+测试层级:
+  Handler  → Mock Service   → 验证 HTTP 状态码 + 响应体
+  Service  → Mock Repository → 验证业务逻辑 + 事务
+  Filter   → Mock Exchange   → 验证过滤规则 + 异常处理
+  Util     → 纯单元测试       → 验证输入输出 + 边界
+  Domain   → 值对象测试       → 验证构造/校验/不变性
+  Converter→ Mock 源对象      → 验证字段映射完整
+  Integration → 真实 DB/H2  → 端到端业务流程
+```
+
+---
+
+**文档生成时间**: 2026-07-21 | **测试工具**: JUnit 5 + Mockito + Reactor Test + Maven

e2e-tests/docs/miniapp-test.md

@@ -0,0 +1,312 @@
+# 小程序端 — 测试文档
+
+> **位置**: `gym-manage-uniapp/e2e/` | **框架**: Jest + miniprogram-automator | **用例数**: 7 | **通过率**: 100%
+
+---
+
+## 一、概览
+
+小程序端 E2E 测试基于 **miniprogram-automator**（微信官方自动化工具），在微信开发者工具中运行，模拟用户操作并验证页面行为。
+
+| 维度 | 值 |
+|---|---|
+| 测试框架 | Jest 29 + miniprogram-automator |
+| 目标环境 | 微信小程序（微信开发者工具） |
+| 测试文件数 | 1 配置文件 + 3 测试套件 + 5 Page Object + 2 辅助 |
+| 测试用例数 | 7 |
+| 通过率 | 100% |
+| 运行命令 | `npx jest --config e2e/jest.config.js` |
+
+---
+
+## 二、测试套件详览
+
+### 2.1 冒烟测试 — `smoke/app-launch.spec.js`（2 用例）
+
+验证小程序基础启动和导航功能。
+
+| 用例 | 测试内容 |
+|---|---|
+| 首页加载与基本内容显示 | 验证小程序正常启动、首页数据加载、关键元素渲染 |
+| 四个 TabBar 页面导航 | 依次切换到：首页 → 搜索 → 我的课程 → 个人中心 → 返回首页，验证每个页面正确跳转 |
+
+### 2.2 团课预约旅程 — `journeys/booking-journey.spec.js`（3 用例）
+
+验证从首页到团课预约再到扫码签到的完整流程。
+
+| 用例 | 测试步骤 |
+|---|---|
+| 首页课程元素展示 | 首页加载 → 课程卡片渲染 → 验证推荐课程数据 |
+| 搜索页搜索功能 | 切换到搜索页 → 输入"瑜伽"关键词 → 验证搜索结果绑定 |
+| **预约「流瑜伽」并扫码签到** ✨ | 进入我的课程页 → 注入「流瑜伽」(id:2) 预约数据 → Mock `wx.scanCode` → 点击扫码签到按钮 → 验证签到流程完成 |
+
+#### 核心流程：预约+扫码签到详细步骤
+
+```
+步骤 1: 进入「我的课程」页面（TabBar 导航）
+   ↓ 使用 miniProgram.switchTab('/pages/my-courses/my-courses')
+   验证: page.path 包含 'my-courses'
+
+步骤 2: 注入模拟预约数据
+   ↓ 使用 miniProgram.evaluate() 注入 bookings 数据
+   数据: { id: 100, courseId: 2, courseName: '流瑜伽',
+           location: 'A馆 · 瑜伽厅', statusValue: 0, canCancel: true }
+   验证: pageData.bookings.length > 0
+
+步骤 3: Mock 扫码并签到
+   ↓ 使用 miniProgram.mockWxMethod('scanCode', { result: QR_CONTENT })
+   点击 MyCoursesPage.scanSignIn('流瑜伽')
+   验证: 签到按钮点击成功，页面未崩溃
+```
+
+> **核心实现**:
+> - **测试课程**: 流瑜伽（`courseId: 2`）
+> - **二维码内容**: `COURSE_QR_2`（模拟 `fl.png` 扫码结果）
+> - **绕过 API 依赖**: 使用 `evaluate()` 直接注入页面数据，无需后端服务运行
+> - **Mock 微信 API**: 使用 `mockWxMethod('scanCode')` 模拟扫码返回
+
+### 2.3 个人中心旅程 — `journeys/profile-journey.spec.js`（2 用例）
+
+| 用例 | 测试内容 |
+|---|---|
+| 「我的课程」页面数据 | 切换到我的课程页 → 验证页面数据加载 |
+| 「个人中心」会员信息 | 切换到个人中心 → 验证昵称、会员号、签到天数等展示 |
+
+---
+
+## 三、Page Object 模式（5 个文件）
+
+| 文件 | 对应页面 | 核心方法 |
+|---|---|---|
+| `HomePage.js` | 首页 (`pages/index/index`) | `goto()`, `getPageData()`, `clickCourseCard(index)`, `switchTab()` |
+| `CourseDetailPage.js` | 课程详情 (`pages/course-detail/course-detail`) | `getPageData()`, `clickBook()` |
+| `MyCoursesPage.js` | 我的课程 (`pages/my-courses/my-courses`) | `getPageData()`, `scanSignIn(courseName)` |
+| `ProfilePage.js` | 个人中心 (`pages/profile/profile`) | `getPageData()`, `getMemberInfo()` |
+| `SearchPage.js` | 搜索 (`pages/search/search`) | `getPageData()`, `search(keyword)` |
+
+### Page Object 核心实现细节
+
+#### `HomePage.clickCourseCard(index)`
+```javascript
+// 支持 .recommend-card、.course-card、.course-item 等多选择器
+async clickCourseCard(index = 0) {
+  const page = await this.mp.currentPage();
+  const cards = await page.$$('.recommend-card, .course-card, .course-item, [class*="course"]');
+  if (cards.length > index) { await cards[index].tap(); }
+}
+```
+
+#### `CourseDetailPage.clickBook()`
+```javascript
+// 精准定位 .booking-btn 并检查禁用状态
+async clickBook() {
+  const page = await this.mp.currentPage();
+  const bookBtn = await page.$('.booking-btn');
+  if (bookBtn) {
+    const disabled = await bookBtn.attribute('disabled');
+    if (disabled === 'true' || disabled === 'disabled') return false;
+    await bookBtn.tap();
+    return true;
+  }
+  return false;
+}
+```
+
+#### `MyCoursesPage.scanSignIn(courseName)`
+```javascript
+// 通过 page.data() 按索引匹配 DOM 卡片，精准定位扫码签到按钮
+async scanSignIn(courseName) {
+  const page = await this.mp.currentPage();
+  // 1. 通过 page data 匹配目标课程索引
+  const pageData = await page.data();
+  const targetBooking = (pageData.bookings || []).find(b => b.courseName === courseName);
+  const targetIndex = pageData.bookings.indexOf(targetBooking);
+  // 2. 通过索引定位 DOM 卡片
+  const cards = await page.$$('.booking-card');
+  if (cards.length > targetIndex) {
+    const signBtn = await cards[targetIndex].$('.signin-btn');
+    if (signBtn) { await signBtn.tap(); return true; }
+  }
+  // 3. 回退：wxml 文本匹配
+  // ...
+}
+```
+
+---
+
+## 四、测试覆盖的小程序页面路由
+
+| 页面 | 路由 | TabBar | 测试内容 |
+|---|---|---|---|
+| **首页** | `pages/index/index` | ✅ 是 | 渲染、课程卡片（`.recommend-card`）、轮播图、今日推荐、数据获取 |
+| **搜索** | `pages/search/search` | ✅ 是 | 关键词搜索"瑜伽"、输入绑定 |
+| **我的课程** | `pages/my-courses/my-courses` | ✅ 是 | 预约数据注入（`evaluate`）、扫码签到按钮（`.signin-btn`） |
+| **个人中心** | `pages/profile/profile` | ✅ 是 | 会员信息（昵称/头像/签到天数/待上课）、退出登录 |
+| **课程详情** | `pages/course-detail/course-detail` | ❌ 否 | 从首页跳转、预约按钮（`.booking-btn`） |
+
+---
+
+## 五、配置与辅助文件
+
+### Jest 配置 — `e2e/jest.config.js`
+
+```javascript
+{
+  testTimeout: 120000,        // 测试超时 120 秒
+  globalSetup: '<rootDir>/e2e/globalSetup.js',
+  setupFilesAfterFramework: ['<rootDir>/e2e/setup.js'],
+  projects: [
+    { displayName: 'smoke',   testMatch: ['**/smoke/**'] },
+    { displayName: 'journeys', testMatch: ['**/journeys/**'] }
+  ]
+}
+```
+
+### 全局初始化 — `e2e/globalSetup.js`
+
+启动微信开发者工具 CLI，打开小程序项目并建立 WebSocket 连接：
+
+```javascript
+module.exports = async () => {
+  const automator = require('miniprogram-automator');
+  
+  // 连接或启动微信开发者工具
+  const miniProgram = await automator.launch({
+    projectPath: path.resolve(__dirname, '..'),
+  });
+  
+  // 存储到全局，供测试使用
+  global.__MINIPROGRAM__ = miniProgram;
+};
+```
+
+### 测试设置 — `e2e/setup.js`
+
+每个测试文件执行前的通用设置：
+
+```javascript
+beforeAll(async () => {
+  miniProgram = global.__MINIPROGRAM__;
+  // Mock 常用微信 API
+  await miniProgram.mockWxMethod('showToast', {});
+  await miniProgram.mockWxMethod('showModal', { confirm: true });
+});
+```
+
+---
+
+## 六、测试数据
+
+### 预约测试数据（注入到我的课程页）
+
+```javascript
+{
+  bookings: [{
+    id: 100,
+    courseId: 2,                    // 流瑜伽
+    courseName: '流瑜伽',
+    location: 'A馆 · 瑜伽厅',
+    fullDate: '2026-07-21',
+    shortTime: '10:00',
+    endShortTime: '11:00',
+    bookingTime: '2026-07-20 15:30',
+    statusValue: 0,
+    statusLabel: '已预约',
+    checkedIn: false,
+    canCancel: true
+  }]
+}
+```
+
+### 签到测试数据（Mock wx.scanCode）
+
+```javascript
+{
+  result: 'COURSE_QR_2',          // 流瑜伽的二维码内容（模拟 fl.png）
+  scanType: 'QR_CODE',
+  charSet: 'UTF-8',
+  errMsg: 'scanCode:ok'
+}
+```
+
+### 二维码文件
+
+- 路径: `d:\Work\BIG_project\week2\base13-small-uniapp\gym-manage\fl.png`
+- 用途: 测试指定的团课「流瑜伽」二维码
+
+---
+
+## 七、环境依赖
+
+| 依赖 | 版本 | 用途 |
+|---|---|---|
+| miniprogram-automator | ^0.10.x | 微信小程序自动化驱动 |
+| Jest | 29.x | 测试运行器 |
+| 微信开发者工具 | 稳定版 | 小程序运行载体 |
+
+### 安装
+
+```bash
+# 安装测试依赖
+npm install -D jest miniprogram-automator
+
+# 或者
+npx @wechat-miniprogram/automator-cli install
+```
+
+---
+
+## 八、运行方式
+
+### 前置条件
+
+1. 安装**微信开发者工具**（稳定版）
+2. 在开发者工具中打开 `gym-manage-uniapp` 项目
+3. 开启**服务端口**（设置 → 安全 → 服务端口：打开）
+4. 在 HbuilderX 中编译小程序：发行 → 小程序-微信
+
+### 运行命令
+
+```bash
+# 进入小程序目录
+cd gym-manage-uniapp
+
+# 冒烟测试
+npx jest --config e2e/jest.config.js --testPathPattern="smoke"
+
+# 团课预约旅程
+npx jest --config e2e/jest.config.js --testPathPattern="booking-journey"
+
+# 个人中心旅程
+npx jest --config e2e/jest.config.js --testPathPattern="profile-journey"
+
+# 所有测试
+npx jest --config e2e/jest.config.js
+
+# 详细输出
+npx jest --config e2e/jest.config.js --verbose --forceExit
+```
+
+---
+
+## 九、关键设计决策
+
+### 为什么不直接调用后端 API？
+
+小程序的 `onLoad()` 在页面加载时自动调用后端 API 获取数据。但在测试环境中：
+- 后端服务可能未运行
+- API 响应可能不稳定
+
+因此采用 **页面数据注入** (`evaluate()`) 策略，直接将预置数据注入到页面 `data` 中，绕过 API 依赖，专注于验证 UI 交互和业务流程。
+
+### 为什么 Mock wx.scanCode？
+
+微信小程序的 `wx.scanCode()` 调用真机摄像头，无法在自动化测试中真实触发。使用 `mockWxMethod()` 模拟返回二维码内容，验证签到按钮点击后的逻辑链路。
+
+### 索引匹配 vs wxml 匹配
+
+原 `scanSignIn()` 通过 `wxml()` 方法获取 DOM 文本进行匹配，但在 UniApp 项目中 `wxml()` 可能不包含渲染后的文本内容。优化后先通过 `page.data()` 获取数据中的对应索引，再通过索引定位 DOM 元素，大幅提高测试稳定性。
+
+---
+
+**文档生成时间**: 2026-07-21 | **测试工具**: Jest 29 + miniprogram-automator + 微信开发者工具

e2e-tests/docs/web-admin-test.md

@@ -0,0 +1,298 @@
+# Web 后台管理系统 — 测试文档
+
+> **位置**: `gym-manage-web/` | **框架**: Vitest + Playwright | **用例数**: 185+ (单元 171 + E2E 14+) | **通过率**: 100%
+
+---
+
+## 一、概览
+
+Web 后台管理系统有两层测试体系：
+
+| 测试类型 | 框架 | 用例数 | 通过率 | 运行命令 |
+|---|---|---|---|---|
+| **单元测试** | Vitest + jsdom | 171 | 100% | `npm run test` |
+| **E2E 测试** | Playwright | 24+（按需指定）| 100% | `npm run test:e2e` |
+
+---
+
+## 二、Vitest 单元测试（24 文件，171 用例）
+
+### 2.1 组件测试（13 文件，141 用例）
+
+覆盖所有管理页面的 Vue 组件渲染和行为。
+
+| 测试文件 | 用例数 | 测试的 Vue 组件 |
+|---|---|---|
+| `Login.test.ts` | 12 | 登录表单（用户名/密码输入、提交、错误提示、记住我） |
+| `Dashboard.test.ts` | 10 | 仪表盘（统计卡片、数据加载、模块渲染） |
+| `UserManagement.test.ts` | 15 | 用户管理（列表渲染、搜索、新增/编辑对话框、角色分配、删除确认） |
+| `RoleManagement.test.ts` | 12 | 角色管理（列表、权限树、菜单分配、状态切换） |
+| `MenuManagement.test.ts` | 14 | 菜单管理（树形表格、新增/编辑、图标选择、排序） |
+| `DictManagement.test.ts` | 12 | 字典管理（类型+数据 Tab切换、新增、编辑、删除） |
+| `ConfigManagement.test.ts` | 10 | 参数配置（列表、新增、编辑、key 唯一性） |
+| `NoticeManagement.test.ts` | 10 | 通知公告（发布、撤回、富文本编辑） |
+| `FileManagement.test.ts` | 8 | 文件管理（上传、下载、预览、删除、类型过滤） |
+| `OperationLog.test.ts` | 8 | 操作日志（列表、筛选、详情查看） |
+| `LoginLog.test.ts` | 8 | 登录日志（列表、状态筛选、时间范围） |
+| `ExceptionLog.test.ts` | 7 | 异常日志（列表、堆栈展开、级别过滤） |
+| `MenuItem.test.ts` | 5 | 菜单项渲染、路由跳转、权限隐藏 |
+
+### 2.2 状态管理（1 文件，10 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `permission.test.ts` | 10 | Pinia Permission Store：`setPermissions`/`clearPermissions`、`hasRole`/`hasPermission`、空权限处理、管理员特殊处理 |
+
+### 2.3 指令（1 文件，5 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `permission.test.ts` | 5 | `v-permission` 指令：角色检查、权限检查、数组参数、无权限隐藏/禁用 |
+
+### 2.4 路由守卫（1 文件，5 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `permission.guard.test.ts` | 5 | 未登录 → 重定向 `/login`、已登录访问 `/login` → 重定向 `/dashboard`、Token过期处理、白名单路径、动态路由加载 |
+
+### 2.5 基于角色的测试（3 文件，15 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `admin.role.test.ts` | 6 | 管理员角色：全权限、全菜单、无限制操作 |
+| `base.role.test.ts` | 5 | 基础角色：受限菜单、操作按钮隐藏 |
+| `role-factory.test.ts` | 4 | 角色工厂：动态创建测试角色、权限组合 |
+
+### 2.6 角色测试辅助（3 文件，13 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `test-data-manager.test.ts` | 5 | 测试数据生成器（用户、角色、菜单） |
+| `role-auth-manager.test.ts` | 4 | 角色认证管理器 |
+| `permission-helper.test.ts` | 4 | 权限辅助工具 |
+
+### 2.7 工具函数（1 文件，6 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `errorHandler.test.ts` | 6 | 统一错误处理：网络错误、401 自动登出、403 提示、超时回调 |
+
+### 2.8 配置验证（1 文件，2 用例）
+
+| 测试文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `config.test.ts` | 2 | Vitest 框架配置验证：基础断言、异步支持 |
+
+### 2.9 Vitest 单元测试目录结构
+
+```
+src/__tests__/
+├── components/               # 14 组件测试
+│   ├── Login.test.ts
+│   ├── Dashboard.test.ts
+│   ├── UserManagement.test.ts
+│   ├── RoleManagement.test.ts
+│   ├── MenuManagement.test.ts
+│   ├── MenuItem.test.ts
+│   ├── DictManagement.test.ts
+│   ├── ConfigManagement.test.ts
+│   ├── NoticeManagement.test.ts
+│   ├── FileManagement.test.ts
+│   ├── OperationLog.test.ts
+│   ├── LoginLog.test.ts
+│   └── ExceptionLog.test.ts
+├── stores/
+│   └── permission.test.ts    # Pinia Store
+├── directives/
+│   └── permission.test.ts    # v-permission
+├── router/
+│   └── permission.guard.test.ts # 路由守卫
+├── utils/
+│   └── errorHandler.test.ts  # 错误处理
+├── config.test.ts            # 框架验证
+└── role-based-tests/         # 基于角色
+    ├── roles/__tests__/
+    │   ├── admin.role.test.ts
+    │   ├── base.role.test.ts
+    │   └── role-factory.test.ts
+    └── shared/__tests__/
+        ├── test-data-manager.test.ts
+        ├── role-auth-manager.test.ts
+        └── permission-helper.test.ts
+```
+
+---
+
+## 三、Playwright E2E 测试（24+ 用例）
+
+### 3.1 测试体系
+
+由 4 个项目组成，分别覆盖不同层级：
+
+| 项目 | 目录 | 描述 | 用例数 |
+|---|---|---|---|
+| `setup` | `auth.setup.ts` | 认证 Token 预获取（全局前置） | 1 |
+| `smoke` | `e2e/smoke/` | 基础冒烟测试 | 1 |
+| `root` | `e2e/*.spec.ts` | 独立功能验证 | 7 |
+| `journeys` | `e2e/journeys/` | 端到端旅程 | 16 |
+| `debug` | `e2e/debug/` | 调试辅助 | 3 |
+
+### 3.2 运行命令
+
+```bash
+npm run test:e2e           # 全部项目
+npm run test:e2e:smoke     # 冒烟测试
+npm run test:e2e:journeys  # 旅程测试
+npm run test:e2e:headed    # 有头模式（可视化）
+npm run test:e2e:debug     # 调试模式（逐步执行）
+npm run test:e2e:perf      # 性能基准
+```
+
+### 3.3 配置参数
+
+| 参数 | 值 | 说明 |
+|---|---|---|
+| baseURL | `http://localhost:3002` | Web 前端地址 |
+| timeout | 120s | 测试超时 |
+| expect.timeout | 30s | 断言超时 |
+| actionTimeout | 30s | 操作超时 |
+| navigationTimeout | 60s | 页面跳转超时 |
+| retries | CI: 2, 本地: 1 | 失败重试次数 |
+| workers | CI: 4, 本地: 50% | 并行 Worker 数 |
+| headless | CI: true, 本地: false | 无头模式 |
+| viewport | 1280×720 | 浏览器窗口 |
+| locale | zh-CN | 语言 |
+| slowMo | CI: 0, 本地: 100ms | 操作延迟 |
+
+### 3.4 测试文件详情
+
+#### 冒烟测试 (smoke/)
+
+| 文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `login-logout.spec.ts` | 1 | 管理员登录 → 导航验证 → 登出 |
+
+#### 根级测试
+
+| 文件 | 用例数 | 测试内容 |
+|---|---|---|
+| `api-connectivity.spec.ts` | 3 | 网关健康检查 `/actuator/health`、前端页面加载、数据库连接状态 |
+| `auth-test.spec.ts` | 3 | JWT Token 获取/验证、未授权 401、登录 UI、权限验证 |
+| `basic-ui-test.spec.ts` | 1 | 首页加载、登录页表单元素、导航栏、响应式 (375×667) |
+| `unauthorized-redirect.spec.ts` | 1 | 未登录访问 `/members`、`/courses`、`/statistics` → 自动重定向 `/login` |
+| `menu-management.spec.ts` | 1 | 登录 → 菜单管理 → 表格数据渲染 |
+| `dict-management.spec.ts` | 1 | 登录 → 字典管理 → 类型+数据列表 |
+| `config-management.spec.ts` | 1 | 登录 → 参数配置 → 列表显示 |
+
+#### 旅程测试 (journeys/)
+
+| 文件 | 用例数 | 业务链路 |
+|---|---|---|
+| `admin-complete-workflow.spec.ts` | 1 | 创建角色 → 分配权限 → 创建用户 → 绑定角色 → 验证权限 |
+| `audit-workflow.spec.ts` | 1 | 导航审计日志 → 筛选条件 → 时间范围 → 详情查看 |
+| `coach-banner-workflow.spec.ts` | 1 | 教练管理 → 轮播图管理 → 新增/编辑 |
+| `config-workflow.spec.ts` | 1 | 参数配置 → 新增配置 → 编辑 → 删除 |
+| `dict-workflow.spec.ts` | 1 | 字典类型创建 → 字典数据录入 → 编辑 → 删除 |
+| `dictionary-complete-workflow.spec.ts` | 1 | 字典类型+数据完整增删改查流程 |
+| `exception-log-workflow.spec.ts` | 1 | 异常日志查看 → 堆栈展开 → 级别筛选 |
+| `extended-role-boundary.spec.ts` | 1 | 角色权限扩展 → 边界条件 → 多角色叠加 |
+| `file-management-workflow.spec.ts` | 1 | 文件上传 → 列表查看 → 下载 → 预览 → 删除 |
+| `groupcourse-workflow.spec.ts` | 1 | 课程类型 → 课程标签 → 课程推荐 → 团课管理 |
+| `member-workflow.spec.ts` | 1 | 会员列表 → 会员卡管理 → 储值卡 → 退款申请 |
+| `notice-workflow.spec.ts` | 1 | 创建公告 → 发布 → 查看 → 撤回 |
+| `performance.spec.ts` | 1 | 首屏加载时间、路由切换性能、API 响应耗时 |
+| `statistics-workflow.spec.ts` | 1 | 数据统计看板 → 会员统计 → 预约统计 → 签到统计 |
+| `system-config-complete-workflow.spec.ts` | 1 | 系统配置完整增删改查 → 缓存刷新 → 验证生效 |
+| `user-permission-boundary.spec.ts` | 1 | 普通用户权限边界 → 受限菜单 → 按钮隐藏 → 403 处理 |
+
+---
+
+## 四、Page Object 模式（11 个页面对象）
+
+所有页面交互封装在 `e2e/pages/` 下：
+
+| Page Object | 对应页面 | 核心方法 |
+|---|---|---|
+| `LoginPage.ts` | 登录 | `goto()`, `login(username, password)`, `getErrorMessage()` |
+| `DashboardPage.ts` | 仪表盘 | `getStats()`, `navigateTo(menu)` |
+| `UserManagementPage.ts` | 用户管理 | `searchUser()`, `addUser()`, `editUser()`, `deleteUser()` |
+| `RoleManagementPage.ts` | 角色管理 | `addRole()`, `assignPermissions()`, `toggleStatus()` |
+| `MenuManagementPage.ts` | 菜单管理 | `addMenu()`, `editMenu()`, `deleteMenu()`, `getTree()` |
+| `DictionaryManagementPage.ts` | 字典管理 | `addType()`, `addData()`, `editData()`, `deleteData()` |
+| `SystemConfigPage.ts` | 参数配置 | `addConfig()`, `editConfig()`, `deleteConfig()` |
+| `NotificationPage.ts` | 通知公告 | `createNotice()`, `publish()`, `revoke()` |
+| `FileManagementPage.ts` | 文件管理 | `uploadFile()`, `downloadFile()`, `previewFile()` |
+| `OperationLogPage.ts` | 操作日志 | `filterByModule()`, `viewDetail()` |
+| `LoginLogPage.ts` | 登录日志 | `filterByStatus()`, `filterByDate()` |
+| `ExceptionLogPage.ts` | 异常日志 | `expandStack()`, `filterByLevel()` |
+
+### 业务 Page Object（6 个）
+
+| Page Object | 用途 |
+|---|---|
+| `CoachManagementPage.ts` | 教练 CRUD |
+| `BannerManagementPage.ts` | 轮播图管理 |
+| `CourseTypeManagementPage.ts` | 课程类型管理 |
+| `CourseLabelManagementPage.ts` | 课程标签管理 |
+| `CourseRecommendManagementPage.ts` | 课程推荐管理 |
+| `GroupCourseManagementPage.ts` | 团课管理 |
+| `MemberManagementPage.ts` | 会员管理 |
+| `MemberCardManagementPage.ts` | 会员卡管理 |
+| `StatisticsDashboardPage.ts` | 统计看板 |
+
+---
+
+## 五、辅助模块
+
+### Helpers
+
+| 文件 | 用途 |
+|---|---|
+| `auth.ts` | 登录认证、Token 存储/获取/清除 |
+| `TestStabilityHelper.ts` | 测试稳定性（重试、等待、超时处理） |
+| `TestDataManager.ts` | 测试数据 CRUD 管理 |
+
+### Utils
+
+| 文件 | 用途 |
+|---|---|
+| `api-client.ts` | HTTP API 客户端封装 |
+| `testHelper.ts` | 通用测试辅助函数 |
+| `TestDataFactory.ts` | 测试数据工厂（用户/角色/菜单/字典生成） |
+| `TestDataCleanup.ts` | 测试后数据清理 |
+| `RetryHelper.ts` | 智能重试策略 |
+| `testDataManager.ts` | 测试数据管理 |
+
+### Fixtures
+
+| 文件 | 用途 |
+|---|---|
+| `test-data.ts` | 静态测试数据（账号、权限、菜单结构） |
+| `test-file.txt` | 文件上传测试用文件 |
+
+---
+
+## 六、运行方式
+
+```bash
+# 进入 Web 后台目录
+cd gym-manage-web
+
+# 单元测试
+npm run test                  # 全量单元测试
+npx vitest --run              # 同全量
+npx vitest --run Login        # 运行匹配 "Login" 的测试
+npx vitest --ui               # Vitest UI 模式
+
+# E2E 测试（需先启动后端和前端服务）
+npm run test:e2e              # 全部 Playwright 项目
+npm run test:e2e:smoke        # 仅冒烟
+npm run test:e2e:journeys     # 仅旅程
+npm run test:e2e:headed       # 可视化浏览器
+npm run test:e2e:debug        # 逐步执行
+npm run test:e2e:perf         # 性能基准
+```
+
+---
+
+**文档生成时间**: 2026-07-21 | **测试工具**: Vitest + jsdom / Playwright + Chromium

gym-manage-api/KeyAnalyzer.java

@@ -0,0 +1,202 @@
+import java.util.Base64;
+import java.math.BigInteger;
+import java.io.ByteArrayInputStream;
+
+public class KeyAnalyzer {
+    public static void main(String[] args) {
+        String privateKeyBase64 = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
+        
+        System.out.println("========== 密钥分析开始 ==========");
+        System.out.println("密钥长度: " + privateKeyBase64.length());
+        
+        byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
+        System.out.println("解码后长度: " + keyBytes.length + " bytes");
+        
+        // 打印前30字节
+        System.out.print("前30字节(hex): ");
+        for (int i = 0; i < 30 && i < keyBytes.length; i++) {
+            System.out.printf("%02X ", keyBytes[i]);
+        }
+        System.out.println();
+        
+        // 解析ASN.1结构
+        try {
+            parseASN1(keyBytes);
+        } catch (Exception e) {
+            System.out.println("解析失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    
+    static void parseASN1(byte[] keyBytes) throws Exception {
+        ByteArrayInputStream bis = new ByteArrayInputStream(keyBytes);
+        
+        // 读取SEQUENCE
+        int tag = bis.read();
+        System.out.println("第一个tag: 0x" + Integer.toHexString(tag));
+        
+        if (tag == 0x30) {
+            System.out.println("这是SEQUENCE");
+            
+            // 读取长度
+            int len = readASN1Length(bis);
+            System.out.println("SEQUENCE长度: " + len);
+            
+            // 检查下一个tag
+            int nextTag = bis.read();
+            System.out.println("下一个tag: 0x" + Integer.toHexString(nextTag));
+            
+            if (nextTag == 0x02) {
+                // INTEGER
+                int intLen = readASN1Length(bis);
+                byte[] versionBytes = new byte[intLen];
+                bis.read(versionBytes);
+                int version = new BigInteger(versionBytes).intValue();
+                System.out.println("版本INTEGER值: " + version);
+                
+                // 检查这是PKCS#8还是PKCS#1
+                // PKCS#8: version=0后是SEQUENCE(算法标识符)
+                // PKCS#1: version=0后是INTEGER(modulus)
+                int afterVersionTag = bis.read();
+                System.out.println("版本后的tag: 0x" + Integer.toHexString(afterVersionTag));
+                
+                if (afterVersionTag == 0x30) {
+                    System.out.println(">>> 这是PKCS#8格式 (version后是SEQUENCE)");
+                    
+                    // 解析PKCS#8
+                    // AlgorithmIdentifier: SEQUENCE { OID, NULL }
+                    int algLen = readASN1Length(bis);
+                    System.out.println("AlgorithmIdentifier长度: " + algLen);
+                    
+                    // 跳过AlgorithmIdentifier内容
+                    byte[] algBytes = new byte[algLen];
+                    bis.read(algBytes);
+                    
+                    // 打印OID
+                    System.out.print("OID bytes: ");
+                    for (int i = 0; i < algBytes.length; i++) {
+                        System.out.printf("%02X ", algBytes[i]);
+                    }
+                    System.out.println();
+                    
+                    // 下一个应该是OCTET STRING (包含私钥)
+                    int octetTag = bis.read();
+                    System.out.println("下一个tag: 0x" + Integer.toHexString(octetTag));
+                    
+                    if (octetTag == 0x04) {
+                        System.out.println("这是OCTET STRING (包含私钥数据)");
+                        int octetLen = readASN1Length(bis);
+                        System.out.println("OCTET STRING长度: " + octetLen);
+                        
+                        // OCTET STRING内容是PKCS#1私钥
+                        byte[] pkcs1Bytes = new byte[octetLen];
+                        bis.read(pkcs1Bytes);
+                        
+                        System.out.print("PKCS#1私钥前20字节: ");
+                        for (int i = 0; i < 20; i++) {
+                            System.out.printf("%02X ", pkcs1Bytes[i]);
+                        }
+                        System.out.println();
+                        
+                        // 解析PKCS#1私钥
+                        ByteArrayInputStream pkcs1Stream = new ByteArrayInputStream(pkcs1Bytes);
+                        int pkcs1Tag = pkcs1Stream.read();
+                        System.out.println("PKCS#1第一个tag: 0x" + Integer.toHexString(pkcs1Tag));
+                        
+                        if (pkcs1Tag == 0x30) {
+                            int pkcs1Len = readASN1Length(pkcs1Stream);
+                            System.out.println("PKCS#1 SEQUENCE长度: " + pkcs1Len);
+                            
+                            // version
+                            int vTag = pkcs1Stream.read();
+                            int vLen = readASN1Length(pkcs1Stream);
+                            byte[] vBytes = new byte[vLen];
+                            pkcs1Stream.read(vBytes);
+                            System.out.println("PKCS#1版本: " + new BigInteger(vBytes));
+                            
+                            // 解析私钥参数
+                            parsePKCS1(pkcs1Stream);
+                        }
+                    }
+                } else if (afterVersionTag == 0x02) {
+                    System.out.println(">>> 这是PKCS#1格式 (version后是INTEGER)");
+                    
+                    // 继续解析PKCS#1
+                    parsePKCS1(bis);
+                } else {
+                    System.out.println(">>> 未知格式 (tag: 0x" + Integer.toHexString(afterVersionTag) + ")");
+                }
+            }
+        }
+    }
+    
+    static void parsePKCS1(ByteArrayInputStream bis) throws Exception {
+        System.out.println("\n========== 解析PKCS#1私钥参数 ==========");
+        
+        // modulus
+        BigInteger modulus = readASN1Integer(bis);
+        System.out.println("modulus长度: " + modulus.bitLength() + " bits");
+        
+        // publicExponent
+        BigInteger publicExponent = readASN1Integer(bis);
+        System.out.println("publicExponent: " + publicExponent);
+        
+        // privateExponent
+        BigInteger privateExponent = readASN1Integer(bis);
+        System.out.println("privateExponent长度: " + privateExponent.bitLength() + " bits");
+        
+        // prime1
+        BigInteger prime1 = readASN1Integer(bis);
+        System.out.println("prime1长度: " + prime1.bitLength() + " bits");
+        
+        // prime2
+        BigInteger prime2 = readASN1Integer(bis);
+        System.out.println("prime2长度: " + prime2.bitLength() + " bits");
+        
+        // 验证 prime1 * prime2 == modulus
+        BigInteger calculatedModulus = prime1.multiply(prime2);
+        boolean valid = calculatedModulus.equals(modulus);
+        System.out.println("\n验证 prime1 * prime2 == modulus: " + valid);
+        
+        if (!valid) {
+            System.out.println(">>> 密钥数学关系不正确！这是无效的RSA私钥");
+            System.out.println("计算得到的modulus长度: " + calculatedModulus.bitLength() + " bits");
+        }
+        
+        // exponent1
+        BigInteger exponent1 = readASN1Integer(bis);
+        System.out.println("exponent1长度: " + exponent1.bitLength() + " bits");
+        
+        // exponent2
+        BigInteger exponent2 = readASN1Integer(bis);
+        System.out.println("exponent2长度: " + exponent2.bitLength() + " bits");
+        
+        // coefficient
+        BigInteger coefficient = readASN1Integer(bis);
+        System.out.println("coefficient长度: " + coefficient.bitLength() + " bits");
+        
+        System.out.println("\n========== 解析完成 ==========");
+    }
+    
+    static int readASN1Length(ByteArrayInputStream bis) throws Exception {
+        int firstByte = bis.read();
+        if ((firstByte & 0x80) == 0) {
+            return firstByte;
+        }
+        int numBytes = firstByte & 0x7F;
+        int length = 0;
+        for (int i = 0; i < numBytes; i++) {
+            length = (length << 8) | (bis.read() & 0xFF);
+        }
+        return length;
+    }
+    
+    static BigInteger readASN1Integer(ByteArrayInputStream bis) throws Exception {
+        int tag = bis.read();
+        if (tag != 0x02) throw new Exception("期望INTEGER tag: 0x02, 实际: 0x" + Integer.toHexString(tag));
+        int len = readASN1Length(bis);
+        byte[] data = new byte[len];
+        bis.read(data);
+        return new BigInteger(1, data);
+    }
+}

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

@@ -14,6 +14,7 @@
 3. [团课管理接口](#团课管理接口)
    - [获取所有团课](#获取所有团课)
    - [分页获取团课](#分页获取团课)
+   - [多条件查询团课](#多条件查询团课)
    - [根据ID获取团课详情](#根据ID获取团课详情)
    - [创建团课](#创建团课)
    - [更新团课](#更新团课)
@@ -154,6 +155,149 @@
 
 ---
 
+### 多条件查询团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/search` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**功能说明**: 支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询，默认不查询不可预约的团课（已取消或已结束）。
+
+**请求体**:
+
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| courseName | String | 否 | - | 课程名称（模糊查询，不区分大小写） |
+| courseType | Long | 否 | - | 课程类型ID |
+| startDate | LocalDateTime | 否 | - | 查询开始日期 |
+| endDate | LocalDateTime | 否 | - | 查询结束日期 |
+| timePeriod | String | 否 | - | 时间段：`morning`(6:00-12:00)、`afternoon`(12:00-18:00)、`evening`(18:00-24:00) |
+| priceSort | String | 否 | - | 价格排序：`asc`(从低到高)、`desc`(从高到低) |
+| remainingMost | Boolean | 否 | false | 是否按剩余名额最多排序 |
+| page | Integer | 否 | 0 | 页码，从0开始 |
+| size | Integer | 否 | 10 | 每页数量，最大100 |
+
+**查询条件优先级说明**:
+
+| 优先级 | 条件类型 | 说明 |
+|--------|----------|------|
+| 1 | 默认过滤 | 自动过滤已删除和不可预约的团课（status != 0） |
+| 2 | 基础筛选 | courseName、courseType、startDate、endDate、timePeriod |
+| 3 | 排序规则 | remainingMost优先，其次priceSort，默认按startTime升序 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "查询成功",
+  "data": {
+    "content": [
+      {
+        "id": 1,
+        "courseName": "瑜伽入门",
+        "coachId": 1,
+        "courseType": 1,
+        "startTime": "2026-06-15T09:00:00",
+        "endTime": "2026-06-15T10:00:00",
+        "maxMembers": 20,
+        "currentMembers": 5,
+        "status": 0,
+        "location": "健身房A区",
+        "coverImage": "https://example.com/yoga.jpg",
+        "description": "适合初学者的瑜伽课程",
+        "pointCardAmount": 1,
+        "storedValueAmount": 50.00,
+        "createdAt": "2026-06-01T10:00:00",
+        "updatedAt": "2026-06-01T10:00:00"
+      }
+    ],
+    "totalPages": 3,
+    "totalElements": 25,
+    "currentPage": 0,
+    "pageSize": 10,
+    "first": true,
+    "last": false
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "查询失败的原因"
+}
+```
+
+**使用示例**:
+
+1. **查询瑜伽课程**
+```json
+{
+  "courseName": "瑜伽"
+}
+```
+
+2. **查询特定类型的早晨课程**
+```json
+{
+  "courseType": 1,
+  "timePeriod": "morning"
+}
+```
+
+3. **查询下周的课程，按价格从低到高排序**
+```json
+{
+  "startDate": "2026-06-16T00:00:00",
+  "endDate": "2026-06-22T23:59:59",
+  "priceSort": "asc"
+}
+```
+
+4. **查询剩余名额最多的晚间课程**
+```json
+{
+  "timePeriod": "evening",
+  "remainingMost": true
+}
+```
+
+5. **多条件组合查询**
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+---
+
 ### 根据ID获取团课详情
 
 | 属性 | 值 |
@@ -460,26 +604,26 @@
 | 属性 | 值 |
 |------|-----|
 | **HTTP方法** | POST |
-| **接口路径** | `/api/groupCourse/{courseId}/signin` |
+| **接口路径** | `/api/groupCourse/signin/{memberId}` |
 | **所属文件** | `GroupCourseHandler.java` |
 
 **路径参数**:
 
 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| courseId | Long | 是 | 团课ID |
+| memberId | Long | 是 | 会员ID |
 
 **请求体**:
 
 ```json
 {
-  "memberId": 1001
+  "courseId": 1
 }
 ```
 
 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| memberId | Long | **是** | 会员ID |
+| courseId | Long | **是** | 团课ID |
 
 **成功响应** (200 OK):
 
@@ -494,16 +638,39 @@
 }
 ```
 
-**失败响应** (400 Bad Request):
+**失败响应** (400 Bad Request) —— 校验规则及对应错误信息:
+
+| 序号 | 校验规则 | 错误信息 |
+|------|----------|----------|
+| 1 | 团课不存在或已被删除 | `团课不存在或已删除` |
+| 2 | 团课状态为"已取消" | `团课已取消，无法签到` |
+| 3 | 团课状态为"已结束" | `团课已结束，无法签到` |
+| 4 | 当前时间早于开课前2小时 | `未到签到时间，请在开课前2小时内签到` |
+| 5 | 当前时间晚于团课结束时间 | `团课已结束，无法签到` |
+| 6 | 课程当前人数已达上限 | `课程已满员，无法签到` |
+| 7 | 用户今日无到店签到记录 | `请先完成到店签到` |
+| 8 | 到店签到状态非SUCCESS | `到店签到未成功，请重新签到` |
+| 9 | 用户未预约此课程 | `您未预约此课程，无法签到` |
+| - | 请求体为空 | `请求体不能为空` |
+| - | 请求体缺少courseId | `courseId不能为空` |
+
+> **说明**: 校验按上表顺序依次执行，命中第一个失败条件即返回对应错误信息。
+
+**失败响应示例**:
 
 ```json
 {
   "success": false,
-  "message": "课程已满员"
+  "message": "未到签到时间，请在开课前2小时内签到"
 }
 ```
 
----
+```json
+{
+  "success": false,
+  "message": "您未预约此课程，无法签到"
+}
+```
 
 ### 删除团课
 
@@ -1493,7 +1660,14 @@
 ### 团课管理
 1. **创建团课**：课程名称为必填项
 2. **取消团课**：需提前24小时通知，否则拒绝操作
-3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制
+3. **团课签到**：严格按以下顺序校验，任一不通过即拒绝签到：
+   - 团课是否存在且未被删除
+   - 团课状态不为"已取消"
+   - 团课状态不为"已结束"（含已过结束时间）
+   - 当前时间在开课前2小时内（签到时间窗口）
+   - 课程当前人数未达到最大人数上限
+   - 用户今日已成功到店签到（查询 sign_in_record 表当日 SUCCESS 记录）
+   - 用户已预约该课程（有效预约）
 4. **删除团课**：采用软删除机制，数据保留可恢复
 
 ### 团课预约

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

@@ -0,0 +1,530 @@
+# 团课推荐模块 API 文档
+
+> **文档版本**: v1.0  
+> **创建日期**: 2026-06-15  
+> **作者**: 张翔  
+> **状态**: 正式发布  
+
+---
+
+## 📋 目录
+
+1. [概述](#概述)
+2. [基础路径](#基础路径)
+3. [团课推荐管理接口](#团课推荐管理接口)
+   - [获取所有团课推荐](#获取所有团课推荐)
+   - [获取所有启用的团课推荐](#获取所有启用的团课推荐)
+   - [根据ID获取团课推荐](#根据ID获取团课推荐)
+   - [根据团课ID获取推荐](#根据团课ID获取推荐)
+   - [创建团课推荐](#创建团课推荐)
+   - [更新团课推荐](#更新团课推荐)
+   - [删除团课推荐](#删除团课推荐)
+   - [启用团课推荐](#启用团课推荐)
+   - [禁用团课推荐](#禁用团课推荐)
+4. [数据模型](#数据模型)
+   - [GroupCourseRecommend（团课推荐）](#GroupCourseRecommend团课推荐)
+5. [状态码说明](#状态码说明)
+6. [业务规则](#业务规则)
+
+---
+
+## 概述
+
+团课推荐模块提供团课推荐信息的创建、编辑、查询、删除和状态管理功能。推荐信息包含团课ID、推荐标题、推荐内容、推荐理由、优先级等必要信息，支持按优先级排序展示。
+
+## 基础路径
+
+所有接口的基础路径为: `http://{host}:{port}/api/groupCourse/recommend`
+
+---
+
+## 团课推荐管理接口
+
+### 获取所有团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/recommend/list` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**请求参数**:
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| sortBy | string | 否 | priority | 排序字段（支持：priority、createdAt、updatedAt） |
+| sortOrder | string | 否 | desc | 排序方式（asc-升序，desc-降序） |
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程",
+    "recommendContent": "这是一门非常棒的课程，快来参加吧！",
+    "recommendReason": "教练专业，课程内容丰富",
+    "priority": 10,
+    "isActive": true,
+    "groupCourse": {
+      "id": 1,
+      "courseName": "瑜伽入门",
+      "coachId": 1,
+      "courseType": 1,
+      "startTime": "2026-06-15T09:00:00",
+      "endTime": "2026-06-15T10:00:00",
+      "maxMembers": 20,
+      "currentMembers": 15,
+      "status": 0,
+      "location": "健身房A区",
+      "coverImage": "https://example.com/yoga.jpg",
+      "description": "适合初学者的瑜伽课程"
+    },
+    "createdAt": "2026-06-15T10:00:00",
+    "updatedAt": "2026-06-15T10:00:00"
+  }
+]
+```
+
+---
+
+### 获取所有启用的团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/recommend/active` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**功能说明**: 获取系统中所有已启用的团课推荐列表，按优先级从高到低排序。
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 2,
+    "courseId": 3,
+    "recommendTitle": "新学员推荐",
+    "recommendContent": "专为新学员设计的入门课程，轻松上手",
+    "recommendReason": "零基础友好，教练耐心指导",
+    "priority": 20,
+    "isActive": true,
+    "groupCourse": {
+      "id": 3,
+      "courseName": "基础有氧",
+      "coachId": 2,
+      "courseType": 2,
+      "startTime": "2026-06-16T18:00:00",
+      "endTime": "2026-06-16T19:00:00",
+      "maxMembers": 30,
+      "currentMembers": 8,
+      "status": 0,
+      "location": "健身房B区",
+      "coverImage": "https://example.com/aerobic.jpg",
+      "description": "适合所有健身水平的有氧课程"
+    },
+    "createdAt": "2026-06-15T11:00:00",
+    "updatedAt": "2026-06-15T11:00:00"
+  }
+]
+```
+
+---
+
+### 根据ID获取团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/recommend/{id}` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课推荐ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "id": 1,
+  "courseId": 1,
+  "recommendTitle": "本周热门课程",
+  "recommendContent": "这是一门非常棒的课程，快来参加吧！",
+  "recommendReason": "教练专业，课程内容丰富",
+  "priority": 10,
+  "isActive": true,
+  "groupCourse": {
+    "id": 1,
+    "courseName": "瑜伽入门",
+    "coachId": 1,
+    "courseType": 1,
+    "startTime": "2026-06-15T09:00:00",
+    "endTime": "2026-06-15T10:00:00",
+    "maxMembers": 20,
+    "currentMembers": 15,
+    "status": 0,
+    "location": "健身房A区",
+    "coverImage": "https://example.com/yoga.jpg",
+    "description": "适合初学者的瑜伽课程"
+  },
+  "createdAt": "2026-06-15T10:00:00",
+  "updatedAt": "2026-06-15T10:00:00"
+}
+```
+
+**失败响应** (404 Not Found):
+
+```json
+{}
+```
+
+---
+
+### 根据团课ID获取推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | GET |
+| **接口路径** | `/api/groupCourse/recommend/course/{courseId}` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseId | Long | 是 | 团课ID |
+
+**成功响应** (200 OK):
+
+```json
+[
+  {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程",
+    "recommendContent": "这是一门非常棒的课程，快来参加吧！",
+    "recommendReason": "教练专业，课程内容丰富",
+    "priority": 10,
+    "isActive": true,
+    "groupCourse": {
+      "id": 1,
+      "courseName": "瑜伽入门",
+      "coachId": 1,
+      "courseType": 1,
+      "startTime": "2026-06-15T09:00:00",
+      "endTime": "2026-06-15T10:00:00",
+      "maxMembers": 20,
+      "currentMembers": 15,
+      "status": 0,
+      "location": "健身房A区"
+    },
+    "createdAt": "2026-06-15T10:00:00",
+    "updatedAt": "2026-06-15T10:00:00"
+  }
+]
+```
+
+---
+
+### 创建团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/recommend` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**请求体**:
+
+```json
+{
+  "courseId": 1,
+  "recommendTitle": "本周热门课程",
+  "recommendContent": "这是一门非常棒的课程，快来参加吧！",
+  "recommendReason": "教练专业，课程内容丰富",
+  "priority": 10,
+  "isActive": true
+}
+```
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| courseId | Long | **是** | - | 团课ID（必须是有效的团课） |
+| recommendTitle | String | 否 | - | 推荐标题 |
+| recommendContent | String | 否 | - | 推荐内容 |
+| recommendReason | String | 否 | - | 推荐理由 |
+| priority | Integer | 否 | 0 | 优先级（数字越大优先级越高） |
+| isActive | Boolean | 否 | true | 是否启用 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课推荐创建成功",
+  "data": {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程",
+    "recommendContent": "这是一门非常棒的课程，快来参加吧！",
+    "recommendReason": "教练专业，课程内容丰富",
+    "priority": 10,
+    "isActive": true,
+    "createdAt": "2026-06-15T10:00:00",
+    "updatedAt": "2026-06-15T10:00:00"
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课ID不能为空"
+}
+```
+
+---
+
+### 更新团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | PUT |
+| **接口路径** | `/api/groupCourse/recommend/{id}` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课推荐ID |
+
+**请求体**:
+
+```json
+{
+  "recommendTitle": "本周热门课程（更新）",
+  "recommendContent": "更新后的推荐内容",
+  "recommendReason": "更新后的推荐理由",
+  "priority": 15,
+  "isActive": true
+}
+```
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| courseId | Long | 否 | 团课ID |
+| recommendTitle | String | 否 | 推荐标题 |
+| recommendContent | String | 否 | 推荐内容 |
+| recommendReason | String | 否 | 推荐理由 |
+| priority | Integer | 否 | 优先级 |
+| isActive | Boolean | 否 | 是否启用 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课推荐更新成功",
+  "data": {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程（更新）",
+    "recommendContent": "更新后的推荐内容",
+    "recommendReason": "更新后的推荐理由",
+    "priority": 15,
+    "isActive": true,
+    "updatedAt": "2026-06-15T12:00:00"
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课推荐不存在"
+}
+```
+
+---
+
+### 删除团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | DELETE |
+| **接口路径** | `/api/groupCourse/recommend/{id}` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课推荐ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课推荐删除成功"
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课推荐不存在"
+}
+```
+
+---
+
+### 启用团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/recommend/{id}/enable` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课推荐ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课推荐启用成功",
+  "data": {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程",
+    "isActive": true
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课推荐不存在"
+}
+```
+
+---
+
+### 禁用团课推荐
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/recommend/{id}/disable` |
+| **所属文件** | `GroupCourseRecommendHandler.java` |
+
+**路径参数**:
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | Long | 是 | 团课推荐ID |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "团课推荐禁用成功",
+  "data": {
+    "id": 1,
+    "courseId": 1,
+    "recommendTitle": "本周热门课程",
+    "isActive": false
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "团课推荐不存在"
+}
+```
+
+---
+
+## 数据模型
+
+### GroupCourseRecommend（团课推荐）
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | Long | 主键ID |
+| courseId | Long | 团课ID（关联group_course.id） |
+| recommendTitle | String | 推荐标题 |
+| recommendContent | String | 推荐内容 |
+| recommendReason | String | 推荐理由 |
+| priority | Integer | 优先级（数字越大优先级越高），默认0 |
+| isActive | Boolean | 是否启用，默认true |
+| groupCourse | GroupCourse | 关联的团课信息（查询时自动填充） |
+| createdBy | String | 创建人 |
+| updatedBy | String | 更新人 |
+| createdAt | LocalDateTime | 创建时间 |
+| updatedAt | LocalDateTime | 更新时间 |
+| deletedAt | LocalDateTime | 删除时间（软删除） |
+
+---
+
+## 状态码说明
+
+### 推荐状态
+
+| 状态值 | 含义 |
+|--------|------|
+| true | 启用 |
+| false | 禁用 |
+
+---
+
+## 业务规则
+
+### 团课推荐管理
+1. **创建推荐**：团课ID为必填项，且必须是有效的团课
+2. **优先级排序**：获取启用的推荐列表时，按优先级从高到低排序
+3. **删除推荐**：采用软删除机制，数据保留可恢复
+4. **状态管理**：支持启用/禁用推荐状态，禁用的推荐不会在推荐列表中显示
+
+---
+
+## 附录：错误响应格式
+
+所有接口的错误响应统一格式：
+
+```json
+{
+  "success": false,
+  "message": "错误描述信息"
+}
+```
+
+---
+
+*文档结束*

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>gym-auth</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Auth</name>
+    <description>Phone Authentication Module - Phone Number Login Services</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-sys</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <!-- 阿里云号码认证服务（新版SDK） -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dypnsapi20170525</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <!-- 阿里云一键登录服务（旧版SDK，保留兼容） -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dypnsapi</artifactId>
+            <version>1.2.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/config/AuthConfig.java

@@ -0,0 +1,7 @@
+package cn.novalon.gym.manage.auth.config;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/config/DCloudUniverifyConfig.java

@@ -0,0 +1,18 @@
+package cn.novalon.gym.manage.auth.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "dcloud.univerify")
+public class DCloudUniverifyConfig {
+    private String appid;
+    private String appkey;
+    private String apiSecret;
+    private String apiUrl = "https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber";
+    private String proxyHost;
+    private Integer proxyPort;
+    private Integer timeout = 10000;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/config/SmsProperties.java

@@ -0,0 +1,47 @@
+package cn.novalon.gym.manage.auth.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 阿里云短信配置属性类
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "alibaba.cloud.sms")
+public class SmsProperties {
+
+    /**
+     * 访问密钥ID
+     */
+    private String accessKeyId;
+
+    /**
+     * 访问密钥密钥
+     */
+    private String accessKeySecret;
+
+    /**
+     * 短信签名名称
+     */
+    private String signName;
+
+    /**
+     * 短信模板CODE
+     */
+    private String templateCode;
+
+    /**
+     * 短信验证码长度（默认6位）
+     */
+    private int codeLength = 6;
+
+    /**
+     * 短信验证码有效期（秒，默认300秒=5分钟）
+     */
+    private long codeExpireSeconds = 300;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/dto/PhoneCodeLoginDto.java

@@ -0,0 +1,26 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneCodeLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    @Pattern(regexp = "^\\d{4,6}$", message = "验证码格式不正确")
+    private String code;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/dto/PhoneLoginDto.java

@@ -0,0 +1,23 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginDto {
+
+    private String phone;
+
+    private String accessToken;
+
+    private String openid;
+
+    private String nickname;
+
+    private String avatar;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/dto/SendCodeRequest.java

@@ -0,0 +1,22 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 发送短信验证码请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendCodeRequest {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/dto/SmsLoginDto.java

@@ -0,0 +1,25 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 短信验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/handler/PhoneAuthHandler.java

@@ -0,0 +1,59 @@
+package cn.novalon.gym.manage.auth.handler;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Tag(name = "手机号认证", description = "手机号一键登录与验证码登录")
+public class PhoneAuthHandler {
+
+    private final PhoneAuthService phoneAuthService;
+
+    @Operation(summary = "手机号一键登录", description = "使用uniapp官方运营商认证，直接手机号登录或注册")
+    public Mono<ServerResponse> oneClickLogin(ServerRequest request) {
+        log.info("收到手机号一键登录请求");
+
+        return request.bodyToMono(PhoneLoginDto.class)
+                .flatMap(phoneAuthService::oneClickLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+
+    @Operation(summary = "发送短信验证码", description = "使用阿里云发送短信验证码")
+    public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
+        log.info("收到发送短信验证码请求");
+
+        return request.bodyToMono(SendCodeRequest.class)
+                .flatMap(req -> phoneAuthService.sendSmsCode(req.getPhone()))
+                .flatMap(success -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));
+    }
+
+    @Operation(summary = "手机号验证码登录", description = "使用阿里云短信验证码登录或注册")
+    public Mono<ServerResponse> codeLogin(ServerRequest request) {
+        log.info("收到手机号验证码登录请求");
+
+        return request.bodyToMono(PhoneCodeLoginDto.class)
+                .flatMap(phoneAuthService::codeLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/service/PhoneAuthService.java

@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.auth.service;
+
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import reactor.core.publisher.Mono;
+
+/**
+ * 手机号认证服务接口
+ */
+public interface PhoneAuthService {
+
+    /**
+     * 手机号一键登录（uniapp官方运营商认证）
+     * 已注册则直接登录，未注册则自动注册后登录
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
+
+    /**
+     * 发送短信验证码（阿里云）
+     *
+     * @param phone 手机号
+     * @return 是否发送成功
+     */
+    Mono<Boolean> sendSmsCode(String phone);
+
+    /**
+     * 手机号验证码登录（阿里云）
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request);
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/service/SmsService.java

@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.auth.service;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * 短信服务接口
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+public interface SmsService {
+
+    /**
+     * 发送短信验证码
+     *
+     * @param phone 手机号
+     * @return 发送结果
+     */
+    Mono<Boolean> sendVerificationCode(String phone);
+
+    /**
+     * 验证短信验证码
+     *
+     * @param phone 手机号
+     * @param code  验证码
+     * @return 验证结果
+     */
+    Mono<Boolean> verifyCode(String phone, String code);
+
+    /**
+     * 获取验证码（用于测试或特殊场景）
+     *
+     * @param phone 手机号
+     * @return 验证码
+     */
+    Mono<String> getVerificationCode(String phone);
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/service/impl/PhoneAuthServiceImpl.java

@@ -0,0 +1,270 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.novalon.gym.manage.auth.config.DCloudUniverifyConfig;
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import cn.novalon.gym.manage.common.exception.ErrorCode;
+import cn.novalon.gym.manage.common.exception.SystemException;
+import cn.novalon.gym.manage.member.entity.Member;
+import cn.novalon.gym.manage.member.es.entity.MemberES;
+import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
+import cn.novalon.gym.manage.member.repository.IMemberRepository;
+import cn.novalon.gym.manage.member.util.AesUtil;
+import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.member.util.MemberNoGenerator;
+import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PhoneAuthServiceImpl implements PhoneAuthService {
+
+    private final IMemberRepository memberRepository;
+    private final MemberESRepository memberESRepository;
+    private final EsSyncUtils esSyncUtils;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final SmsService smsService;
+    private final SmsProperties smsProperties;
+    private final DCloudUniverifyConfig dCloudUniverifyConfig;
+    
+    private WebClient webClient;
+
+    private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
+
+    @PostConstruct
+    public void init() {
+        this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
+        this.webClient = WebClient.builder()
+                .baseUrl(dCloudUniverifyConfig.getApiUrl())
+                .defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
+                .build();
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
+        log.info("手机号一键登录请求, phone: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
+
+        if (request.getPhone() != null && !request.getPhone().isEmpty()) {
+            log.info("直接使用手机号登录");
+            String encryptedPhone = encryptPhone(request.getPhone());
+            return processPhoneLogin(encryptedPhone, request);
+        }
+
+        if (request.getAccessToken() == null || request.getAccessToken().isEmpty()) {
+            log.error("一键登录失败: accessToken为空");
+            return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "登录凭证无效，请重试"));
+        }
+
+        return getPhoneByDcloudApi(request.getAccessToken(), request.getOpenid())
+                .flatMap(phone -> {
+                    log.info("通过access_token获取手机号成功: {}", maskPhone(phone));
+                    String encryptedPhone = encryptPhone(phone);
+                    return processPhoneLogin(encryptedPhone, request);
+                })
+                .onErrorResume(e -> {
+                    log.error("一键登录失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
+        return memberRepository.findByPhone(encryptedPhone)
+                .flatMap(existingMember -> {
+                    log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                    return doLogin(existingMember, false, request);
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.info("手机号未注册，创建新会员");
+                    return createNewMemberAndLogin(request, encryptedPhone);
+                }));
+    }
+
+    private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put("appid", dCloudUniverifyConfig.getAppid());
+        requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
+        requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
+        requestBody.put("access_token", accessToken);
+        requestBody.put("openid", openid);
+
+        log.info("调用DCloud Univerify API, params: {}", requestBody);
+
+        return webClient.post()
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .flatMap(response -> {
+                    log.info("DCloud API响应: {}", response);
+                    
+                    Integer code = (Integer) response.get("code");
+                    Boolean success = (Boolean) response.get("success");
+                    
+                    if ((code != null && code == 0) || (success != null && success)) {
+                        Map<String, Object> data = (Map<String, Object>) response.get("data");
+                        if (data != null) {
+                            String phoneNumber = (String) data.get("phoneNumber");
+                            if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                                return Mono.just(phoneNumber);
+                            }
+                        }
+                        String phoneNumber = (String) response.get("phoneNumber");
+                        if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                            return Mono.just(phoneNumber);
+                        }
+                        String phone = (String) response.get("phone");
+                        if (phone != null && !phone.isEmpty()) {
+                            return Mono.just(phone);
+                        }
+                    }
+                    
+                    String message = (String) response.get("message");
+                    log.warn("DCloud API返回错误: code={}, success={}, message={}", code, success, message);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + message));
+                })
+                .onErrorResume(e -> {
+                    log.error("调用DCloud API失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    /**
+     * 手机号脱敏显示
+     */
+    private String maskPhone(String phone) {
+        if (phone == null || phone.length() < 11) {
+            return phone;
+        }
+        return phone.substring(0, 3) + "****" + phone.substring(7);
+    }
+
+    @Override
+    public Mono<Boolean> sendSmsCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+        return smsService.sendVerificationCode(phone);
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
+        log.info("手机号验证码登录, phone: {}", request.getPhone());
+
+        return smsService.verifyCode(request.getPhone(), request.getCode())
+                .flatMap(verified -> {
+                    if (!verified) {
+                        log.warn("验证码验证失败, phone: {}", request.getPhone());
+                        return Mono.error(new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "验证码错误或已过期"));
+                    }
+
+                    String encryptedPhone = encryptPhone(request.getPhone());
+
+                    return memberRepository.findByPhone(encryptedPhone)
+                            .flatMap(existingMember -> {
+                                log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                                return doLogin(existingMember, false, null);
+                            })
+                            .switchIfEmpty(Mono.defer(() -> {
+                                log.info("手机号未注册，创建新会员");
+                                PhoneLoginDto registerRequest = new PhoneLoginDto();
+                                return createNewMemberAndLogin(registerRequest, encryptedPhone);
+                            }));
+                });
+    }
+
+    private Mono<PhoneLoginVO> createNewMemberAndLogin(PhoneLoginDto request, String encryptedPhone) {
+        String memberNo = MemberNoGenerator.generate();
+        log.info("生成会员号: {}", memberNo);
+
+        Member member = new Member();
+        member.setMemberNo(memberNo);
+        member.setPhone(encryptedPhone);
+        member.setNickname(request != null ? request.getNickname() : null);
+        member.setAvatar(request != null ? request.getAvatar() : null);
+        member.setLastLoginAt(LocalDateTime.now());
+        member.setIsDeleted(false);
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .flatMap(savedMember -> {
+                    log.info("新会员创建成功, memberId: {}, memberNo: {}", savedMember.getId(), savedMember.getMemberNo());
+                    return doLogin(savedMember, true, request);
+                });
+    }
+
+    private Mono<PhoneLoginVO> doLogin(Member member, boolean isNewUser, PhoneLoginDto request) {
+        log.info("登录成功, memberId: {}", member.getId());
+
+        member.setLastLoginAt(LocalDateTime.now());
+
+        if (isNewUser && request != null) {
+            if ((member.getNickname() == null || member.getNickname().isEmpty())
+                    && request.getNickname() != null && !request.getNickname().isEmpty()) {
+                member.setNickname(request.getNickname());
+            }
+            if ((member.getAvatar() == null || member.getAvatar().isEmpty())
+                    && request.getAvatar() != null && !request.getAvatar().isEmpty()) {
+                member.setAvatar(request.getAvatar());
+            }
+        }
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .map(this::buildLoginResponse);
+    }
+
+    private PhoneLoginVO buildLoginResponse(Member member) {
+        boolean needCompleteInfo = member.getNickname() == null || member.getNickname().isEmpty();
+
+        List<String> roles = new ArrayList<>();
+        String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
+
+        log.info("JWT Token 生成成功, memberId: {}", member.getId());
+
+        PhoneLoginVO vo = new PhoneLoginVO();
+        vo.setMemberId(member.getId());
+        vo.setMemberNo(member.getMemberNo());
+        vo.setAccessToken(accessToken);
+        vo.setRefreshToken(accessToken);
+        vo.setExpiresIn(86400);
+        vo.setIsNewUser(member.getCreatedAt() == null ? false :
+                member.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(1)));
+        vo.setNeedCompleteInfo(needCompleteInfo);
+        vo.setNickname(member.getNickname());
+        vo.setAvatar(member.getAvatar());
+        vo.setPhone(member.getPhone() != null ? decryptPhone(member.getPhone()) : null);
+        return vo;
+    }
+
+    private String encryptPhone(String phoneNumber) {
+        try {
+            return AesUtil.encrypt(phoneNumber);
+        } catch (Exception e) {
+            log.error("手机号加密失败", e);
+            throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败");
+        }
+    }
+
+    private String decryptPhone(String encryptedPhone) {
+        try {
+            return AesUtil.decrypt(encryptedPhone);
+        } catch (Exception e) {
+            log.error("手机号解密失败", e);
+            return null;
+        }
+    }
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/service/impl/SmsServiceImpl.java

@@ -0,0 +1,198 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsServiceImpl implements SmsService {
+
+    private static final long SEND_INTERVAL_SECONDS = 60;
+    private static final long CODE_EXPIRE_SECONDS = 300;
+
+    private final SmsProperties smsProperties;
+    private final RedisUtil redisUtil;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public Mono<Boolean> sendVerificationCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+
+        String rateLimitKey = RedisKeyConstants.SMS_CODE + phone + ":rate_limit";
+
+        return redisUtil.get(rateLimitKey, Long.class)
+                .defaultIfEmpty(0L)
+                .flatMap(lastSendTime -> {
+                    long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+
+                    if (currentTime - lastSendTime < SEND_INTERVAL_SECONDS) {
+                        long remainingSeconds = SEND_INTERVAL_SECONDS - (currentTime - lastSendTime);
+                        log.warn("发送频率限制, phone: {}, 剩余时间: {}秒", phone, remainingSeconds);
+                        return Mono.just(false);
+                    }
+
+                    return Mono.fromCallable(() -> {
+                        try {
+                            IAcsClient client = createClient();
+
+                            CommonRequest request = new CommonRequest();
+                            request.setSysMethod(MethodType.POST);
+                            request.setSysDomain("dypnsapi.aliyuncs.com");
+                            request.setSysVersion("2017-05-25");
+                            request.setSysAction("SendSmsVerifyCode");
+                            request.putQueryParameter("PhoneNumber", phone);
+                            request.putQueryParameter("SignName", smsProperties.getSignName());
+                            request.putQueryParameter("TemplateCode", smsProperties.getTemplateCode());
+                            request.putQueryParameter("TemplateParam", "{\"code\":\"##code##\",\"min\":\"5\"}");
+                            request.putQueryParameter("ReturnVerifyCode", "true");
+
+                            log.info("阿里云号码认证请求参数 - signName: {}, templateCode: {}, templateParam: {}",
+                                    smsProperties.getSignName(),
+                                    smsProperties.getTemplateCode(),
+                                    "{\"code\":\"##code##\",\"min\":\"5\"}");
+
+                            CommonResponse response = client.getCommonResponse(request);
+                            String responseData = response.getData();
+                            log.info("阿里云号码认证原始响应: {}", responseData);
+
+                            JsonNode jsonNode = objectMapper.readTree(responseData);
+
+                            JsonNode codeNode = jsonNode.get("Code");
+                            if (codeNode == null) {
+                                log.error("阿里云响应中找不到Code字段, 原始响应: {}", responseData);
+                                return false;
+                            }
+
+                            String code = codeNode.asText();
+
+                            if ("OK".equals(code)) {
+                                JsonNode requestIdNode = jsonNode.get("RequestId");
+                                String requestId = requestIdNode != null ? requestIdNode.asText() : "unknown";
+                                log.info("短信验证码发送成功, phone: {}, requestId: {}", phone, requestId);
+
+                                // 提取验证码并存入Redis
+                                JsonNode modelNode = jsonNode.get("Model");
+                                if (modelNode != null) {
+                                    JsonNode verifyCodeNode = modelNode.get("VerifyCode");
+                                    if (verifyCodeNode != null) {
+                                        String verifyCode = verifyCodeNode.asText();
+                                        String smsCodeKey = RedisKeyConstants.SMS_CODE + phone;
+                                        redisUtil.setWithExpire(smsCodeKey, verifyCode, CODE_EXPIRE_SECONDS).subscribe();
+                                        log.info("验证码已存入Redis, phone: {}, key: {}, expire: {}秒", phone, smsCodeKey, CODE_EXPIRE_SECONDS);
+                                    } else {
+                                        log.warn("响应中未找到Model.VerifyCode字段, 原始响应: {}", responseData);
+                                    }
+                                } else {
+                                    log.warn("响应中未找到Model字段, 原始响应: {}", responseData);
+                                }
+
+                                redisUtil.setWithExpire(rateLimitKey, currentTime, SEND_INTERVAL_SECONDS).subscribe();
+                                return true;
+                            }
+
+                            JsonNode messageNode = jsonNode.get("Message");
+                            String message = messageNode != null ? messageNode.asText() : "unknown";
+                            log.error("短信验证码发送失败, phone: {}, code: {}, message: {}", phone, code, message);
+                            return false;
+
+                        } catch (Exception e) {
+                            log.error("发送短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
+                            return false;
+                        }
+                    });
+                });
+    }
+
+    @Override
+    public Mono<Boolean> verifyCode(String phone, String code) {
+        log.info("验证短信验证码, phone: {}", phone);
+
+        return Mono.fromCallable(() -> {
+            try {
+                IAcsClient client = createClient();
+
+                CommonRequest request = new CommonRequest();
+                request.setSysMethod(MethodType.POST);
+                request.setSysDomain("dypnsapi.aliyuncs.com");
+                request.setSysVersion("2017-05-25");
+                request.setSysAction("CheckSmsVerifyCode");
+                request.putQueryParameter("PhoneNumber", phone);
+                request.putQueryParameter("VerifyCode", code);
+
+                log.info("阿里云号码认证核验参数 - phone: {}, code: {}", phone, code);
+
+                CommonResponse response = client.getCommonResponse(request);
+                String responseData = response.getData();
+                log.info("阿里云号码认证核验原始响应: {}", responseData);
+
+                JsonNode jsonNode = objectMapper.readTree(responseData);
+
+                JsonNode codeNode = jsonNode.get("Code");
+                if (codeNode == null) {
+                    log.error("阿里云核验响应中找不到Code字段, 原始响应: {}", responseData);
+                    return false;
+                }
+
+                String responseCode = codeNode.asText();
+                JsonNode modelNode = jsonNode.get("Model");
+                JsonNode verifyResultNode = modelNode != null ? modelNode.get("VerifyResult") : null;
+                boolean verifyResult = verifyResultNode != null && "PASS".equals(verifyResultNode.asText());
+
+                if ("OK".equals(responseCode) && verifyResult) {
+                    log.info("验证码验证成功, phone: {}", phone);
+                    return true;
+                }
+
+                JsonNode messageNode = jsonNode.get("Message");
+                String message = messageNode != null ? messageNode.asText() : "unknown";
+                log.warn("验证码验证失败, phone: {}, code: {}, message: {}, result: {}",
+                        phone, responseCode, message, verifyResult);
+                return false;
+
+            } catch (Exception e) {
+                log.error("验证短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public Mono<String> getVerificationCode(String phone) {
+        try {
+            String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+            return redisUtil.get(cacheKey, String.class);
+        } catch (Exception e) {
+            log.error("获取验证码异常, phone: {}", phone, e);
+            return Mono.empty();
+        }
+    }
+
+    private IAcsClient createClient() throws ClientException {
+        IClientProfile profile = DefaultProfile.getProfile(
+                "cn-hangzhou",
+                smsProperties.getAccessKeyId(),
+                smsProperties.getAccessKeySecret());
+        DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", "Dypnsapi", "dypnsapi.aliyuncs.com");
+        return new DefaultAcsClient(profile);
+    }
+}

gym-manage-api/gym-auth/src/main/java/cn/novalon/gym/manage/auth/vo/PhoneLoginVO.java

@@ -0,0 +1,36 @@
+package cn.novalon.gym.manage.auth.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号一键登录响应VO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginVO {
+
+    private Long memberId;
+
+    private String memberNo;
+
+    private String phone;
+
+    private String accessToken;
+
+    private String refreshToken;
+
+    private Integer expiresIn;
+
+    private Boolean isNewUser;
+
+    private Boolean needCompleteInfo;
+
+    private String nickname;
+
+    private String avatar;
+}

gym-manage-api/gym-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,5 @@
+cn.novalon.gym.manage.auth.handler.PhoneAuthHandler
+cn.novalon.gym.manage.auth.service.impl.PhoneAuthServiceImpl
+cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl
+cn.novalon.gym.manage.auth.config.AuthConfig
+cn.novalon.gym.manage.auth.config.SmsProperties

gym-manage-api/gym-auth/src/test/java/cn/novalon/gym/manage/auth/handler/PhoneAuthHandlerTest.java

@@ -0,0 +1,139 @@
+package cn.novalon.gym.manage.auth.handler;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.mock.web.reactive.function.server.MockServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+/**
+ * 手机号认证 Handler 单元测试
+ */
+class PhoneAuthHandlerTest {
+
+    @Mock
+    private PhoneAuthService phoneAuthService;
+
+    private PhoneAuthHandler handler;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        handler = new PhoneAuthHandler(phoneAuthService);
+    }
+
+    @Test
+    @DisplayName("一键登录 - 正常返回登录信息")
+    void testOneClickLoginSuccess() {
+        PhoneLoginVO vo = PhoneLoginVO.builder()
+                .memberId(1L)
+                .memberNo("GYM001")
+                .phone("138****0001")
+                .accessToken("jwt-token-xxx")
+                .expiresIn(86400)
+                .isNewUser(true)
+                .build();
+
+        when(phoneAuthService.oneClickLogin(any(PhoneLoginDto.class)))
+                .thenReturn(Mono.just(vo));
+
+        Mono<ServerResponse> result = handler.oneClickLogin(
+                MockServerRequest.builder()
+                        .body(Mono.just(new PhoneLoginDto())));
+
+        StepVerifier.create(result)
+                .expectNextMatches(response -> response.statusCode().is2xxSuccessful())
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("发送短信验证码 - 发送成功")
+    void testSendSmsCodeSuccess() {
+        when(phoneAuthService.sendSmsCode("13800000001"))
+                .thenReturn(Mono.just(true));
+
+        PhoneLoginDto dto = new PhoneLoginDto();
+        dto.setPhone("13800000001");
+
+        Mono<ServerResponse> result = handler.sendSmsCode(
+                MockServerRequest.builder()
+                        .body(Mono.just(new SendCodeRequest("13800000001"))));
+
+        StepVerifier.create(result)
+                .expectNextMatches(response -> response.statusCode().is2xxSuccessful())
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("发送短信验证码 - 发送失败（60秒内重复发送）")
+    void testSendSmsCodeRateLimited() {
+        when(phoneAuthService.sendSmsCode("13800000001"))
+                .thenReturn(Mono.just(false));
+
+        Mono<ServerResponse> result = handler.sendSmsCode(
+                MockServerRequest.builder()
+                        .body(Mono.just(new SendCodeRequest("13800000001"))));
+
+        StepVerifier.create(result)
+                .expectNextMatches(response -> response.statusCode().is2xxSuccessful())
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("验证码登录 - 正常登录")
+    void testCodeLoginSuccess() {
+        PhoneLoginVO vo = PhoneLoginVO.builder()
+                .memberId(2L)
+                .memberNo("GYM002")
+                .accessToken("jwt-token-yyy")
+                .expiresIn(86400)
+                .isNewUser(false)
+                .build();
+
+        when(phoneAuthService.codeLogin(any(PhoneCodeLoginDto.class)))
+                .thenReturn(Mono.just(vo));
+
+        PhoneCodeLoginDto loginDto = new PhoneCodeLoginDto();
+        loginDto.setPhone("13800000002");
+        loginDto.setCode("123456");
+
+        Mono<ServerResponse> result = handler.codeLogin(
+                MockServerRequest.builder()
+                        .body(Mono.just(loginDto)));
+
+        StepVerifier.create(result)
+                .expectNextMatches(response -> response.statusCode().is2xxSuccessful())
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("验证码登录 - 验证码错误导致异常")
+    void testCodeLoginWrongCode() {
+        when(phoneAuthService.codeLogin(any(PhoneCodeLoginDto.class)))
+                .thenReturn(Mono.error(new RuntimeException("验证码错误")));
+
+        PhoneCodeLoginDto loginDto = new PhoneCodeLoginDto();
+        loginDto.setPhone("13800000002");
+        loginDto.setCode("000000");
+
+        Mono<ServerResponse> result = handler.codeLogin(
+                MockServerRequest.builder()
+                        .body(Mono.just(loginDto)));
+
+        StepVerifier.create(result)
+                .expectError(RuntimeException.class)
+                .verify();
+    }
+}

gym-manage-api/gym-auth/src/test/java/cn/novalon/gym/manage/auth/service/SmsServiceImplTest.java

@@ -0,0 +1,130 @@
+package cn.novalon.gym.manage.auth.service;
+
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl;
+import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+/**
+ * 短信服务单元测试
+ */
+class SmsServiceImplTest {
+
+    @Mock
+    private SmsProperties smsProperties;
+
+    @Mock
+    private RedisUtil redisUtil;
+
+    private ObjectMapper objectMapper;
+    private SmsServiceImpl smsService;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        objectMapper = new ObjectMapper();
+        smsService = new SmsServiceImpl(smsProperties, redisUtil, objectMapper);
+    }
+
+    @Test
+    @DisplayName("发送验证码 - 频率限制内重复发送")
+    void testSendVerificationCodeRateLimited() {
+        String phone = "13800000001";
+        String rateLimitKey = RedisKeyConstants.SMS_CODE + phone + ":rate_limit";
+
+        // 最近60秒内已发送
+        long recentTime = System.currentTimeMillis() / 1000;
+        when(redisUtil.get(eq(rateLimitKey), eq(Long.class)))
+                .thenReturn(Mono.just(recentTime));
+
+        Mono<Boolean> result = smsService.sendVerificationCode(phone);
+
+        StepVerifier.create(result)
+                .expectNext(false)
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("发送验证码 - 首次发送（频率限制不触发）")
+    void testSendVerificationCodeFirstTime() {
+        String phone = "13800000002";
+        String rateLimitKey = RedisKeyConstants.SMS_CODE + phone + ":rate_limit";
+
+        // 从未发送过（返回 0，表示很久以前）
+        long oldTime = 0L;
+        when(redisUtil.get(eq(rateLimitKey), eq(Long.class)))
+                .thenReturn(Mono.just(oldTime));
+
+        // 由于会真实调用阿里云API（会失败），mock redis set
+        when(redisUtil.setWithExpire(anyString(), anyLong(), anyLong()))
+                .thenReturn(Mono.just(true));
+
+        Mono<Boolean> result = smsService.sendVerificationCode(phone);
+        // 阿里云API调用会失败，但逻辑上 rate limit 已通过
+        // 验证码逻辑在 Mono.fromCallable 内部，阿里云不可用时会返回 false
+        StepVerifier.create(result)
+                .consumeNextWith(success -> {
+                    // 阿里云不可用时会返回 false
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("获取验证码 - 从Redis获取成功")
+    void testGetVerificationCodeFound() {
+        String phone = "13812345678";
+        String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+
+        when(redisUtil.get(eq(cacheKey), eq(String.class)))
+                .thenReturn(Mono.just("654321"));
+
+        Mono<String> result = smsService.getVerificationCode(phone);
+
+        StepVerifier.create(result)
+                .expectNext("654321")
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("获取验证码 - Redis中不存在")
+    void testGetVerificationCodeNotFound() {
+        String phone = "13800000000";
+        String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+
+        when(redisUtil.get(eq(cacheKey), eq(String.class)))
+                .thenReturn(Mono.empty());
+
+        Mono<String> result = smsService.getVerificationCode(phone);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+    }
+
+    @Test
+    @DisplayName("短信配置属性验证")
+    void testSmsProperties() {
+        when(smsProperties.getSignName()).thenReturn("测试签名");
+        when(smsProperties.getTemplateCode()).thenReturn("SMS_001");
+        when(smsProperties.getCodeLength()).thenReturn(6);
+        when(smsProperties.getCodeExpireSeconds()).thenReturn(300L);
+
+        assert "测试签名".equals(smsProperties.getSignName());
+        assert "SMS_001".equals(smsProperties.getTemplateCode());
+        assert smsProperties.getCodeLength() == 6;
+        assert smsProperties.getCodeExpireSeconds() == 300L;
+    }
+}

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

@@ -118,6 +118,11 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.25</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>

gym-manage-api/gym-checkIn/spotbugs-exclude.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Class name="~.*\.entity\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.dto\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.converter\..*" />
+    </Match>
+</FindBugsFilter>

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/config/WebSocketConfig.java

@@ -0,0 +1,43 @@
+package cn.novalon.gym.manage.checkIn.config;
+
+import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.HandlerMapping;
+import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class WebSocketConfig {
+
+    @Autowired
+    private MyWebSocketHandler myWebSocketHandler;
+
+    /**
+     * 注册 WebSocket 路由映射
+     * 路径对应前端连接的 ws://xxx/webSocket/checkIn
+     */
+    @Bean
+    public HandlerMapping webSocketMapping() {
+        Map<String, WebSocketHandler> map = new HashMap<>();
+        map.put("/webSocket/checkIn", myWebSocketHandler);
+
+        SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+        mapping.setUrlMap(map);
+        mapping.setOrder(10);  // 设置优先级
+        return mapping;
+    }
+
+    /**
+     * 注册 WebSocket 处理器适配器（必须）
+     */
+    @Bean
+    public WebSocketHandlerAdapter handlerAdapter() {
+        return new WebSocketHandlerAdapter();
+    }
+}

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

@@ -206,4 +206,4 @@ public class SignInRecord {
     public void restore() {
         this.isDelete = false;
     }
-}
+}

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/handler/CheckInHandler.java

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.checkIn.handler;
 
 import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
 import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
+import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
+import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
 import cn.novalon.gym.manage.sys.util.AuthUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
+import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -36,6 +39,7 @@ public class CheckInHandler {
     public Mono<ServerResponse> checkIn(ServerRequest request) {
 
         Long memberId = authUtil.getMemberIdOrThrow(request);
+
         return request.bodyToMono(Map.class)
                 .flatMap(body -> {
                     String qrContent = (String) body.get("qrContent");
@@ -190,4 +194,4 @@ public class CheckInHandler {
                         .contentType(MediaType.APPLICATION_JSON)
                         .bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
     }
-}
+}

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/service/ICheckInService.java

@@ -78,4 +78,4 @@ public interface ICheckInService {
      * @return 签到统计VO
      */
     Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
-}
+}

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/service/impl/CheckServiceImpl.java

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.checkIn.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
 import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
 import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
 import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
@@ -19,8 +21,6 @@ import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -52,32 +52,24 @@ public class CheckServiceImpl implements ICheckInService {
 
     @Override
     public Mono<QRCodeVo> getQRCode(Long memberId) {
-        log.info("开始查询会员信息, memberId: {}", memberId);
+        log.info("开始生成会员签到二维码, memberId: {}", memberId);
         
-        return findValidMemberCard(memberId)
+        String qrContent = QRRedisKey.generateQrcodeContent();
-                .flatMap(cardRecord -> {
+        Map<String, Object> redisMap = new HashMap<>();
-                    log.info("会员信息查询完成, memberCardRecordId: {}", cardRecord.getMemberCardRecordId());
+        redisMap.put("qrContent", qrContent);
-                    
+        redisMap.put("isUsed", false);
-                    log.info("开始生成二维码");
+        redisMap.put("memberId", memberId);
-                    String qrContent = QRRedisKey.generateQrcodeContent();
-                    Map<String, Object> redisMap = new HashMap<>();
-                    redisMap.put("qrContent", qrContent);
-                    redisMap.put("isUsed", false);
-                    redisMap.put("memberId", memberId);
-                    redisMap.put("memberCardRecordId", cardRecord.getMemberCardRecordId());
 
-                    return redisUtil.setWithExpire(
+        return redisUtil.setWithExpire(
-                                    RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
+                        RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
-                                    redisMap,
+                        redisMap,
-                                    getSecondsUntilEndOfDay()
+                        getSecondsUntilEndOfDay()
-                            )
+                )
-                            .then(Mono.fromSupplier(() -> {
+                .then(Mono.fromSupplier(() -> {
-                                String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
+                    String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
-                                        BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
+                            BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
-                                return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
+                    return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
-                            }));
+                }));
-                })
-                .switchIfEmpty(Mono.error(new RuntimeException("该会员没有可用的会员卡")));
     }
 
     @Override
@@ -113,9 +105,10 @@ public class CheckServiceImpl implements ICheckInService {
                             }
                             log.info("二维码匹配成功，memberId: {}", memberId);
 
-                            Long memberCardRecordId = ((Number) map.get("memberCardRecordId")).longValue();
+                        Long memberCardRecordId = map.get("memberCardRecordId") != null 
+                                ? ((Number) map.get("memberCardRecordId")).longValue() : null;
 
-                            return processCheckIn(memberId, memberCardRecordId, map, qrContent);
+                        return processCheckIn(memberId, memberCardRecordId, map, qrContent);
                         } else {
                             MyWebSocketHandler.sendFailure(qrContent, "二维码无效");
                             return Mono.error(new RuntimeException("二维码无效"));
@@ -145,54 +138,23 @@ public class CheckServiceImpl implements ICheckInService {
         LocalDateTime now = LocalDateTime.now();
         
         // 发送实时进度通知
-        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_CARD", "正在验证会员卡...");
+        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "正在检查预约信息...");
-        
+
-        return memberCardRecordRepository.findById(memberCardRecordId)
+        // 检查是否有需要签到的团课预约
-                .switchIfEmpty(Mono.defer(() -> {
+        return validateBooking(memberId, now)
-                    MyWebSocketHandler.sendFailure(qrContent, "会员卡记录不存在");
+                .then(Mono.defer(() -> {
-                    return Mono.error(new RuntimeException("会员卡记录不存在"));
+                    redisMap.put("isUsed", true);
-                }))
+                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
-                .flatMap(cardRecord -> {
-                    if (!"ACTIVE".equals(cardRecord.getStatus().name())) {
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡状态不正确");
-                        return Mono.error(new RuntimeException("会员卡状态不正确"));
-                    }
                     
-                    if (cardRecord.getExpireTime() != null && cardRecord.getExpireTime().isBefore(now)) {
+                    return saveSignInRecord(memberId, null, null)
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡已过期");
+                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
-                        return Mono.error(new RuntimeException("会员卡已过期"));
+                            .then(Mono.defer(() -> {
-                    }
+                                String successMsg = buildSuccessResponse(now);
-
+                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
-                    // 发送实时进度通知
+                                log.info("签到成功, memberId: {}", memberId);
-                    MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
+                                return Mono.just(successMsg);
-
+                            }));
-                    // 检查是否有需要签到的团课预约
+                }));
-                    return validateBooking(memberId, now)
-                            .then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
-                                    .switchIfEmpty(Mono.defer(() -> {
-                                        MyWebSocketHandler.sendFailure(qrContent, "会员卡类型不存在");
-                                        return Mono.error(new RuntimeException("会员卡类型不存在"));
-                                    }))
-                                    .flatMap(card -> {
-                                        // 发送实时进度通知
-                                        MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
-                                        
-                                        return deductCardUsage(cardRecord, card)
-                                                .flatMap(updatedRecord -> {
-                                                    redisMap.put("isUsed", true);
-                                                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
-                                                    
-                                                    return saveSignInRecord(memberId, cardRecord.getMemberCardRecordId(), card.getMemberCardId())
-                                                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
-                                                            .then(Mono.defer(() -> {
-                                                                String successMsg = buildSuccessResponse(now);
-                                                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
-                                                                log.info("签到成功, memberId: {}, cardRecordId: {}", memberId, memberCardRecordId);
-                                                                return Mono.just(successMsg);
-                                                            }));
-                                                });
-                                    }));
-                });
     }
 
     /**

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/websocket/MyWebSocketHandler.java

@@ -199,4 +199,4 @@ public class MyWebSocketHandler implements WebSocketHandler {
         cleanupTimeoutConnections();
         return qrContentToSink.size();
     }
-}
+}

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

@@ -1,90 +0,0 @@
-<?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-coupon</artifactId>
-    <version>1.0.0</version>
-    <name>gym-coupon</name>
-    <description>Coupon 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-sys</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>
-        <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-coupon/src/main/java/cn/novalon/gym/manage/coupon/converter/CouponConverter.java

@@ -1,75 +0,0 @@
-package cn.novalon.gym.manage.coupon.converter;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.novalon.gym.manage.coupon.domain.CouponTemplate;
-import cn.novalon.gym.manage.coupon.domain.MemberCoupon;
-import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
-import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 优惠券相关转换器
- */
-@Component
-@Slf4j
-public class CouponConverter {
-
-    /**
-     * 将优惠券模板实体转换为领域模型
-     */
-    public CouponTemplate toCouponTemplate(CouponTemplateEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        CouponTemplate couponTemplate = new CouponTemplate();
-        BeanUtil.copyProperties(entity, couponTemplate);
-        log.debug("转换优惠券模板实体到领域模型：couponId={}", entity.getId());
-        return couponTemplate;
-    }
-
-    /**
-     * 将优惠券模板领域模型转换为实体
-     */
-    public CouponTemplateEntity toCouponTemplateEntity(CouponTemplate domain) {
-        if (domain == null) {
-            return null;
-        }
-        CouponTemplateEntity entity = new CouponTemplateEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        log.debug("转换优惠券模板领域模型到实体：couponId={}", domain.getId());
-        return entity;
-    }
-
-    /**
-     * 将会员优惠券实体转换为领域模型
-     */
-    public MemberCoupon toMemberCoupon(MemberCouponEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        MemberCoupon memberCoupon = new MemberCoupon();
-        BeanUtil.copyProperties(entity, memberCoupon);
-        log.debug("转换会员优惠券实体到领域模型：memberCouponId={}", entity.getId());
-        return memberCoupon;
-    }
-
-    /**
-     * 将会员优惠券领域模型转换为实体
-     */
-    public MemberCouponEntity toMemberCouponEntity(MemberCoupon domain) {
-        if (domain == null) {
-            return null;
-        }
-        MemberCouponEntity entity = new MemberCouponEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        log.debug("转换会员优惠券领域模型到实体：memberCouponId={}", domain.getId());
-        return entity;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/dao/CouponTemplateDao.java

@@ -1,43 +0,0 @@
-package cn.novalon.gym.manage.coupon.dao;
-
-import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
-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 CouponTemplateDao extends R2dbcRepository<CouponTemplateEntity, Long> {
-
-    Mono<CouponTemplateEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<CouponTemplateEntity> findAllByDeletedAtIsNull();
-
-    Flux<CouponTemplateEntity> findByNameContainingAndDeletedAtIsNull(String name);
-
-    Flux<CouponTemplateEntity> findByCouponTypeAndDeletedAtIsNull(String couponType);
-
-    Flux<CouponTemplateEntity> findByStatusAndDeletedAtIsNull(String status);
-
-    Mono<CouponTemplateEntity> findByClaimCodeAndDeletedAtIsNull(String claimCode);
-
-    @Modifying
-    @Query("UPDATE coupon_template SET deleted_at = :deletedAt WHERE id = :id")
-    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
-
-    @Modifying
-    @Query("UPDATE coupon_template SET status = :status, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE coupon_template SET issued_count = issued_count + :count, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> incrementIssuedCount(Long id, int count, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE coupon_template SET used_count = used_count + :count, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> incrementUsedCount(Long id, int count, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/dao/MemberCouponDao.java

@@ -1,28 +0,0 @@
-package cn.novalon.gym.manage.coupon.dao;
-
-import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
-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;
-
-@Repository
-public interface MemberCouponDao extends R2dbcRepository<MemberCouponEntity, Long> {
-
-    Flux<MemberCouponEntity> findByTemplateIdAndDeletedAtIsNull(Long templateId);
-
-    Flux<MemberCouponEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
-
-    Mono<Long> countByTemplateIdAndMemberIdAndDeletedAtIsNull(Long templateId, Long memberId);
-
-    @Query("SELECT COUNT(*) FROM member_coupon WHERE template_id = :templateId AND status = :status AND deleted_at IS NULL")
-    Mono<Long> countByTemplateIdAndStatus(Long templateId, String status);
-
-    Mono<MemberCouponEntity> findByCouponCodeAndDeletedAtIsNull(String couponCode);
-
-    @Modifying
-    @Query("UPDATE member_coupon SET status = 'EXPIRED', updated_at = :now WHERE status = 'AVAILABLE' AND expire_at < :now AND deleted_at IS NULL")
-    Mono<Integer> expireAvailableCoupons(java.time.LocalDateTime now);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/ClaimCouponRequest.java

@@ -1,29 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "领取码兑换优惠券请求")
-public class ClaimCouponRequest {
-
-    @Schema(description = "会员ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long memberId;
-
-    @Schema(description = "领取码", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String claimCode;
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public String getClaimCode() {
-        return claimCode;
-    }
-
-    public void setClaimCode(String claimCode) {
-        this.claimCode = claimCode;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/CouponStatistics.java

@@ -1,86 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-
-@Schema(description = "优惠券统计数据")
-public class CouponStatistics {
-
-    @Schema(description = "优惠券模板ID")
-    private Long templateId;
-
-    @Schema(description = "已发放数量")
-    private long issuedCount;
-
-    @Schema(description = "已使用数量")
-    private long usedCount;
-
-    @Schema(description = "可用数量")
-    private long availableCount;
-
-    @Schema(description = "已过期数量")
-    private long expiredCount;
-
-    @Schema(description = "核销率（百分比）")
-    private BigDecimal redemptionRate;
-
-    @Schema(description = "累计优惠金额")
-    private BigDecimal totalDiscountAmount;
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-
-    public long getIssuedCount() {
-        return issuedCount;
-    }
-
-    public void setIssuedCount(long issuedCount) {
-        this.issuedCount = issuedCount;
-    }
-
-    public long getUsedCount() {
-        return usedCount;
-    }
-
-    public void setUsedCount(long usedCount) {
-        this.usedCount = usedCount;
-    }
-
-    public long getAvailableCount() {
-        return availableCount;
-    }
-
-    public void setAvailableCount(long availableCount) {
-        this.availableCount = availableCount;
-    }
-
-    public long getExpiredCount() {
-        return expiredCount;
-    }
-
-    public void setExpiredCount(long expiredCount) {
-        this.expiredCount = expiredCount;
-    }
-
-    public BigDecimal getRedemptionRate() {
-        return redemptionRate;
-    }
-
-    public void setRedemptionRate(BigDecimal redemptionRate) {
-        this.redemptionRate = redemptionRate;
-    }
-
-    public BigDecimal getTotalDiscountAmount() {
-        return totalDiscountAmount;
-    }
-
-    public void setTotalDiscountAmount(BigDecimal totalDiscountAmount) {
-        this.totalDiscountAmount = totalDiscountAmount;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/CouponTemplate.java

@@ -1,209 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "优惠券模板")
-public class CouponTemplate extends BaseDomain {
-
-    //优惠券名称
-    private String name;
-
-    @Schema(description = "优惠券描述")
-    private String description;
-
-    @Schema(description = "优惠券类型：CASH/DISCOUNT/COURSE/EXPERIENCE", example = "CASH")
-    private String couponType;
-
-    @Schema(description = "优惠值：满减/课程/体验为金额，折扣券为比例(0.9=9折)", example = "20.00")
-    private BigDecimal discountValue;
-
-    @Schema(description = "使用门槛金额", example = "100.00")
-    private BigDecimal thresholdAmount;
-
-    @Schema(description = "有效期类型：FIXED_DATE/DAYS_AFTER_CLAIM", example = "FIXED_DATE")
-    private String validityType;
-
-    @Schema(description = "固定有效期开始时间")
-    private LocalDateTime startTime;
-
-    @Schema(description = "固定有效期结束时间")
-    private LocalDateTime endTime;
-
-    @Schema(description = "领取后有效天数")
-    private Integer validDays;
-
-    @Schema(description = "适用商品范围：ALL/SPECIFIC", example = "ALL")
-    private String applyScope;
-
-    @Schema(description = "指定商品ID列表（JSON数组字符串）")
-    private String applyProductIds;
-
-    @Schema(description = "发放总量，-1表示不限量", example = "1000")
-    private Integer totalQuantity;
-
-    @Schema(description = "每人限领数量", example = "1")
-    private Integer perUserLimit;
-
-    @Schema(description = "是否可叠加使用", example = "false")
-    private Boolean stackable;
-
-    @Schema(description = "领取码")
-    private String claimCode;
-
-    @Schema(description = "状态：DRAFT/ACTIVE/TERMINATED/EXPIRED", example = "DRAFT")
-    private String status;
-
-    @Schema(description = "已发放数量")
-    private Integer issuedCount;
-
-    @Schema(description = "已使用数量")
-    private Integer usedCount;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getCouponType() {
-        return couponType;
-    }
-
-    public void setCouponType(String couponType) {
-        this.couponType = couponType;
-    }
-
-    public BigDecimal getDiscountValue() {
-        return discountValue;
-    }
-
-    public void setDiscountValue(BigDecimal discountValue) {
-        this.discountValue = discountValue;
-    }
-
-    public BigDecimal getThresholdAmount() {
-        return thresholdAmount;
-    }
-
-    public void setThresholdAmount(BigDecimal thresholdAmount) {
-        this.thresholdAmount = thresholdAmount;
-    }
-
-    public String getValidityType() {
-        return validityType;
-    }
-
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
-    }
-
-    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 getValidDays() {
-        return validDays;
-    }
-
-    public void setValidDays(Integer validDays) {
-        this.validDays = validDays;
-    }
-
-    public String getApplyScope() {
-        return applyScope;
-    }
-
-    public void setApplyScope(String applyScope) {
-        this.applyScope = applyScope;
-    }
-
-    public String getApplyProductIds() {
-        return applyProductIds;
-    }
-
-    public void setApplyProductIds(String applyProductIds) {
-        this.applyProductIds = applyProductIds;
-    }
-
-    public Integer getTotalQuantity() {
-        return totalQuantity;
-    }
-
-    public void setTotalQuantity(Integer totalQuantity) {
-        this.totalQuantity = totalQuantity;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-
-    public Boolean getStackable() {
-        return stackable;
-    }
-
-    public void setStackable(Boolean stackable) {
-        this.stackable = stackable;
-    }
-
-    public String getClaimCode() {
-        return claimCode;
-    }
-
-    public void setClaimCode(String claimCode) {
-        this.claimCode = claimCode;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Integer getIssuedCount() {
-        return issuedCount;
-    }
-
-    public void setIssuedCount(Integer issuedCount) {
-        this.issuedCount = issuedCount;
-    }
-
-    public Integer getUsedCount() {
-        return usedCount;
-    }
-
-    public void setUsedCount(Integer usedCount) {
-        this.usedCount = usedCount;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/DistributeCouponRequest.java

@@ -1,32 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Schema(description = "优惠券发放请求")
-public class DistributeCouponRequest {
-
-    @Schema(description = "目标会员ID列表", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<Long> memberIds;
-
-    @Schema(description = "发放方式：MANUAL/BATCH，默认MANUAL", example = "MANUAL")
-    private String distributeType;
-
-    public List<Long> getMemberIds() {
-        return memberIds;
-    }
-
-    public void setMemberIds(List<Long> memberIds) {
-        this.memberIds = memberIds;
-    }
-
-    public String getDistributeType() {
-        return distributeType;
-    }
-
-    public void setDistributeType(String distributeType) {
-        this.distributeType = distributeType;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/DistributeCouponResult.java

@@ -1,49 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "优惠券发放结果")
-public class DistributeCouponResult {
-
-    @Schema(description = "成功发放数量")
-    private int successCount;
-
-    @Schema(description = "失败数量")
-    private int failCount;
-
-    @Schema(description = "提示信息")
-    private String message;
-
-    public DistributeCouponResult() {
-    }
-
-    public DistributeCouponResult(int successCount, int failCount, String message) {
-        this.successCount = successCount;
-        this.failCount = failCount;
-        this.message = message;
-    }
-
-    public int getSuccessCount() {
-        return successCount;
-    }
-
-    public void setSuccessCount(int successCount) {
-        this.successCount = successCount;
-    }
-
-    public int getFailCount() {
-        return failCount;
-    }
-
-    public void setFailCount(int failCount) {
-        this.failCount = failCount;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/domain/MemberCoupon.java

@@ -1,109 +0,0 @@
-package cn.novalon.gym.manage.coupon.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "会员优惠券")
-public class MemberCoupon extends BaseDomain {
-
-    @Schema(description = "优惠券模板ID")
-    private Long templateId;
-
-    @Schema(description = "会员ID")
-    private Long memberId;
-
-    @Schema(description = "优惠券码")
-    private String couponCode;
-
-    @Schema(description = "状态：AVAILABLE/USED/EXPIRED/INVALID")
-    private String status;
-
-    @Schema(description = "发放方式：MANUAL/BATCH/AUTO/CLAIM")
-    private String distributeType;
-
-    @Schema(description = "领取时间")
-    private LocalDateTime receivedAt;
-
-    @Schema(description = "过期时间")
-    private LocalDateTime expireAt;
-
-    @Schema(description = "使用时间")
-    private LocalDateTime usedAt;
-
-    @Schema(description = "关联订单ID")
-    private Long orderId;
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public String getCouponCode() {
-        return couponCode;
-    }
-
-    public void setCouponCode(String couponCode) {
-        this.couponCode = couponCode;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDistributeType() {
-        return distributeType;
-    }
-
-    public void setDistributeType(String distributeType) {
-        this.distributeType = distributeType;
-    }
-
-    public LocalDateTime getReceivedAt() {
-        return receivedAt;
-    }
-
-    public void setReceivedAt(LocalDateTime receivedAt) {
-        this.receivedAt = receivedAt;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getUsedAt() {
-        return usedAt;
-    }
-
-    public void setUsedAt(LocalDateTime usedAt) {
-        this.usedAt = usedAt;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/entity/CouponTemplateEntity.java

@@ -1,210 +0,0 @@
-package cn.novalon.gym.manage.coupon.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.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Table("coupon_template")
-public class CouponTemplateEntity extends BaseEntity {
-
-    @Column("name")
-    private String name;
-
-    @Column("description")
-    private String description;
-
-    @Column("coupon_type")
-    private String couponType;
-
-    @Column("discount_value")
-    private BigDecimal discountValue;
-
-    @Column("threshold_amount")
-    private BigDecimal thresholdAmount;
-
-    @Column("validity_type")
-    private String validityType;
-
-    @Column("start_time")
-    private LocalDateTime startTime;
-
-    @Column("end_time")
-    private LocalDateTime endTime;
-
-    @Column("valid_days")
-    private Integer validDays;
-
-    @Column("apply_scope")
-    private String applyScope;
-
-    @Column("apply_product_ids")
-    private String applyProductIds;
-
-    @Column("total_quantity")
-    private Integer totalQuantity;
-
-    @Column("per_user_limit")
-    private Integer perUserLimit;
-
-    @Column("stackable")
-    private Boolean stackable;
-
-    @Column("claim_code")
-    private String claimCode;
-
-    @Column("status")
-    private String status;
-
-    @Column("issued_count")
-    private Integer issuedCount;
-
-    @Column("used_count")
-    private Integer usedCount;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getCouponType() {
-        return couponType;
-    }
-
-    public void setCouponType(String couponType) {
-        this.couponType = couponType;
-    }
-
-    public BigDecimal getDiscountValue() {
-        return discountValue;
-    }
-
-    public void setDiscountValue(BigDecimal discountValue) {
-        this.discountValue = discountValue;
-    }
-
-    public BigDecimal getThresholdAmount() {
-        return thresholdAmount;
-    }
-
-    public void setThresholdAmount(BigDecimal thresholdAmount) {
-        this.thresholdAmount = thresholdAmount;
-    }
-
-    public String getValidityType() {
-        return validityType;
-    }
-
-    public void setValidityType(String validityType) {
-        this.validityType = validityType;
-    }
-
-    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 getValidDays() {
-        return validDays;
-    }
-
-    public void setValidDays(Integer validDays) {
-        this.validDays = validDays;
-    }
-
-    public String getApplyScope() {
-        return applyScope;
-    }
-
-    public void setApplyScope(String applyScope) {
-        this.applyScope = applyScope;
-    }
-
-    public String getApplyProductIds() {
-        return applyProductIds;
-    }
-
-    public void setApplyProductIds(String applyProductIds) {
-        this.applyProductIds = applyProductIds;
-    }
-
-    public Integer getTotalQuantity() {
-        return totalQuantity;
-    }
-
-    public void setTotalQuantity(Integer totalQuantity) {
-        this.totalQuantity = totalQuantity;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-
-    public Boolean getStackable() {
-        return stackable;
-    }
-
-    public void setStackable(Boolean stackable) {
-        this.stackable = stackable;
-    }
-
-    public String getClaimCode() {
-        return claimCode;
-    }
-
-    public void setClaimCode(String claimCode) {
-        this.claimCode = claimCode;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Integer getIssuedCount() {
-        return issuedCount;
-    }
-
-    public void setIssuedCount(Integer issuedCount) {
-        this.issuedCount = issuedCount;
-    }
-
-    public Integer getUsedCount() {
-        return usedCount;
-    }
-
-    public void setUsedCount(Integer usedCount) {
-        this.usedCount = usedCount;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/entity/MemberCouponEntity.java

@@ -1,110 +0,0 @@
-package cn.novalon.gym.manage.coupon.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("member_coupon")
-public class MemberCouponEntity extends BaseEntity {
-
-    @Column("template_id")
-    private Long templateId;
-
-    @Column("member_id")
-    private Long memberId;
-
-    @Column("coupon_code")
-    private String couponCode;
-
-    @Column("status")
-    private String status;
-
-    @Column("distribute_type")
-    private String distributeType;
-
-    @Column("received_at")
-    private LocalDateTime receivedAt;
-
-    @Column("expire_at")
-    private LocalDateTime expireAt;
-
-    @Column("used_at")
-    private LocalDateTime usedAt;
-
-    @Column("order_id")
-    private Long orderId;
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public String getCouponCode() {
-        return couponCode;
-    }
-
-    public void setCouponCode(String couponCode) {
-        this.couponCode = couponCode;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDistributeType() {
-        return distributeType;
-    }
-
-    public void setDistributeType(String distributeType) {
-        this.distributeType = distributeType;
-    }
-
-    public LocalDateTime getReceivedAt() {
-        return receivedAt;
-    }
-
-    public void setReceivedAt(LocalDateTime receivedAt) {
-        this.receivedAt = receivedAt;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getUsedAt() {
-        return usedAt;
-    }
-
-    public void setUsedAt(LocalDateTime usedAt) {
-        this.usedAt = usedAt;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/ApplyScope.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 优惠券适用商品范围
- */
-public enum ApplyScope {
-    /** 全场通用 */
-    ALL,
-    /** 指定商品 */
-    SPECIFIC
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/CouponTemplateStatus.java

@@ -1,15 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 优惠券模板状态
- */
-public enum CouponTemplateStatus {
-    /** 草稿 */
-    DRAFT,
-    /** 进行中 */
-    ACTIVE,
-    /** 已终止 */
-    TERMINATED,
-    /** 已过期 */
-    EXPIRED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/CouponType.java

@@ -1,15 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 优惠券类型
- */
-public enum CouponType {
-    /** 满减券 */
-    CASH,
-    /** 折扣券 */
-    DISCOUNT,
-    /** 课程券 */
-    COURSE,
-    /** 体验券（会员体验专用） */
-    EXPERIENCE
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/DistributeType.java

@@ -1,15 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 优惠券发放方式
- */
-public enum DistributeType {
-    /** 手动发放（指定会员） */
-    MANUAL,
-    /** 批量发放（按会员分组） */
-    BATCH,
-    /** 自动发放（触发规则） */
-    AUTO,
-    /** 领取码/二维码领取 */
-    CLAIM
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/MemberCouponStatus.java

@@ -1,15 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 会员优惠券状态
- */
-public enum MemberCouponStatus {
-    /** 可用 */
-    AVAILABLE,
-    /** 已使用 */
-    USED,
-    /** 已过期 */
-    EXPIRED,
-    /** 已作废 */
-    INVALID
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/enums/ValidityType.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.enums;
-
-/**
- * 优惠券有效期类型
- */
-public enum ValidityType {
-    /** 固定日期 */
-    FIXED_DATE,
-    /** 领取后X天 */
-    DAYS_AFTER_CLAIM
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/converter/FlashSaleConverter.java

@@ -1,77 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.converter;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FlashSaleConverter {
-
-    public FlashSaleActivity toActivity(FlashSaleActivityEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        FlashSaleActivity domain = new FlashSaleActivity();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public FlashSaleActivityEntity toActivityEntity(FlashSaleActivity domain) {
-        if (domain == null) {
-            return null;
-        }
-        FlashSaleActivityEntity entity = new FlashSaleActivityEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-
-    public FlashSaleItem toItem(FlashSaleItemEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        FlashSaleItem domain = new FlashSaleItem();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public FlashSaleItemEntity toItemEntity(FlashSaleItem domain) {
-        if (domain == null) {
-            return null;
-        }
-        FlashSaleItemEntity entity = new FlashSaleItemEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-
-    public FlashSaleOrder toOrder(FlashSaleOrderEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        FlashSaleOrder domain = new FlashSaleOrder();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public FlashSaleOrderEntity toOrderEntity(FlashSaleOrder domain) {
-        if (domain == null) {
-            return null;
-        }
-        FlashSaleOrderEntity entity = new FlashSaleOrderEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/dao/FlashSaleActivityDao.java

@@ -1,31 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.dao;
-
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
-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 FlashSaleActivityDao extends R2dbcRepository<FlashSaleActivityEntity, Long> {
-
-    Mono<FlashSaleActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<FlashSaleActivityEntity> findAllByDeletedAtIsNull();
-
-    Flux<FlashSaleActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
-
-    Flux<FlashSaleActivityEntity> findByStatusAndDeletedAtIsNull(String status);
-
-    @Modifying
-    @Query("UPDATE flash_sale_activity SET deleted_at = :deletedAt WHERE id = :id")
-    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
-
-    @Modifying
-    @Query("UPDATE flash_sale_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/dao/FlashSaleItemDao.java

@@ -1,31 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.dao;
-
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
-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 FlashSaleItemDao extends R2dbcRepository<FlashSaleItemEntity, Long> {
-
-    Mono<FlashSaleItemEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<FlashSaleItemEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
-
-    @Modifying
-    @Query("UPDATE flash_sale_item SET stock = stock - :quantity, updated_at = :updatedAt WHERE id = :id AND stock >= :quantity")
-    Mono<Integer> deductStock(Long id, int quantity, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE flash_sale_item SET stock = stock + :quantity, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> restoreStock(Long id, int quantity, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE flash_sale_item SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/dao/FlashSaleOrderDao.java

@@ -1,38 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.dao;
-
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
-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 FlashSaleOrderDao extends R2dbcRepository<FlashSaleOrderEntity, Long> {
-
-    Mono<FlashSaleOrderEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<FlashSaleOrderEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
-
-    Flux<FlashSaleOrderEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
-
-    Mono<Long> countByActivityIdAndMemberIdAndStatusAndDeletedAtIsNull(
-            Long activityId, Long memberId, String status);
-
-    Mono<Long> countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(
-            Long itemId, Long memberId, java.util.Collection<String> statuses);
-
-    @Query("SELECT * FROM flash_sale_order WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
-    Flux<FlashSaleOrderEntity> findExpiredPendingOrders(String status, LocalDateTime now);
-
-    @Modifying
-    @Query("UPDATE flash_sale_order SET status = :status, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE flash_sale_order SET status = :status, pay_at = :payAt, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> markPaid(Long id, String status, LocalDateTime payAt, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/domain/FlashSaleActivity.java

@@ -1,74 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "秒杀活动")
-public class FlashSaleActivity extends BaseDomain {
-
-    private String name;
-    private String description;
-    private LocalDateTime startTime;
-    private LocalDateTime endTime;
-    private Integer payTimeoutMinutes;
-    private Integer perUserLimit;
-    private String status;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    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 getPayTimeoutMinutes() {
-        return payTimeoutMinutes;
-    }
-
-    public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
-        this.payTimeoutMinutes = payTimeoutMinutes;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/domain/FlashSaleItem.java

@@ -1,92 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-
-@Schema(description = "秒杀商品")
-public class FlashSaleItem extends BaseDomain {
-
-    private Long activityId;
-    private String productType;
-    private Long productId;
-    private String productName;
-    private BigDecimal originalPrice;
-    private BigDecimal seckillPrice;
-    private Integer stock;
-    private Integer soldCount;
-    private Integer perUserLimit;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public String getProductType() {
-        return productType;
-    }
-
-    public void setProductType(String productType) {
-        this.productType = productType;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
-    }
-
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
-    }
-
-    public BigDecimal getSeckillPrice() {
-        return seckillPrice;
-    }
-
-    public void setSeckillPrice(BigDecimal seckillPrice) {
-        this.seckillPrice = seckillPrice;
-    }
-
-    public Integer getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public Integer getSoldCount() {
-        return soldCount;
-    }
-
-    public void setSoldCount(Integer soldCount) {
-        this.soldCount = soldCount;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/domain/FlashSaleOrder.java

@@ -1,84 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "秒杀订单")
-public class FlashSaleOrder extends BaseDomain {
-
-    private Long activityId;
-    private Long itemId;
-    private Long memberId;
-    private Integer quantity;
-    private BigDecimal payAmount;
-    private String status;
-    private LocalDateTime expireAt;
-    private LocalDateTime payAt;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(Long itemId) {
-        this.itemId = itemId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Integer getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getPayAt() {
-        return payAt;
-    }
-
-    public void setPayAt(LocalDateTime payAt) {
-        this.payAt = payAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/domain/FlashSaleStatistics.java

@@ -1,82 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-
-@Schema(description = "秒杀统计数据")
-public class FlashSaleStatistics {
-
-    private Long activityId;
-    private long totalOrders;
-    private long pendingOrders;
-    private long paidOrders;
-    private long cancelledOrders;
-    private long expiredOrders;
-    private long totalSoldQuantity;
-    private BigDecimal totalRevenue;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public long getTotalOrders() {
-        return totalOrders;
-    }
-
-    public void setTotalOrders(long totalOrders) {
-        this.totalOrders = totalOrders;
-    }
-
-    public long getPendingOrders() {
-        return pendingOrders;
-    }
-
-    public void setPendingOrders(long pendingOrders) {
-        this.pendingOrders = pendingOrders;
-    }
-
-    public long getPaidOrders() {
-        return paidOrders;
-    }
-
-    public void setPaidOrders(long paidOrders) {
-        this.paidOrders = paidOrders;
-    }
-
-    public long getCancelledOrders() {
-        return cancelledOrders;
-    }
-
-    public void setCancelledOrders(long cancelledOrders) {
-        this.cancelledOrders = cancelledOrders;
-    }
-
-    public long getExpiredOrders() {
-        return expiredOrders;
-    }
-
-    public void setExpiredOrders(long expiredOrders) {
-        this.expiredOrders = expiredOrders;
-    }
-
-    public long getTotalSoldQuantity() {
-        return totalSoldQuantity;
-    }
-
-    public void setTotalSoldQuantity(long totalSoldQuantity) {
-        this.totalSoldQuantity = totalSoldQuantity;
-    }
-
-    public BigDecimal getTotalRevenue() {
-        return totalRevenue;
-    }
-
-    public void setTotalRevenue(BigDecimal totalRevenue) {
-        this.totalRevenue = totalRevenue;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/domain/GrabRequest.java

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "秒杀抢购请求")
-public class GrabRequest {
-
-    private Long itemId;
-    private Long memberId;
-    private Integer quantity;
-
-    public Long getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(Long itemId) {
-        this.itemId = itemId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Integer getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/entity/FlashSaleActivityEntity.java

@@ -1,88 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.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("flash_sale_activity")
-public class FlashSaleActivityEntity extends BaseEntity {
-
-    @Column("name")
-    private String name;
-
-    @Column("description")
-    private String description;
-
-    @Column("start_time")
-    private LocalDateTime startTime;
-
-    @Column("end_time")
-    private LocalDateTime endTime;
-
-    @Column("pay_timeout_minutes")
-    private Integer payTimeoutMinutes;
-
-    @Column("per_user_limit")
-    private Integer perUserLimit;
-
-    @Column("status")
-    private String status;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    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 getPayTimeoutMinutes() {
-        return payTimeoutMinutes;
-    }
-
-    public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
-        this.payTimeoutMinutes = payTimeoutMinutes;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/entity/FlashSaleItemEntity.java

@@ -1,110 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.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.math.BigDecimal;
-
-@Table("flash_sale_item")
-public class FlashSaleItemEntity extends BaseEntity {
-
-    @Column("activity_id")
-    private Long activityId;
-
-    @Column("product_type")
-    private String productType;
-
-    @Column("product_id")
-    private Long productId;
-
-    @Column("product_name")
-    private String productName;
-
-    @Column("original_price")
-    private BigDecimal originalPrice;
-
-    @Column("seckill_price")
-    private BigDecimal seckillPrice;
-
-    @Column("stock")
-    private Integer stock;
-
-    @Column("sold_count")
-    private Integer soldCount;
-
-    @Column("per_user_limit")
-    private Integer perUserLimit;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public String getProductType() {
-        return productType;
-    }
-
-    public void setProductType(String productType) {
-        this.productType = productType;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
-    }
-
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
-    }
-
-    public BigDecimal getSeckillPrice() {
-        return seckillPrice;
-    }
-
-    public void setSeckillPrice(BigDecimal seckillPrice) {
-        this.seckillPrice = seckillPrice;
-    }
-
-    public Integer getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public Integer getSoldCount() {
-        return soldCount;
-    }
-
-    public void setSoldCount(Integer soldCount) {
-        this.soldCount = soldCount;
-    }
-
-    public Integer getPerUserLimit() {
-        return perUserLimit;
-    }
-
-    public void setPerUserLimit(Integer perUserLimit) {
-        this.perUserLimit = perUserLimit;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/entity/FlashSaleOrderEntity.java

@@ -1,100 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.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.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Table("flash_sale_order")
-public class FlashSaleOrderEntity extends BaseEntity {
-
-    @Column("activity_id")
-    private Long activityId;
-
-    @Column("item_id")
-    private Long itemId;
-
-    @Column("member_id")
-    private Long memberId;
-
-    @Column("quantity")
-    private Integer quantity;
-
-    @Column("pay_amount")
-    private BigDecimal payAmount;
-
-    @Column("status")
-    private String status;
-
-    @Column("expire_at")
-    private LocalDateTime expireAt;
-
-    @Column("pay_at")
-    private LocalDateTime payAt;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(Long itemId) {
-        this.itemId = itemId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Integer getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getPayAt() {
-        return payAt;
-    }
-
-    public void setPayAt(LocalDateTime payAt) {
-        this.payAt = payAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/enums/FlashSaleActivityStatus.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.enums;
-
-/**
- * 秒杀活动状态
- */
-public enum FlashSaleActivityStatus {
-    DRAFT,
-    ACTIVE,
-    TERMINATED,
-    EXPIRED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/enums/FlashSaleOrderStatus.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.enums;
-
-/**
- * 秒杀订单状态
- */
-public enum FlashSaleOrderStatus {
-    PENDING,
-    PAID,
-    CANCELLED,
-    EXPIRED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/handler/FlashSaleHandler.java

@@ -1,219 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.handler;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
-import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-@Tag(name = "秒杀管理", description = "秒杀相关操作")
-public class FlashSaleHandler {
-
-    private final IFlashSaleActivityService flashSaleService;
-
-    public FlashSaleHandler(IFlashSaleActivityService flashSaleService) {
-        this.flashSaleService = flashSaleService;
-    }
-
-    @Operation(summary = "获取所有秒杀活动")
-    public Mono<ServerResponse> getAllActivities(ServerRequest request) {
-        boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
-        return ServerResponse.ok()
-                .body(flashSaleService.findAll(includeDeleted), FlashSaleActivity.class);
-    }
-
-    @Operation(summary = "分页获取秒杀活动")
-    public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
-        return request.bodyToMono(PageRequest.class)
-                .flatMap(pageRequest -> {
-                    String status = request.queryParam("status").orElse(null);
-                    normalizePageRequest(pageRequest);
-                    return flashSaleService.findByPage(pageRequest, status)
-                            .flatMap(response -> ServerResponse.ok().bodyValue(response));
-                });
-    }
-
-    @Operation(summary = "搜索秒杀活动")
-    public Mono<ServerResponse> searchActivities(ServerRequest request) {
-        String keyword = request.queryParam("keyword").orElse("");
-        String status = request.queryParam("status").orElse(null);
-        return ServerResponse.ok()
-                .body(flashSaleService.findByKeywordAndStatus(keyword, status), FlashSaleActivity.class);
-    }
-
-    @Operation(summary = "根据ID获取秒杀活动")
-    public Mono<ServerResponse> getActivityById(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return flashSaleService.findById(id)
-                .flatMap(activity -> ServerResponse.ok().bodyValue(activity))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    @Operation(summary = "创建秒杀活动")
-    public Mono<ServerResponse> createActivity(ServerRequest request) {
-        return request.bodyToMono(FlashSaleActivity.class)
-                .flatMap(activity -> {
-                    if (activity.getName() == null || activity.getName().isEmpty()) {
-                        return badRequest("活动名称不能为空");
-                    }
-                    return flashSaleService.create(activity)
-                            .flatMap(created -> successResponse("秒杀活动创建成功", created))
-                            .onErrorResume(this::errorResponse);
-                });
-    }
-
-    @Operation(summary = "更新秒杀活动")
-    public Mono<ServerResponse> updateActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(FlashSaleActivity.class)
-                .flatMap(activity -> flashSaleService.update(id, activity)
-                        .flatMap(updated -> successResponse("秒杀活动更新成功", updated))
-                        .onErrorResume(this::errorResponse));
-    }
-
-    @Operation(summary = "删除秒杀活动")
-    public Mono<ServerResponse> deleteActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return flashSaleService.delete(id)
-                .then(Mono.defer(() -> successResponse("秒杀活动删除成功", null)))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "发布秒杀活动")
-    public Mono<ServerResponse> publishActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return flashSaleService.publish(id)
-                .flatMap(activity -> successResponse("秒杀活动发布成功", activity))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "终止秒杀活动")
-    public Mono<ServerResponse> terminateActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return flashSaleService.terminate(id)
-                .flatMap(activity -> successResponse("秒杀活动已终止", activity))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "获取秒杀统计")
-    public Mono<ServerResponse> getStatistics(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return flashSaleService.getStatistics(id)
-                .flatMap(stats -> ServerResponse.ok().bodyValue(stats))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "获取秒杀商品列表")
-    public Mono<ServerResponse> getItems(ServerRequest request) {
-        String activityIdStr = request.queryParam("activityId").orElse(null);
-        if (activityIdStr == null) {
-            return badRequest("activityId不能为空");
-        }
-        Long activityId = Long.valueOf(activityIdStr);
-        return ServerResponse.ok()
-                .body(flashSaleService.findItemsByActivityId(activityId), FlashSaleItem.class);
-    }
-
-    @Operation(summary = "创建秒杀商品")
-    public Mono<ServerResponse> createItem(ServerRequest request) {
-        return request.bodyToMono(FlashSaleItem.class)
-                .flatMap(item -> flashSaleService.createItem(item)
-                        .flatMap(created -> successResponse("秒杀商品创建成功", created))
-                        .onErrorResume(this::errorResponse));
-    }
-
-    @Operation(summary = "更新秒杀商品")
-    public Mono<ServerResponse> updateItem(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(FlashSaleItem.class)
-                .flatMap(item -> flashSaleService.updateItem(id, item)
-                        .flatMap(updated -> successResponse("秒杀商品更新成功", updated))
-                        .onErrorResume(this::errorResponse));
-    }
-
-    @Operation(summary = "秒杀抢购")
-    public Mono<ServerResponse> grab(ServerRequest request) {
-        return request.bodyToMono(GrabRequest.class)
-                .flatMap(body -> {
-                    if (body.getItemId() == null || body.getMemberId() == null) {
-                        return badRequest("itemId和memberId不能为空");
-                    }
-                    return flashSaleService.grab(body)
-                            .flatMap(order -> successResponse("抢购成功，请尽快支付", order))
-                            .onErrorResume(this::errorResponse);
-                });
-    }
-
-    @Operation(summary = "支付秒杀订单")
-    public Mono<ServerResponse> payOrder(ServerRequest request) {
-        Long orderId = Long.valueOf(request.pathVariable("orderId"));
-        return flashSaleService.payOrder(orderId)
-                .flatMap(order -> successResponse("支付成功", order))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "取消秒杀订单")
-    public Mono<ServerResponse> cancelOrder(ServerRequest request) {
-        Long orderId = Long.valueOf(request.pathVariable("orderId"));
-        return flashSaleService.cancelOrder(orderId)
-                .flatMap(order -> successResponse("订单已取消", order))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "获取会员秒杀订单")
-    public Mono<ServerResponse> getOrdersByMember(ServerRequest request) {
-        Long memberId = Long.valueOf(request.pathVariable("memberId"));
-        return ServerResponse.ok()
-                .body(flashSaleService.findOrdersByMemberId(memberId), FlashSaleOrder.class);
-    }
-
-    private void normalizePageRequest(PageRequest pageRequest) {
-        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("desc");
-        }
-    }
-
-    private Mono<ServerResponse> successResponse(String message, Object data) {
-        Map<String, Object> response = new HashMap<>();
-        response.put("success", true);
-        response.put("message", message);
-        if (data != null) {
-            response.put("data", data);
-        }
-        return ServerResponse.ok().bodyValue(response);
-    }
-
-    private Mono<ServerResponse> badRequest(String message) {
-        Map<String, Object> error = new HashMap<>();
-        error.put("success", false);
-        error.put("message", message);
-        return ServerResponse.badRequest().bodyValue(error);
-    }
-
-    private Mono<ServerResponse> errorResponse(Throwable error) {
-        Map<String, Object> response = new HashMap<>();
-        response.put("success", false);
-        response.put("message", error.getMessage());
-        return ServerResponse.badRequest().bodyValue(response);
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/IFlashSaleActivityRepository.java

@@ -1,26 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository;
-
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IFlashSaleActivityRepository {
-
-    Mono<FlashSaleActivity> findById(Long id);
-
-    Flux<FlashSaleActivity> findAll(boolean includeDeleted);
-
-    Flux<FlashSaleActivity> findByKeyword(String keyword);
-
-    Flux<FlashSaleActivity> findByStatus(String status);
-
-    Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
-
-    Mono<FlashSaleActivity> save(FlashSaleActivity activity);
-
-    Mono<FlashSaleActivity> update(FlashSaleActivity activity);
-
-    Mono<Void> deleteById(Long id);
-
-    Mono<Void> updateStatus(Long id, String status);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/IFlashSaleItemRepository.java

@@ -1,22 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository;
-
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IFlashSaleItemRepository {
-
-    Mono<FlashSaleItem> findById(Long id);
-
-    Flux<FlashSaleItem> findByActivityId(Long activityId);
-
-    Mono<FlashSaleItem> save(FlashSaleItem item);
-
-    Mono<FlashSaleItem> update(FlashSaleItem item);
-
-    Mono<Boolean> deductStock(Long id, int quantity);
-
-    Mono<Void> restoreStock(Long id, int quantity);
-
-    Mono<Void> incrementSoldCount(Long id, int count);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/IFlashSaleOrderRepository.java

@@ -1,26 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository;
-
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Collection;
-
-public interface IFlashSaleOrderRepository {
-
-    Mono<FlashSaleOrder> findById(Long id);
-
-    Flux<FlashSaleOrder> findByMemberId(Long memberId);
-
-    Flux<FlashSaleOrder> findByActivityId(Long activityId);
-
-    Flux<FlashSaleOrder> findExpiredPendingOrders();
-
-    Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses);
-
-    Mono<FlashSaleOrder> save(FlashSaleOrder order);
-
-    Mono<Void> updateStatus(Long id, String status);
-
-    Mono<Void> markPaid(Long id, String status);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/impl/FlashSaleActivityRepository.java

@@ -1,109 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
-
-import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
-import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleActivityDao;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-@Repository
-@Transactional
-public class FlashSaleActivityRepository implements IFlashSaleActivityRepository {
-
-    private final FlashSaleActivityDao activityDao;
-    private final FlashSaleConverter converter;
-
-    public FlashSaleActivityRepository(FlashSaleActivityDao activityDao, FlashSaleConverter converter) {
-        this.activityDao = activityDao;
-        this.converter = converter;
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> findById(Long id) {
-        return activityDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toActivity);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
-        if (includeDeleted) {
-            return activityDao.findAll().map(converter::toActivity);
-        }
-        return activityDao.findAllByDeletedAtIsNull().map(converter::toActivity);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findByKeyword(String keyword) {
-        if (keyword == null || keyword.isEmpty()) {
-            return findAll(false);
-        }
-        return activityDao.findByNameContainingAndDeletedAtIsNull(keyword).map(converter::toActivity);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findByStatus(String status) {
-        if (status == null || status.isEmpty()) {
-            return findAll(false);
-        }
-        return activityDao.findByStatusAndDeletedAtIsNull(status).map(converter::toActivity);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
-        Flux<FlashSaleActivity> result = findByKeyword(keyword);
-        if (status != null && !status.isEmpty()) {
-            result = result.filter(a -> status.equals(a.getStatus()));
-        }
-        return result;
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> save(FlashSaleActivity activity) {
-        return activityDao.save(converter.toActivityEntity(activity)).map(converter::toActivity);
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> update(FlashSaleActivity activity) {
-        return activityDao.findByIdIsAndDeletedAtIsNull(activity.getId())
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(existing -> {
-                    existing.markNotNew();
-                    if (activity.getName() != null) {
-                        existing.setName(activity.getName());
-                    }
-                    if (activity.getDescription() != null) {
-                        existing.setDescription(activity.getDescription());
-                    }
-                    if (activity.getStartTime() != null) {
-                        existing.setStartTime(activity.getStartTime());
-                    }
-                    if (activity.getEndTime() != null) {
-                        existing.setEndTime(activity.getEndTime());
-                    }
-                    if (activity.getPayTimeoutMinutes() != null) {
-                        existing.setPayTimeoutMinutes(activity.getPayTimeoutMinutes());
-                    }
-                    if (activity.getPerUserLimit() != null) {
-                        existing.setPerUserLimit(activity.getPerUserLimit());
-                    }
-                    existing.setUpdatedAt(LocalDateTime.now());
-                    return activityDao.save(existing);
-                })
-                .map(converter::toActivity);
-    }
-
-    @Override
-    public Mono<Void> deleteById(Long id) {
-        return activityDao.softDelete(id, LocalDateTime.now()).then();
-    }
-
-    @Override
-    public Mono<Void> updateStatus(Long id, String status) {
-        return activityDao.updateStatus(id, status, LocalDateTime.now()).then();
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/impl/FlashSaleItemRepository.java

@@ -1,90 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
-
-import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
-import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleItemDao;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-@Repository
-@Transactional
-public class FlashSaleItemRepository implements IFlashSaleItemRepository {
-
-    private final FlashSaleItemDao itemDao;
-    private final FlashSaleConverter converter;
-
-    public FlashSaleItemRepository(FlashSaleItemDao itemDao, FlashSaleConverter converter) {
-        this.itemDao = itemDao;
-        this.converter = converter;
-    }
-
-    @Override
-    public Mono<FlashSaleItem> findById(Long id) {
-        return itemDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toItem);
-    }
-
-    @Override
-    public Flux<FlashSaleItem> findByActivityId(Long activityId) {
-        return itemDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toItem);
-    }
-
-    @Override
-    public Mono<FlashSaleItem> save(FlashSaleItem item) {
-        return itemDao.save(converter.toItemEntity(item)).map(converter::toItem);
-    }
-
-    @Override
-    public Mono<FlashSaleItem> update(FlashSaleItem item) {
-        return itemDao.findByIdIsAndDeletedAtIsNull(item.getId())
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
-                .flatMap(existing -> {
-                    existing.markNotNew();
-                    if (item.getProductType() != null) {
-                        existing.setProductType(item.getProductType());
-                    }
-                    if (item.getProductId() != null) {
-                        existing.setProductId(item.getProductId());
-                    }
-                    if (item.getProductName() != null) {
-                        existing.setProductName(item.getProductName());
-                    }
-                    if (item.getOriginalPrice() != null) {
-                        existing.setOriginalPrice(item.getOriginalPrice());
-                    }
-                    if (item.getSeckillPrice() != null) {
-                        existing.setSeckillPrice(item.getSeckillPrice());
-                    }
-                    if (item.getStock() != null) {
-                        existing.setStock(item.getStock());
-                    }
-                    if (item.getPerUserLimit() != null) {
-                        existing.setPerUserLimit(item.getPerUserLimit());
-                    }
-                    existing.setUpdatedAt(LocalDateTime.now());
-                    return itemDao.save(existing);
-                })
-                .map(converter::toItem);
-    }
-
-    @Override
-    public Mono<Boolean> deductStock(Long id, int quantity) {
-        return itemDao.deductStock(id, quantity, LocalDateTime.now())
-                .map(rows -> rows != null && rows > 0);
-    }
-
-    @Override
-    public Mono<Void> restoreStock(Long id, int quantity) {
-        return itemDao.restoreStock(id, quantity, LocalDateTime.now()).then();
-    }
-
-    @Override
-    public Mono<Void> incrementSoldCount(Long id, int count) {
-        return itemDao.incrementSoldCount(id, count, LocalDateTime.now()).then();
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/repository/impl/FlashSaleOrderRepository.java

@@ -1,68 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
-
-import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
-import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleOrderDao;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-@Repository
-@Transactional
-public class FlashSaleOrderRepository implements IFlashSaleOrderRepository {
-
-    private final FlashSaleOrderDao orderDao;
-    private final FlashSaleConverter converter;
-
-    public FlashSaleOrderRepository(FlashSaleOrderDao orderDao, FlashSaleConverter converter) {
-        this.orderDao = orderDao;
-        this.converter = converter;
-    }
-
-    @Override
-    public Mono<FlashSaleOrder> findById(Long id) {
-        return orderDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toOrder);
-    }
-
-    @Override
-    public Flux<FlashSaleOrder> findByMemberId(Long memberId) {
-        return orderDao.findByMemberIdAndDeletedAtIsNull(memberId).map(converter::toOrder);
-    }
-
-    @Override
-    public Flux<FlashSaleOrder> findByActivityId(Long activityId) {
-        return orderDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toOrder);
-    }
-
-    @Override
-    public Flux<FlashSaleOrder> findExpiredPendingOrders() {
-        return orderDao.findExpiredPendingOrders(
-                FlashSaleOrderStatus.PENDING.name(), LocalDateTime.now()).map(converter::toOrder);
-    }
-
-    @Override
-    public Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses) {
-        return orderDao.countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(itemId, memberId, statuses);
-    }
-
-    @Override
-    public Mono<FlashSaleOrder> save(FlashSaleOrder order) {
-        return orderDao.save(converter.toOrderEntity(order)).map(converter::toOrder);
-    }
-
-    @Override
-    public Mono<Void> updateStatus(Long id, String status) {
-        return orderDao.updateStatus(id, status, LocalDateTime.now()).then();
-    }
-
-    @Override
-    public Mono<Void> markPaid(Long id, String status) {
-        return orderDao.markPaid(id, status, LocalDateTime.now(), LocalDateTime.now()).then();
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/scheduler/FlashSaleOrderExpireScheduler.java

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.scheduler;
-
-import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 秒杀订单过期定时任务
- *
- * 功能：定期检查已过期的待支付订单，取消订单并恢复库存
- */
-@Component
-public class FlashSaleOrderExpireScheduler {
-
-    private static final Logger logger = LoggerFactory.getLogger(FlashSaleOrderExpireScheduler.class);
-
-    private final IFlashSaleActivityService flashSaleService;
-
-    public FlashSaleOrderExpireScheduler(IFlashSaleActivityService flashSaleService) {
-        this.flashSaleService = flashSaleService;
-    }
-
-    @Scheduled(fixedRate = 60000)
-    public void processExpiredOrders() {
-        logger.debug("定时任务开始检查过期秒杀订单");
-
-        flashSaleService.processExpiredOrders()
-                .subscribe(
-                        count -> logger.debug("定时任务完成，处理了 {} 个过期秒杀订单", count),
-                        error -> logger.error("秒杀订单过期定时任务执行失败：{}", error.getMessage(), error)
-                );
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/service/IFlashSaleActivityService.java

@@ -1,50 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.service;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.dto.PageResponse;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
-import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IFlashSaleActivityService {
-
-    Mono<FlashSaleActivity> findById(Long id);
-
-    Flux<FlashSaleActivity> findAll(boolean includeDeleted);
-
-    Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
-
-    Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status);
-
-    Mono<FlashSaleActivity> create(FlashSaleActivity activity);
-
-    Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity);
-
-    Mono<Void> delete(Long id);
-
-    Mono<FlashSaleActivity> publish(Long id);
-
-    Mono<FlashSaleActivity> terminate(Long id);
-
-    Flux<FlashSaleItem> findItemsByActivityId(Long activityId);
-
-    Mono<FlashSaleItem> createItem(FlashSaleItem item);
-
-    Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item);
-
-    Mono<FlashSaleOrder> grab(GrabRequest request);
-
-    Mono<FlashSaleOrder> payOrder(Long orderId);
-
-    Mono<FlashSaleOrder> cancelOrder(Long orderId);
-
-    Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId);
-
-    Mono<FlashSaleStatistics> getStatistics(Long id);
-
-    Mono<Long> processExpiredOrders();
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/flashsale/service/impl/FlashSaleActivityService.java

@@ -1,390 +0,0 @@
-package cn.novalon.gym.manage.coupon.flashsale.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.SnowflakeId;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
-import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
-import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
-import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleActivityStatus;
-import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
-import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
-import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
-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.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-@Service
-public class FlashSaleActivityService implements IFlashSaleActivityService {
-
-    private static final Logger logger = LoggerFactory.getLogger(FlashSaleActivityService.class);
-
-    private final IFlashSaleActivityRepository activityRepository;
-    private final IFlashSaleItemRepository itemRepository;
-    private final IFlashSaleOrderRepository orderRepository;
-
-    public FlashSaleActivityService(IFlashSaleActivityRepository activityRepository,
-                                    IFlashSaleItemRepository itemRepository,
-                                    IFlashSaleOrderRepository orderRepository) {
-        this.activityRepository = activityRepository;
-        this.itemRepository = itemRepository;
-        this.orderRepository = orderRepository;
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> findById(Long id) {
-        return activityRepository.findById(id);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
-        return activityRepository.findAll(includeDeleted);
-    }
-
-    @Override
-    public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
-        return activityRepository.findByKeywordAndStatus(keyword, status);
-    }
-
-    @Override
-    public Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status) {
-        int page = Math.max(pageRequest.getPage(), 0);
-        int size = pageRequest.getSize() <= 0 || pageRequest.getSize() > 100 ? 10 : pageRequest.getSize();
-        String keyword = pageRequest.getKeyword();
-
-        return activityRepository.findByKeywordAndStatus(keyword, status)
-                .sort(Comparator.comparing(FlashSaleActivity::getCreatedAt,
-                        Comparator.nullsLast(Comparator.reverseOrder())))
-                .collectList()
-                .map(list -> {
-                    long total = list.size();
-                    int fromIndex = Math.min(page * size, list.size());
-                    int toIndex = Math.min(fromIndex + size, list.size());
-                    List<FlashSaleActivity> content = list.subList(fromIndex, toIndex);
-                    int totalPages = size == 0 ? 0 : (int) Math.ceil((double) total / size);
-                    return new PageResponse<>(content, totalPages, total, page, size);
-                });
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> create(FlashSaleActivity activity) {
-        return validateActivity(activity)
-                .flatMap(validated -> {
-                    validated.generateId();
-                    validated.setStatus(FlashSaleActivityStatus.DRAFT.name());
-                    applyDefaults(validated);
-                    return activityRepository.save(validated);
-                })
-                .doOnSuccess(a -> logger.info("秒杀活动创建成功 - id={}, name={}", a.getId(), a.getName()));
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity) {
-        return activityRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(existing -> {
-                    if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
-                        return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可编辑"));
-                    }
-                    activity.setId(id);
-                    return validateActivity(activity)
-                            .flatMap(activityRepository::update);
-                })
-                .doOnSuccess(a -> logger.info("秒杀活动更新成功 - id={}", id));
-    }
-
-    @Override
-    public Mono<Void> delete(Long id) {
-        return activityRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(existing -> {
-                    if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
-                        return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可删除"));
-                    }
-                    return activityRepository.deleteById(id);
-                });
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> publish(Long id) {
-        return activityRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(existing -> {
-                    if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
-                        return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可发布"));
-                    }
-                    return validateActivity(existing)
-                            .flatMap(validated -> activityRepository.updateStatus(id, FlashSaleActivityStatus.ACTIVE.name())
-                                    .then(activityRepository.findById(id)));
-                })
-                .doOnSuccess(a -> logger.info("秒杀活动发布成功 - id={}", id));
-    }
-
-    @Override
-    public Mono<FlashSaleActivity> terminate(Long id) {
-        return activityRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(existing -> {
-                    if (!FlashSaleActivityStatus.ACTIVE.name().equals(existing.getStatus())) {
-                        return Mono.error(new RuntimeException("仅进行中的秒杀活动可终止"));
-                    }
-                    return activityRepository.updateStatus(id, FlashSaleActivityStatus.TERMINATED.name())
-                            .then(activityRepository.findById(id));
-                })
-                .doOnSuccess(a -> logger.info("秒杀活动已终止 - id={}", id));
-    }
-
-    @Override
-    public Flux<FlashSaleItem> findItemsByActivityId(Long activityId) {
-        return itemRepository.findByActivityId(activityId);
-    }
-
-    @Override
-    public Mono<FlashSaleItem> createItem(FlashSaleItem item) {
-        return validateItem(item)
-                .flatMap(validated -> activityRepository.findById(validated.getActivityId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                        .flatMap(activity -> {
-                            if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
-                                return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可添加商品"));
-                            }
-                            validated.setId(SnowflakeId.nextId());
-                            validated.setSoldCount(0);
-                            if (validated.getPerUserLimit() == null) {
-                                validated.setPerUserLimit(activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1);
-                            }
-                            return itemRepository.save(validated);
-                        }));
-    }
-
-    @Override
-    public Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item) {
-        return itemRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
-                .flatMap(existing -> activityRepository.findById(existing.getActivityId())
-                        .flatMap(activity -> {
-                            if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
-                                return Mono.error(new RuntimeException("活动已发布，不可修改商品"));
-                            }
-                            item.setId(id);
-                            return validateItem(item)
-                                    .flatMap(itemRepository::update);
-                        }));
-    }
-
-    @Override
-    public Mono<FlashSaleOrder> grab(GrabRequest request) {
-        if (request.getItemId() == null || request.getMemberId() == null) {
-            return Mono.error(new RuntimeException("itemId和memberId不能为空"));
-        }
-        int quantity = request.getQuantity() != null && request.getQuantity() > 0 ? request.getQuantity() : 1;
-
-        return itemRepository.findById(request.getItemId())
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
-                .flatMap(item -> activityRepository.findById(item.getActivityId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                        .flatMap(activity -> validateActivityForGrab(activity)
-                                .then(checkUserLimit(item, activity, request.getMemberId(), quantity))
-                                .then(itemRepository.deductStock(item.getId(), quantity))
-                                .flatMap(success -> {
-                                    if (!success) {
-                                        return Mono.error(new RuntimeException("库存不足"));
-                                    }
-                                    return createOrder(item, activity, request.getMemberId(), quantity)
-                                            .onErrorResume(e -> itemRepository.restoreStock(item.getId(), quantity)
-                                                    .then(Mono.error(e)));
-                                })));
-    }
-
-    @Override
-    public Mono<FlashSaleOrder> payOrder(Long orderId) {
-        return orderRepository.findById(orderId)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
-                .flatMap(order -> {
-                    if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
-                        return Mono.error(new RuntimeException("订单状态不允许支付"));
-                    }
-                    if (order.getExpireAt() != null && order.getExpireAt().isBefore(LocalDateTime.now())) {
-                        return Mono.error(new RuntimeException("订单已过期"));
-                    }
-                    return orderRepository.markPaid(orderId, FlashSaleOrderStatus.PAID.name())
-                            .then(itemRepository.incrementSoldCount(order.getItemId(), order.getQuantity()))
-                            .then(orderRepository.findById(orderId));
-                })
-                .doOnSuccess(o -> logger.info("秒杀订单支付成功 - orderId={}", orderId));
-    }
-
-    @Override
-    public Mono<FlashSaleOrder> cancelOrder(Long orderId) {
-        return orderRepository.findById(orderId)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
-                .flatMap(order -> {
-                    if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
-                        return Mono.error(new RuntimeException("仅待支付订单可取消"));
-                    }
-                    return orderRepository.updateStatus(orderId, FlashSaleOrderStatus.CANCELLED.name())
-                            .then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
-                            .then(orderRepository.findById(orderId));
-                })
-                .doOnSuccess(o -> logger.info("秒杀订单已取消 - orderId={}", orderId));
-    }
-
-    @Override
-    public Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId) {
-        return orderRepository.findByMemberId(memberId);
-    }
-
-    @Override
-    public Mono<FlashSaleStatistics> getStatistics(Long id) {
-        return activityRepository.findById(id)
-                .switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
-                .flatMap(activity -> orderRepository.findByActivityId(id)
-                        .collectList()
-                        .map(orders -> {
-                            FlashSaleStatistics stats = new FlashSaleStatistics();
-                            stats.setActivityId(id);
-                            stats.setTotalOrders(orders.size());
-                            stats.setPendingOrders(countByStatus(orders, FlashSaleOrderStatus.PENDING));
-                            stats.setPaidOrders(countByStatus(orders, FlashSaleOrderStatus.PAID));
-                            stats.setCancelledOrders(countByStatus(orders, FlashSaleOrderStatus.CANCELLED));
-                            stats.setExpiredOrders(countByStatus(orders, FlashSaleOrderStatus.EXPIRED));
-
-                            long soldQty = orders.stream()
-                                    .filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
-                                    .mapToLong(o -> o.getQuantity() != null ? o.getQuantity() : 0)
-                                    .sum();
-                            stats.setTotalSoldQuantity(soldQty);
-
-                            BigDecimal revenue = orders.stream()
-                                    .filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
-                                    .map(o -> o.getPayAmount() != null ? o.getPayAmount() : BigDecimal.ZERO)
-                                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-                            stats.setTotalRevenue(revenue);
-
-                            return stats;
-                        }));
-    }
-
-    @Override
-    public Mono<Long> processExpiredOrders() {
-        return orderRepository.findExpiredPendingOrders()
-                .flatMap(order -> orderRepository.updateStatus(order.getId(), FlashSaleOrderStatus.EXPIRED.name())
-                        .then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
-                        .thenReturn(1L))
-                .reduce(0L, Long::sum)
-                .doOnSuccess(count -> {
-                    if (count > 0) {
-                        logger.info("已处理 {} 个过期秒杀订单", count);
-                    }
-                });
-    }
-
-    private Mono<FlashSaleOrder> createOrder(FlashSaleItem item, FlashSaleActivity activity,
-                                              Long memberId, int quantity) {
-        int timeoutMinutes = activity.getPayTimeoutMinutes() != null ? activity.getPayTimeoutMinutes() : 5;
-        BigDecimal payAmount = item.getSeckillPrice().multiply(BigDecimal.valueOf(quantity));
-
-        FlashSaleOrder order = new FlashSaleOrder();
-        order.setId(SnowflakeId.nextId());
-        order.setActivityId(activity.getId());
-        order.setItemId(item.getId());
-        order.setMemberId(memberId);
-        order.setQuantity(quantity);
-        order.setPayAmount(payAmount);
-        order.setStatus(FlashSaleOrderStatus.PENDING.name());
-        order.setExpireAt(LocalDateTime.now().plusMinutes(timeoutMinutes));
-
-        return orderRepository.save(order);
-    }
-
-    private Mono<Void> checkUserLimit(FlashSaleItem item, FlashSaleActivity activity,
-                                       Long memberId, int quantity) {
-        int itemLimit = item.getPerUserLimit() != null ? item.getPerUserLimit() : 1;
-        int activityLimit = activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1;
-        int effectiveLimit = Math.min(itemLimit, activityLimit);
-
-        return orderRepository.countByItemIdAndMemberIdAndStatusIn(
-                        item.getId(), memberId,
-                        Arrays.asList(FlashSaleOrderStatus.PENDING.name(), FlashSaleOrderStatus.PAID.name()))
-                .flatMap(count -> {
-                    if (count + quantity > effectiveLimit) {
-                        return Mono.error(new RuntimeException("超出每人限购数量"));
-                    }
-                    return Mono.empty();
-                });
-    }
-
-    private Mono<Void> validateActivityForGrab(FlashSaleActivity activity) {
-        if (!FlashSaleActivityStatus.ACTIVE.name().equals(activity.getStatus())) {
-            return Mono.error(new RuntimeException("秒杀活动未开始或已结束"));
-        }
-        LocalDateTime now = LocalDateTime.now();
-        if (activity.getStartTime() != null && now.isBefore(activity.getStartTime())) {
-            return Mono.error(new RuntimeException("秒杀活动尚未开始"));
-        }
-        if (activity.getEndTime() != null && now.isAfter(activity.getEndTime())) {
-            return Mono.error(new RuntimeException("秒杀活动已结束"));
-        }
-        return Mono.empty();
-    }
-
-    private Mono<FlashSaleActivity> validateActivity(FlashSaleActivity activity) {
-        if (activity.getName() == null || activity.getName().isBlank()) {
-            return Mono.error(new RuntimeException("活动名称不能为空"));
-        }
-        if (activity.getStartTime() == null || activity.getEndTime() == null) {
-            return Mono.error(new RuntimeException("活动开始和结束时间不能为空"));
-        }
-        if (activity.getEndTime().isBefore(activity.getStartTime())) {
-            return Mono.error(new RuntimeException("结束时间不能早于开始时间"));
-        }
-        return Mono.just(activity);
-    }
-
-    private Mono<FlashSaleItem> validateItem(FlashSaleItem item) {
-        if (item.getActivityId() == null) {
-            return Mono.error(new RuntimeException("活动ID不能为空"));
-        }
-        if (item.getProductType() == null || item.getProductName() == null) {
-            return Mono.error(new RuntimeException("商品类型和名称不能为空"));
-        }
-        if (item.getProductId() == null) {
-            return Mono.error(new RuntimeException("商品ID不能为空"));
-        }
-        if (item.getOriginalPrice() == null || item.getSeckillPrice() == null) {
-            return Mono.error(new RuntimeException("原价和秒杀价不能为空"));
-        }
-        if (item.getSeckillPrice().compareTo(item.getOriginalPrice()) >= 0) {
-            return Mono.error(new RuntimeException("秒杀价必须低于原价"));
-        }
-        if (item.getStock() == null || item.getStock() < 0) {
-            return Mono.error(new RuntimeException("库存不能为空且不能为负数"));
-        }
-        return Mono.just(item);
-    }
-
-    private void applyDefaults(FlashSaleActivity activity) {
-        if (activity.getPayTimeoutMinutes() == null) {
-            activity.setPayTimeoutMinutes(5);
-        }
-        if (activity.getPerUserLimit() == null) {
-            activity.setPerUserLimit(1);
-        }
-    }
-
-    private long countByStatus(List<FlashSaleOrder> orders, FlashSaleOrderStatus status) {
-        return orders.stream().filter(o -> status.name().equals(o.getStatus())).count();
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/converter/GroupBuyConverter.java

@@ -1,77 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.converter;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GroupBuyConverter {
-
-    public GroupBuyActivity toActivity(GroupBuyActivityEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        GroupBuyActivity domain = new GroupBuyActivity();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public GroupBuyActivityEntity toActivityEntity(GroupBuyActivity domain) {
-        if (domain == null) {
-            return null;
-        }
-        GroupBuyActivityEntity entity = new GroupBuyActivityEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-
-    public GroupBuyTeam toTeam(GroupBuyTeamEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        GroupBuyTeam domain = new GroupBuyTeam();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public GroupBuyTeamEntity toTeamEntity(GroupBuyTeam domain) {
-        if (domain == null) {
-            return null;
-        }
-        GroupBuyTeamEntity entity = new GroupBuyTeamEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-
-    public GroupBuyParticipant toParticipant(GroupBuyParticipantEntity entity) {
-        if (entity == null) {
-            return null;
-        }
-        GroupBuyParticipant domain = new GroupBuyParticipant();
-        BeanUtil.copyProperties(entity, domain);
-        return domain;
-    }
-
-    public GroupBuyParticipantEntity toParticipantEntity(GroupBuyParticipant domain) {
-        if (domain == null) {
-            return null;
-        }
-        GroupBuyParticipantEntity entity = new GroupBuyParticipantEntity();
-        BeanUtil.copyProperties(domain, entity);
-        if (domain.getId() != null) {
-            entity.markNotNew();
-        }
-        return entity;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/dao/GroupBuyActivityDao.java

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.dao;
-
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
-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 GroupBuyActivityDao extends R2dbcRepository<GroupBuyActivityEntity, Long> {
-
-    Mono<GroupBuyActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<GroupBuyActivityEntity> findAllByDeletedAtIsNull();
-
-    Flux<GroupBuyActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
-
-    Flux<GroupBuyActivityEntity> findByStatusAndDeletedAtIsNull(String status);
-
-    @Modifying
-    @Query("UPDATE group_buy_activity SET deleted_at = :deletedAt WHERE id = :id")
-    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
-
-    @Modifying
-    @Query("UPDATE group_buy_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE group_buy_activity SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/dao/GroupBuyParticipantDao.java

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.dao;
-
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
-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 GroupBuyParticipantDao extends R2dbcRepository<GroupBuyParticipantEntity, Long> {
-
-    Flux<GroupBuyParticipantEntity> findByTeamIdAndDeletedAtIsNull(Long teamId);
-
-    Flux<GroupBuyParticipantEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
-
-    @Query("""
-            SELECT p.* FROM group_buy_participant p
-            INNER JOIN group_buy_team t ON p.team_id = t.id
-            WHERE p.activity_id = :activityId AND p.member_id = :memberId
-            AND p.status = :participantStatus AND t.status = :teamStatus
-            AND p.deleted_at IS NULL AND t.deleted_at IS NULL
-            """)
-    Flux<GroupBuyParticipantEntity> findActiveParticipantInFormingTeam(
-            Long activityId, Long memberId, String participantStatus, String teamStatus);
-
-    Mono<Long> countByActivityIdAndDeletedAtIsNull(Long activityId);
-
-    @Modifying
-    @Query("UPDATE group_buy_participant SET status = :status, updated_at = :updatedAt WHERE team_id = :teamId")
-    Mono<Integer> updateStatusByTeamId(Long teamId, String status, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/dao/GroupBuyTeamDao.java

@@ -1,38 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.dao;
-
-import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
-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 GroupBuyTeamDao extends R2dbcRepository<GroupBuyTeamEntity, Long> {
-
-    Mono<GroupBuyTeamEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<GroupBuyTeamEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
-
-    Flux<GroupBuyTeamEntity> findByActivityIdAndStatusAndDeletedAtIsNull(Long activityId, String status);
-
-    Flux<GroupBuyTeamEntity> findByStatusAndDeletedAtIsNull(String status);
-
-    @Query("SELECT * FROM group_buy_team WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
-    Flux<GroupBuyTeamEntity> findExpiredFormingTeams(String status, LocalDateTime now);
-
-    @Modifying
-    @Query("UPDATE group_buy_team SET status = :status, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE group_buy_team SET current_members = current_members + :count, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> incrementCurrentMembers(Long id, int count, LocalDateTime updatedAt);
-
-    @Modifying
-    @Query("UPDATE group_buy_team SET status = :status, success_at = :successAt, updated_at = :updatedAt WHERE id = :id")
-    Mono<Integer> markSuccess(Long id, String status, LocalDateTime successAt, LocalDateTime updatedAt);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/CreateTeamRequest.java

@@ -1,26 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "创建拼团团队请求")
-public class CreateTeamRequest {
-
-    private Long activityId;
-    private Long memberId;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/GroupBuyActivity.java

@@ -1,138 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "拼团活动")
-public class GroupBuyActivity extends BaseDomain {
-
-    private String name;
-    private String description;
-    private String productType;
-    private Long productId;
-    private String productName;
-    private BigDecimal originalPrice;
-    private BigDecimal groupPrice;
-    private Integer requiredMembers;
-    private Integer validHours;
-    private LocalDateTime startTime;
-    private LocalDateTime endTime;
-    private Integer stock;
-    private Integer soldCount;
-    private String status;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getProductType() {
-        return productType;
-    }
-
-    public void setProductType(String productType) {
-        this.productType = productType;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
-    }
-
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
-    }
-
-    public BigDecimal getGroupPrice() {
-        return groupPrice;
-    }
-
-    public void setGroupPrice(BigDecimal groupPrice) {
-        this.groupPrice = groupPrice;
-    }
-
-    public Integer getRequiredMembers() {
-        return requiredMembers;
-    }
-
-    public void setRequiredMembers(Integer requiredMembers) {
-        this.requiredMembers = requiredMembers;
-    }
-
-    public Integer getValidHours() {
-        return validHours;
-    }
-
-    public void setValidHours(Integer validHours) {
-        this.validHours = validHours;
-    }
-
-    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 getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public Integer getSoldCount() {
-        return soldCount;
-    }
-
-    public void setSoldCount(Integer soldCount) {
-        this.soldCount = soldCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/GroupBuyParticipant.java

@@ -1,65 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "拼团参与人")
-public class GroupBuyParticipant extends BaseDomain {
-
-    private Long teamId;
-    private Long activityId;
-    private Long memberId;
-    private Boolean isLeader;
-    private String status;
-    private LocalDateTime joinAt;
-
-    public Long getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Long teamId) {
-        this.teamId = teamId;
-    }
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Boolean getIsLeader() {
-        return isLeader;
-    }
-
-    public void setIsLeader(Boolean isLeader) {
-        this.isLeader = isLeader;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getJoinAt() {
-        return joinAt;
-    }
-
-    public void setJoinAt(LocalDateTime joinAt) {
-        this.joinAt = joinAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/GroupBuyStatistics.java

@@ -1,91 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.math.BigDecimal;
-
-@Schema(description = "拼团统计数据")
-public class GroupBuyStatistics {
-
-    private Long activityId;
-    private long totalTeams;
-    private long formingTeams;
-    private long successTeams;
-    private long failedTeams;
-    private long cancelledTeams;
-    private long totalParticipants;
-    private long soldCount;
-    private BigDecimal totalRevenue;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public long getTotalTeams() {
-        return totalTeams;
-    }
-
-    public void setTotalTeams(long totalTeams) {
-        this.totalTeams = totalTeams;
-    }
-
-    public long getFormingTeams() {
-        return formingTeams;
-    }
-
-    public void setFormingTeams(long formingTeams) {
-        this.formingTeams = formingTeams;
-    }
-
-    public long getSuccessTeams() {
-        return successTeams;
-    }
-
-    public void setSuccessTeams(long successTeams) {
-        this.successTeams = successTeams;
-    }
-
-    public long getFailedTeams() {
-        return failedTeams;
-    }
-
-    public void setFailedTeams(long failedTeams) {
-        this.failedTeams = failedTeams;
-    }
-
-    public long getCancelledTeams() {
-        return cancelledTeams;
-    }
-
-    public void setCancelledTeams(long cancelledTeams) {
-        this.cancelledTeams = cancelledTeams;
-    }
-
-    public long getTotalParticipants() {
-        return totalParticipants;
-    }
-
-    public void setTotalParticipants(long totalParticipants) {
-        this.totalParticipants = totalParticipants;
-    }
-
-    public long getSoldCount() {
-        return soldCount;
-    }
-
-    public void setSoldCount(long soldCount) {
-        this.soldCount = soldCount;
-    }
-
-    public BigDecimal getTotalRevenue() {
-        return totalRevenue;
-    }
-
-    public void setTotalRevenue(BigDecimal totalRevenue) {
-        this.totalRevenue = totalRevenue;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/GroupBuyTeam.java

@@ -1,74 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "拼团团队")
-public class GroupBuyTeam extends BaseDomain {
-
-    private Long activityId;
-    private Long leaderMemberId;
-    private Integer requiredMembers;
-    private Integer currentMembers;
-    private String status;
-    private LocalDateTime expireAt;
-    private LocalDateTime successAt;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getLeaderMemberId() {
-        return leaderMemberId;
-    }
-
-    public void setLeaderMemberId(Long leaderMemberId) {
-        this.leaderMemberId = leaderMemberId;
-    }
-
-    public Integer getRequiredMembers() {
-        return requiredMembers;
-    }
-
-    public void setRequiredMembers(Integer requiredMembers) {
-        this.requiredMembers = requiredMembers;
-    }
-
-    public Integer getCurrentMembers() {
-        return currentMembers;
-    }
-
-    public void setCurrentMembers(Integer currentMembers) {
-        this.currentMembers = currentMembers;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getSuccessAt() {
-        return successAt;
-    }
-
-    public void setSuccessAt(LocalDateTime successAt) {
-        this.successAt = successAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/domain/JoinTeamRequest.java

@@ -1,17 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.domain;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "加入拼团团队请求")
-public class JoinTeamRequest {
-
-    private Long memberId;
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/entity/GroupBuyActivityEntity.java

@@ -1,166 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.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.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Table("group_buy_activity")
-public class GroupBuyActivityEntity extends BaseEntity {
-
-    @Column("name")
-    private String name;
-
-    @Column("description")
-    private String description;
-
-    @Column("product_type")
-    private String productType;
-
-    @Column("product_id")
-    private Long productId;
-
-    @Column("product_name")
-    private String productName;
-
-    @Column("original_price")
-    private BigDecimal originalPrice;
-
-    @Column("group_price")
-    private BigDecimal groupPrice;
-
-    @Column("required_members")
-    private Integer requiredMembers;
-
-    @Column("valid_hours")
-    private Integer validHours;
-
-    @Column("start_time")
-    private LocalDateTime startTime;
-
-    @Column("end_time")
-    private LocalDateTime endTime;
-
-    @Column("stock")
-    private Integer stock;
-
-    @Column("sold_count")
-    private Integer soldCount;
-
-    @Column("status")
-    private String status;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getProductType() {
-        return productType;
-    }
-
-    public void setProductType(String productType) {
-        this.productType = productType;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
-    }
-
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
-    }
-
-    public BigDecimal getGroupPrice() {
-        return groupPrice;
-    }
-
-    public void setGroupPrice(BigDecimal groupPrice) {
-        this.groupPrice = groupPrice;
-    }
-
-    public Integer getRequiredMembers() {
-        return requiredMembers;
-    }
-
-    public void setRequiredMembers(Integer requiredMembers) {
-        this.requiredMembers = requiredMembers;
-    }
-
-    public Integer getValidHours() {
-        return validHours;
-    }
-
-    public void setValidHours(Integer validHours) {
-        this.validHours = validHours;
-    }
-
-    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 getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public Integer getSoldCount() {
-        return soldCount;
-    }
-
-    public void setSoldCount(Integer soldCount) {
-        this.soldCount = soldCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/entity/GroupBuyParticipantEntity.java

@@ -1,77 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.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_buy_participant")
-public class GroupBuyParticipantEntity extends BaseEntity {
-
-    @Column("team_id")
-    private Long teamId;
-
-    @Column("activity_id")
-    private Long activityId;
-
-    @Column("member_id")
-    private Long memberId;
-
-    @Column("is_leader")
-    private Boolean isLeader;
-
-    @Column("status")
-    private String status;
-
-    @Column("join_at")
-    private LocalDateTime joinAt;
-
-    public Long getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Long teamId) {
-        this.teamId = teamId;
-    }
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Boolean getIsLeader() {
-        return isLeader;
-    }
-
-    public void setIsLeader(Boolean isLeader) {
-        this.isLeader = isLeader;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getJoinAt() {
-        return joinAt;
-    }
-
-    public void setJoinAt(LocalDateTime joinAt) {
-        this.joinAt = joinAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/entity/GroupBuyTeamEntity.java

@@ -1,88 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.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_buy_team")
-public class GroupBuyTeamEntity extends BaseEntity {
-
-    @Column("activity_id")
-    private Long activityId;
-
-    @Column("leader_member_id")
-    private Long leaderMemberId;
-
-    @Column("required_members")
-    private Integer requiredMembers;
-
-    @Column("current_members")
-    private Integer currentMembers;
-
-    @Column("status")
-    private String status;
-
-    @Column("expire_at")
-    private LocalDateTime expireAt;
-
-    @Column("success_at")
-    private LocalDateTime successAt;
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public Long getLeaderMemberId() {
-        return leaderMemberId;
-    }
-
-    public void setLeaderMemberId(Long leaderMemberId) {
-        this.leaderMemberId = leaderMemberId;
-    }
-
-    public Integer getRequiredMembers() {
-        return requiredMembers;
-    }
-
-    public void setRequiredMembers(Integer requiredMembers) {
-        this.requiredMembers = requiredMembers;
-    }
-
-    public Integer getCurrentMembers() {
-        return currentMembers;
-    }
-
-    public void setCurrentMembers(Integer currentMembers) {
-        this.currentMembers = currentMembers;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(LocalDateTime expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public LocalDateTime getSuccessAt() {
-        return successAt;
-    }
-
-    public void setSuccessAt(LocalDateTime successAt) {
-        this.successAt = successAt;
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/enums/GroupBuyActivityStatus.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.enums;
-
-/**
- * 拼团活动状态
- */
-public enum GroupBuyActivityStatus {
-    DRAFT,
-    ACTIVE,
-    TERMINATED,
-    EXPIRED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/enums/GroupBuyParticipantStatus.java

@@ -1,9 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.enums;
-
-/**
- * 拼团参与人状态
- */
-public enum GroupBuyParticipantStatus {
-    JOINED,
-    CANCELLED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/enums/GroupBuyTeamStatus.java

@@ -1,11 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.enums;
-
-/**
- * 拼团团队状态
- */
-public enum GroupBuyTeamStatus {
-    FORMING,
-    SUCCESS,
-    FAILED,
-    CANCELLED
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/enums/ProductType.java

@@ -1,10 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.enums;
-
-/**
- * 商品类型
- */
-public enum ProductType {
-    COURSE,
-    MEMBER_CARD,
-    PRODUCT
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/handler/GroupBuyHandler.java

@@ -1,220 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.handler;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
-import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
-import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyActivityService;
-import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-@Tag(name = "拼团管理", description = "拼团相关操作")
-public class GroupBuyHandler {
-
-    private final IGroupBuyActivityService activityService;
-    private final IGroupBuyTeamService teamService;
-
-    public GroupBuyHandler(IGroupBuyActivityService activityService, IGroupBuyTeamService teamService) {
-        this.activityService = activityService;
-        this.teamService = teamService;
-    }
-
-    @Operation(summary = "获取所有拼团活动")
-    public Mono<ServerResponse> getAllActivities(ServerRequest request) {
-        boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
-        return ServerResponse.ok()
-                .body(activityService.findAll(includeDeleted), GroupBuyActivity.class);
-    }
-
-    @Operation(summary = "分页获取拼团活动")
-    public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
-        return request.bodyToMono(PageRequest.class)
-                .flatMap(pageRequest -> {
-                    String status = request.queryParam("status").orElse(null);
-                    normalizePageRequest(pageRequest);
-                    return activityService.findByPage(pageRequest, status)
-                            .flatMap(response -> ServerResponse.ok().bodyValue(response));
-                });
-    }
-
-    @Operation(summary = "搜索拼团活动")
-    public Mono<ServerResponse> searchActivities(ServerRequest request) {
-        String keyword = request.queryParam("keyword").orElse("");
-        String status = request.queryParam("status").orElse(null);
-        return ServerResponse.ok()
-                .body(activityService.findByKeywordAndStatus(keyword, status), GroupBuyActivity.class);
-    }
-
-    @Operation(summary = "根据ID获取拼团活动")
-    public Mono<ServerResponse> getActivityById(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return activityService.findById(id)
-                .flatMap(activity -> ServerResponse.ok().bodyValue(activity))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    @Operation(summary = "创建拼团活动")
-    public Mono<ServerResponse> createActivity(ServerRequest request) {
-        return request.bodyToMono(GroupBuyActivity.class)
-                .flatMap(activity -> {
-                    if (activity.getName() == null || activity.getName().isEmpty()) {
-                        return badRequest("活动名称不能为空");
-                    }
-                    return activityService.create(activity)
-                            .flatMap(created -> successResponse("拼团活动创建成功", created))
-                            .onErrorResume(this::errorResponse);
-                });
-    }
-
-    @Operation(summary = "更新拼团活动")
-    public Mono<ServerResponse> updateActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(GroupBuyActivity.class)
-                .flatMap(activity -> activityService.update(id, activity)
-                        .flatMap(updated -> successResponse("拼团活动更新成功", updated))
-                        .onErrorResume(this::errorResponse));
-    }
-
-    @Operation(summary = "删除拼团活动")
-    public Mono<ServerResponse> deleteActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return activityService.delete(id)
-                .then(Mono.defer(() -> successResponse("拼团活动删除成功", null)))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "发布拼团活动")
-    public Mono<ServerResponse> publishActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return activityService.publish(id)
-                .flatMap(activity -> successResponse("拼团活动发布成功", activity))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "终止拼团活动")
-    public Mono<ServerResponse> terminateActivity(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return activityService.terminate(id)
-                .flatMap(activity -> successResponse("拼团活动已终止", activity))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "获取拼团统计")
-    public Mono<ServerResponse> getStatistics(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return activityService.getStatistics(id)
-                .flatMap(stats -> ServerResponse.ok().bodyValue(stats))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "创建拼团团队")
-    public Mono<ServerResponse> createTeam(ServerRequest request) {
-        return request.bodyToMono(CreateTeamRequest.class)
-                .flatMap(body -> {
-                    if (body.getActivityId() == null || body.getMemberId() == null) {
-                        return badRequest("activityId和memberId不能为空");
-                    }
-                    return teamService.createTeam(body)
-                            .flatMap(team -> successResponse("拼团团队创建成功", team))
-                            .onErrorResume(this::errorResponse);
-                });
-    }
-
-    @Operation(summary = "加入拼团团队")
-    public Mono<ServerResponse> joinTeam(ServerRequest request) {
-        Long teamId = Long.valueOf(request.pathVariable("teamId"));
-        return request.bodyToMono(JoinTeamRequest.class)
-                .flatMap(body -> {
-                    if (body.getMemberId() == null) {
-                        return badRequest("memberId不能为空");
-                    }
-                    return teamService.joinTeam(teamId, body)
-                            .flatMap(team -> successResponse("加入拼团成功", team))
-                            .onErrorResume(this::errorResponse);
-                });
-    }
-
-    @Operation(summary = "取消拼团团队")
-    public Mono<ServerResponse> cancelTeam(ServerRequest request) {
-        Long teamId = Long.valueOf(request.pathVariable("teamId"));
-        return teamService.cancelTeam(teamId)
-                .flatMap(team -> successResponse("拼团团队已取消", team))
-                .onErrorResume(this::errorResponse);
-    }
-
-    @Operation(summary = "查询拼团团队列表")
-    public Mono<ServerResponse> getTeams(ServerRequest request) {
-        String activityIdStr = request.queryParam("activityId").orElse(null);
-        if (activityIdStr == null) {
-            return badRequest("activityId不能为空");
-        }
-        Long activityId = Long.valueOf(activityIdStr);
-        String status = request.queryParam("status").orElse(null);
-        return ServerResponse.ok()
-                .body(teamService.findTeams(activityId, status), GroupBuyTeam.class);
-    }
-
-    @Operation(summary = "获取拼团团队详情")
-    public Mono<ServerResponse> getTeamById(ServerRequest request) {
-        Long teamId = Long.valueOf(request.pathVariable("teamId"));
-        return teamService.findTeamById(teamId)
-                .flatMap(team -> teamService.findParticipantsByTeamId(teamId)
-                        .collectList()
-                        .flatMap(participants -> {
-                            Map<String, Object> result = new HashMap<>();
-                            result.put("team", team);
-                            result.put("participants", participants);
-                            return ServerResponse.ok().bodyValue(result);
-                        }))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    private void normalizePageRequest(PageRequest pageRequest) {
-        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("desc");
-        }
-    }
-
-    private Mono<ServerResponse> successResponse(String message, Object data) {
-        Map<String, Object> response = new HashMap<>();
-        response.put("success", true);
-        response.put("message", message);
-        if (data != null) {
-            response.put("data", data);
-        }
-        return ServerResponse.ok().bodyValue(response);
-    }
-
-    private Mono<ServerResponse> badRequest(String message) {
-        Map<String, Object> error = new HashMap<>();
-        error.put("success", false);
-        error.put("message", message);
-        return ServerResponse.badRequest().bodyValue(error);
-    }
-
-    private Mono<ServerResponse> errorResponse(Throwable error) {
-        Map<String, Object> response = new HashMap<>();
-        response.put("success", false);
-        response.put("message", error.getMessage());
-        return ServerResponse.badRequest().bodyValue(response);
-    }
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/repository/IGroupBuyActivityRepository.java

@@ -1,28 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.repository;
-
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IGroupBuyActivityRepository {
-
-    Mono<GroupBuyActivity> findById(Long id);
-
-    Flux<GroupBuyActivity> findAll(boolean includeDeleted);
-
-    Flux<GroupBuyActivity> findByKeyword(String keyword);
-
-    Flux<GroupBuyActivity> findByStatus(String status);
-
-    Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status);
-
-    Mono<GroupBuyActivity> save(GroupBuyActivity activity);
-
-    Mono<GroupBuyActivity> update(GroupBuyActivity activity);
-
-    Mono<Void> deleteById(Long id);
-
-    Mono<Void> updateStatus(Long id, String status);
-
-    Mono<Void> incrementSoldCount(Long id, int count);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/repository/IGroupBuyParticipantRepository.java

@@ -1,20 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.repository;
-
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IGroupBuyParticipantRepository {
-
-    Flux<GroupBuyParticipant> findByTeamId(Long teamId);
-
-    Flux<GroupBuyParticipant> findByActivityId(Long activityId);
-
-    Mono<Boolean> existsInFormingTeam(Long activityId, Long memberId);
-
-    Mono<Long> countByActivityId(Long activityId);
-
-    Mono<GroupBuyParticipant> save(GroupBuyParticipant participant);
-
-    Mono<Void> updateStatusByTeamId(Long teamId, String status);
-}

gym-manage-api/gym-coupon/src/main/java/cn/novalon/gym/manage/coupon/groupbuy/repository/IGroupBuyTeamRepository.java

@@ -1,24 +0,0 @@
-package cn.novalon.gym.manage.coupon.groupbuy.repository;
-
-import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IGroupBuyTeamRepository {
-
-    Mono<GroupBuyTeam> findById(Long id);
-
-    Flux<GroupBuyTeam> findByActivityId(Long activityId);
-
-    Flux<GroupBuyTeam> findByActivityIdAndStatus(Long activityId, String status);
-
-    Flux<GroupBuyTeam> findExpiredFormingTeams();
-
-    Mono<GroupBuyTeam> save(GroupBuyTeam team);
-
-    Mono<Void> updateStatus(Long id, String status);
-
-    Mono<Void> incrementCurrentMembers(Long id, int count);
-
-    Mono<Void> markSuccess(Long id, String status);
-}