合并dev分支，解决冲突

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

gym-manage-api/db/migration/V1__Create_all_tables.sql

@@ -1,407 +0,0 @@
--- Novalon管理系统数据库初始化脚本
--- 版本: V1
--- 描述: 创建所有核心表结构（合并版）
-
--- ============================================
--- 用户与角色相关表
--- ============================================
-
--- 用户表
-CREATE TABLE IF NOT EXISTS sys_user (
-    id BIGSERIAL PRIMARY KEY,
-    username VARCHAR(50) NOT NULL UNIQUE,
-    password VARCHAR(255) NOT NULL,
-    email VARCHAR(100),
-    phone VARCHAR(20),
-    nickname VARCHAR(100),
-    status INTEGER DEFAULT 1,
-    role_id BIGINT,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 角色表
-CREATE TABLE IF NOT EXISTS sys_role (
-    id BIGSERIAL PRIMARY KEY,
-    role_name VARCHAR(100) NOT NULL,
-    role_key VARCHAR(100) NOT NULL UNIQUE,
-    role_sort INTEGER DEFAULT 0,
-    status INTEGER DEFAULT 1,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 用户角色关联表（支持多对多关系）
-CREATE TABLE IF NOT EXISTS user_role (
-    id BIGSERIAL PRIMARY KEY,
-    user_id BIGINT NOT NULL,
-    role_id BIGINT NOT NULL,
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50),
-    CONSTRAINT fk_user_role_user FOREIGN KEY (user_id) REFERENCES sys_user(id) ON DELETE CASCADE,
-    CONSTRAINT fk_user_role_role FOREIGN KEY (role_id) REFERENCES sys_role(id) ON DELETE CASCADE,
-    CONSTRAINT uk_user_role UNIQUE (user_id, role_id)
-);
-
--- ============================================
--- 权限相关表
--- ============================================
-
--- 权限表
-CREATE TABLE IF NOT EXISTS sys_permission (
-    id BIGSERIAL PRIMARY KEY,
-    permission_name VARCHAR(100) NOT NULL,
-    permission_code VARCHAR(100) NOT NULL UNIQUE,
-    resource VARCHAR(200) NOT NULL,
-    action VARCHAR(50) NOT NULL,
-    description VARCHAR(500),
-    status INTEGER DEFAULT 1,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 角色权限关联表
-CREATE TABLE IF NOT EXISTS sys_role_permission (
-    id BIGSERIAL PRIMARY KEY,
-    role_id BIGINT NOT NULL,
-    permission_id BIGINT NOT NULL,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (role_id) REFERENCES sys_role(id) ON DELETE CASCADE,
-    FOREIGN KEY (permission_id) REFERENCES sys_permission(id) ON DELETE CASCADE,
-    UNIQUE (role_id, permission_id)
-);
-
--- ============================================
--- 菜单相关表
--- ============================================
-
--- 菜单表
-CREATE TABLE IF NOT EXISTS sys_menu (
-    id BIGSERIAL PRIMARY KEY,
-    menu_name VARCHAR(50) NOT NULL,
-    parent_id BIGINT DEFAULT 0,
-    order_num INTEGER DEFAULT 0,
-    menu_type VARCHAR(1) DEFAULT 'C',
-    perms VARCHAR(100),
-    component VARCHAR(200),
-    status INTEGER DEFAULT 1,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- 字典相关表
--- ============================================
-
--- 字典类型表
-CREATE TABLE IF NOT EXISTS sys_dict_type (
-    id BIGSERIAL PRIMARY KEY,
-    dict_name VARCHAR(100) NOT NULL,
-    dict_type VARCHAR(100) NOT NULL UNIQUE,
-    status VARCHAR(1) DEFAULT '0',
-    remark VARCHAR(500),
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 字典数据表
-CREATE TABLE IF NOT EXISTS sys_dict_data (
-    id BIGSERIAL PRIMARY KEY,
-    dict_sort INTEGER DEFAULT 0,
-    dict_label VARCHAR(100) NOT NULL,
-    dict_value VARCHAR(100) NOT NULL,
-    dict_type VARCHAR(100) NOT NULL,
-    css_class VARCHAR(100),
-    list_class VARCHAR(100),
-    is_default VARCHAR(1) DEFAULT 'N',
-    status VARCHAR(1) DEFAULT '0',
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 字典表（通用字典）
-CREATE TABLE IF NOT EXISTS sys_dictionary (
-    id BIGSERIAL PRIMARY KEY,
-    type VARCHAR(100) NOT NULL,
-    code VARCHAR(100) NOT NULL,
-    name VARCHAR(100) NOT NULL,
-    value VARCHAR(500),
-    remark VARCHAR(500),
-    sort INTEGER DEFAULT 0,
-    create_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- 系统配置表
--- ============================================
-
--- 系统配置表
-CREATE TABLE IF NOT EXISTS sys_config (
-    id BIGSERIAL PRIMARY KEY,
-    config_name VARCHAR(100) NOT NULL,
-    config_key VARCHAR(100) NOT NULL UNIQUE,
-    config_value VARCHAR(500) NOT NULL,
-    config_type VARCHAR(1) DEFAULT 'N',
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- 日志相关表
--- ============================================
-
--- 登录日志表
-CREATE TABLE IF NOT EXISTS sys_login_log (
-    id BIGSERIAL PRIMARY KEY,
-    username VARCHAR(50),
-    ip VARCHAR(50),
-    location VARCHAR(255),
-    browser VARCHAR(50),
-    os VARCHAR(50),
-    status VARCHAR(1),
-    message VARCHAR(255),
-    login_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
--- 异常日志表
-CREATE TABLE IF NOT EXISTS sys_exception_log (
-    id BIGSERIAL PRIMARY KEY,
-    username VARCHAR(50),
-    title VARCHAR(100),
-    exception_name VARCHAR(100),
-    method_name VARCHAR(255),
-    method_params TEXT,
-    exception_msg TEXT,
-    exception_stack TEXT,
-    ip VARCHAR(50),
-    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
--- 操作日志表
-CREATE TABLE IF NOT EXISTS operation_log (
-    id BIGSERIAL PRIMARY KEY,
-    username VARCHAR(50),
-    operation VARCHAR(100),
-    method VARCHAR(200),
-    params TEXT,
-    result TEXT,
-    ip VARCHAR(50),
-    duration BIGINT,
-    status VARCHAR(1) DEFAULT '0',
-    error_msg TEXT,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 审计日志表
-CREATE TABLE IF NOT EXISTS audit_log (
-    id BIGSERIAL PRIMARY KEY,
-    entity_type VARCHAR(100) NOT NULL,
-    entity_id BIGINT,
-    operation_type VARCHAR(20) NOT NULL,
-    operator VARCHAR(100),
-    operation_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    before_data JSONB,
-    after_data JSONB,
-    changed_fields TEXT[],
-    ip_address VARCHAR(50),
-    user_agent TEXT,
-    description TEXT,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 审计日志归档表
-CREATE TABLE IF NOT EXISTS audit_log_archive (
-    id BIGSERIAL PRIMARY KEY,
-    entity_type VARCHAR(100) NOT NULL,
-    entity_id BIGINT,
-    operation_type VARCHAR(20) NOT NULL,
-    operator VARCHAR(100),
-    operation_time TIMESTAMP,
-    before_data JSONB,
-    after_data JSONB,
-    changed_fields TEXT[],
-    ip_address VARCHAR(50),
-    user_agent TEXT,
-    description TEXT,
-    created_at TIMESTAMP,
-    archived_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
--- ============================================
--- 通知与消息表
--- ============================================
-
--- 系统公告表
-CREATE TABLE IF NOT EXISTS sys_notice (
-    id BIGSERIAL PRIMARY KEY,
-    notice_title VARCHAR(50) NOT NULL,
-    notice_type VARCHAR(1) NOT NULL,
-    notice_content TEXT,
-    status VARCHAR(1) DEFAULT '0',
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- 用户消息表
-CREATE TABLE IF NOT EXISTS sys_user_message (
-    id BIGSERIAL PRIMARY KEY,
-    user_id BIGINT NOT NULL,
-    notice_id BIGINT,
-    message_title VARCHAR(255),
-    message_content TEXT,
-    is_read VARCHAR(1) DEFAULT '0',
-    read_time TIMESTAMP,
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- 文件管理表
--- ============================================
-
--- 文件管理表
-CREATE TABLE IF NOT EXISTS sys_file (
-    id BIGSERIAL PRIMARY KEY,
-    file_name VARCHAR(255) NOT NULL,
-    file_path VARCHAR(500) NOT NULL,
-    file_size BIGINT,
-    file_type VARCHAR(100),
-    file_extension VARCHAR(10),
-    storage_type VARCHAR(50),
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- OAuth2相关表
--- ============================================
-
--- OAuth2客户端表
-CREATE TABLE IF NOT EXISTS oauth2_client (
-    id BIGSERIAL PRIMARY KEY,
-    client_id VARCHAR(100) NOT NULL UNIQUE,
-    client_secret VARCHAR(255) NOT NULL,
-    client_name VARCHAR(100),
-    web_server_redirect_uri VARCHAR(500),
-    scope VARCHAR(500),
-    authorized_grant_types VARCHAR(500),
-    access_token_validity_seconds INTEGER,
-    refresh_token_validity_seconds INTEGER,
-    auto_approve VARCHAR(1) DEFAULT 'false',
-    enabled VARCHAR(1) DEFAULT 'true',
-    create_by VARCHAR(50),
-    update_by VARCHAR(50),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
--- ============================================
--- 表注释
--- ============================================
-
-COMMENT ON TABLE sys_user IS '系统用户表';
-COMMENT ON TABLE sys_role IS '系统角色表';
-COMMENT ON TABLE user_role IS '用户角色关联表';
-COMMENT ON TABLE sys_permission IS '系统权限表';
-COMMENT ON TABLE sys_role_permission IS '角色权限关联表';
-COMMENT ON TABLE sys_menu IS '系统菜单表';
-COMMENT ON TABLE sys_dict_type IS '字典类型表';
-COMMENT ON TABLE sys_dict_data IS '字典数据表';
-COMMENT ON TABLE sys_dictionary IS '通用字典表';
-COMMENT ON TABLE sys_config IS '系统配置表';
-COMMENT ON TABLE sys_login_log IS '登录日志表';
-COMMENT ON TABLE sys_exception_log IS '异常日志表';
-COMMENT ON TABLE operation_log IS '操作日志表';
-COMMENT ON TABLE audit_log IS '审计日志表';
-COMMENT ON TABLE audit_log_archive IS '审计日志归档表';
-COMMENT ON TABLE sys_notice IS '系统公告表';
-COMMENT ON TABLE sys_user_message IS '用户消息表';
-COMMENT ON TABLE sys_file IS '文件管理表';
-COMMENT ON TABLE oauth2_client IS 'OAuth2客户端表';
-
-COMMENT ON TABLE sys_exception_log IS '异常日志表';
-COMMENT ON COLUMN sys_exception_log.id IS '主键ID';
-COMMENT ON COLUMN sys_exception_log.username IS '操作用户';
-COMMENT ON COLUMN sys_exception_log.title IS '异常标题';
-COMMENT ON COLUMN sys_exception_log.exception_name IS '异常名称';
-COMMENT ON COLUMN sys_exception_log.method_name IS '方法名称';
-COMMENT ON COLUMN sys_exception_log.method_params IS '方法参数';
-COMMENT ON COLUMN sys_exception_log.exception_msg IS '异常消息';
-COMMENT ON COLUMN sys_exception_log.exception_stack IS '异常堆栈';
-COMMENT ON COLUMN sys_exception_log.ip IS 'IP地址';
-COMMENT ON COLUMN sys_exception_log.create_time IS '创建时间';
-
-COMMENT ON TABLE audit_log IS '审计日志表';
-COMMENT ON COLUMN audit_log.id IS '主键ID';
-COMMENT ON COLUMN audit_log.entity_type IS '实体类型（如User, Role等）';
-COMMENT ON COLUMN audit_log.entity_id IS '实体ID';
-COMMENT ON COLUMN audit_log.operation_type IS '操作类型（CREATE, UPDATE, DELETE）';
-COMMENT ON COLUMN audit_log.operator IS '操作人';
-COMMENT ON COLUMN audit_log.operation_time IS '操作时间';
-COMMENT ON COLUMN audit_log.before_data IS '变更前数据（JSON格式）';
-COMMENT ON COLUMN audit_log.after_data IS '变更后数据（JSON格式）';
-COMMENT ON COLUMN audit_log.changed_fields IS '变更字段列表';
-COMMENT ON COLUMN audit_log.ip_address IS 'IP地址';
-COMMENT ON COLUMN audit_log.description IS '操作描述';
-COMMENT ON COLUMN audit_log.created_at IS '记录创建时间';
-
-COMMENT ON TABLE audit_log_archive IS '审计日志归档表';
-COMMENT ON COLUMN audit_log_archive.id IS '主键ID';
-COMMENT ON COLUMN audit_log_archive.entity_type IS '实体类型（如User, Role等）';
-COMMENT ON COLUMN audit_log_archive.entity_id IS '实体ID';
-COMMENT ON COLUMN audit_log_archive.operation_type IS '操作类型（CREATE, UPDATE, DELETE）';
-COMMENT ON COLUMN audit_log_archive.operator IS '操作人';
-COMMENT ON COLUMN audit_log_archive.operation_time IS '操作时间';
-COMMENT ON COLUMN audit_log_archive.before_data IS '变更前数据（JSON格式）';
-COMMENT ON COLUMN audit_log_archive.after_data IS '变更后数据（JSON格式）';
-COMMENT ON COLUMN audit_log_archive.changed_fields IS '变更字段列表';
-COMMENT ON COLUMN audit_log_archive.ip_address IS 'IP地址';
-COMMENT ON COLUMN audit_log_archive.user_agent IS '用户代理';
-COMMENT ON COLUMN audit_log_archive.description IS '操作描述';
-COMMENT ON COLUMN audit_log_archive.created_at IS '记录创建时间';
-COMMENT ON COLUMN audit_log_archive.archived_at IS '归档时间';

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/exmp.txt

@@ -0,0 +1,87 @@
+一、基础有氧与热身（难度 1-3）
+
+主要是低冲击、低技巧，用于建立运动基础。
+
+    慢走/椭圆机轻松模式：1（几乎无难度，适合所有人）
+
+    固定自行车（低阻力）：2（注意座椅高度调节即可）
+
+    跑步机慢跑：3（需要基本协调性，膝盖有压力）
+
+    跳绳（连续基础跳）：3（需要手脚配合，心肺要求明显）
+
+二、固定器械训练（难度 2-5）
+
+轨迹固定，主要考验力量和耐力，技巧要求低。
+
+    坐姿腿屈伸/腿弯举：2（很容易找到发力感）
+
+    坐姿推胸机：3（需注意肩胛后收，避免耸肩）
+
+    高位下拉（坐姿）：3（需控制不要过度后仰）
+
+    史密斯机深蹲：4（轨迹固定，但需保持核心稳定）
+
+    蝴蝶机夹胸：3（易用肘关节代偿，需锁定肩关节）
+
+三、自重基础动作（难度 3-7）
+
+需要一定的力量-体重比和身体控制能力。
+
+    平板支撑：3（耐力考验，技巧低）
+
+    跪姿俯卧撑：3（上肢力量较弱者首选）
+
+    标准俯卧撑：5（需核心收紧，身体成直线）
+
+    引体向上（弹力带辅助）：6（背部和手臂力量要求高）
+
+    标准引体向上：8（力量-体重比极高，多数男性无法完成1次）
+
+    徒手深蹲：3（注意膝盖方向与背部直立）
+
+    单腿深蹲（手枪蹲）：8（需要极高下肢力量、柔韧性和平衡）
+
+四、自由重量杠铃/哑铃（难度 5-9）
+
+技巧风险最高，需要神经系统协调和长期动作打磨。
+
+    哑铃二头弯举：4（容易晃动借力，但较安全）
+
+    哑铃侧平举：5（极易用斜方肌代偿，真正练到三角肌中束很难）
+
+    杠铃卧推：7（肩关节压力大，起桥、沉肩、稳定手腕均有技巧，有压伤风险）
+
+    杠铃深蹲（颈后）：8（全身协调性、核心抗压、杠位放置、呼吸模式，学习曲线陡峭）
+
+    传统硬拉：9（风险极高，需要精确的脊柱中立、髋铰链、背阔肌收紧，错误时伤腰）
+
+    高翻/抓举（奥运举重）：10（需要爆发力、柔韧、精准衔接，非数月训练不能掌握）
+
+五、高强度与爆发力（难度 6-10）
+
+对心肺、神经系统和恢复能力要求极高。
+
+    波比跳（标准版）：6（连续做时心肺压力极大）
+
+    冲刺跑（短跑）：7（对腘绳肌和脚踝爆发力要求高）
+
+    跳箱（合理高度）：6（需要落地缓冲技巧）
+
+    负重雪橇推：6（主要考验腿部耐力和意志力）
+
+    双力臂（引体向上后翻腕上杠）：9（需要爆发引体 + 极高相对力量）
+
+六、柔韧与平衡类（难度 3-8）
+
+考验本体感觉和关节活动度。
+
+    静态拉伸（坐姿体前屈）：2（无风险，但需要坚持）
+
+    瑜伽下犬式：3（常见，但需背部与手臂对齐）
+
+    单腿罗马尼亚硬拉（徒手）：6（极考验平衡和髋稳定）
+
+    全深蹲（脚跟贴地，亚洲蹲）：5（踝关节灵活度限制多数人）
+
+    竖叉/横叉：8（需要数月甚至数年拉伸）

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

@@ -0,0 +1,111 @@
+<?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>
+
+    <groupId>cn.novalon.gym.manage</groupId>
+    <artifactId>gym-auth</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Auth</name>
+    <description>Authentication module for Gym Management System</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>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-sys</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</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.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,23 @@
+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 = "alibaba.cloud.sms")
+public class SmsProperties {
+
+    private String accessKeyId;
+
+    private String accessKeySecret;
+
+    private String signName;
+
+    private String templateCode;
+
+    private int codeLength = 4;
+
+    private long codeExpireSeconds = 300;
+}

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

@@ -0,0 +1,23 @@
+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;
+
+@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 jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    private String nickname;
+
+    private String avatar;
+}

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

@@ -0,0 +1,58 @@
+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.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(PhoneLoginDto.class)
+                .flatMap(dto -> phoneAuthService.sendSmsCode(dto.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,15 @@
+package cn.novalon.gym.manage.auth.service;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import reactor.core.publisher.Mono;
+
+public interface PhoneAuthService {
+
+    Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
+
+    Mono<Boolean> sendSmsCode(String phone);
+
+    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,177 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+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.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@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 EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
+
+    @PostConstruct
+    public void init() {
+        this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
+        log.info("手机号一键登录, phone: {}", request.getPhone());
+
+        String encryptedPhone = encryptPhone(request.getPhone());
+
+        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);
+                }));
+    }
+
+    @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();
+                                registerRequest.setPhone(request.getPhone());
+                                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(decryptPhone(member.getPhone()));
+        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,33 @@
+package cn.novalon.gym.manage.auth.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@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 @@
+cn.novalon.gym.manage.auth.config.SmsProperties

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;

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-dataCount/pom.xml

@@ -100,8 +100,20 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <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>

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

@@ -35,6 +35,11 @@
             <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>
@@ -81,6 +86,25 @@
             <artifactId>gym-member</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- ZXing二维码生成库 -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+
+        <!-- 阿里云OSS SDK -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.17.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -4,8 +4,10 @@ package cn.novalon.gym.manage.groupcourse.converter;
 import cn.hutool.core.bean.BeanUtil;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseTypeEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -124,4 +126,33 @@ public class GroupCourseConverter {
                 .map(this::toBookingEntity)
                 .collect(Collectors.toList());
     }
+
+    /**
+     * 将团课类型实体转换为领域模型
+     */
+    public GroupCourseType toGroupCourseType(GroupCourseTypeEntity entity){
+        if(entity == null){
+            return null;
+        }
+        GroupCourseType groupCourseType = new GroupCourseType();
+        BeanUtil.copyProperties(entity, groupCourseType);
+        log.debug("转换团课类型实体到领域模型：typeId={}", entity.getId());
+        return groupCourseType;
+    }
+
+    /**
+     * 将团课类型领域模型转换为实体
+     */
+    public GroupCourseTypeEntity toGroupCourseTypeEntity(GroupCourseType domain){
+        if(domain == null){
+            return null;
+        }
+        GroupCourseTypeEntity entity = new GroupCourseTypeEntity();
+        BeanUtil.copyProperties(domain, entity);
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        log.debug("转换团课类型领域模型到实体：typeId={}", domain.getId());
+        return entity;
+    }
 }

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

@@ -0,0 +1,27 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.CourseLabelEntity;
+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 CourseLabelDao extends R2dbcRepository<CourseLabelEntity, Long> {
+
+    Mono<CourseLabelEntity> findByIdIsAndDeletedAtIsNull(Long id);
+
+    Flux<CourseLabelEntity> findAllByDeletedAtIsNull();
+
+    Flux<CourseLabelEntity> findByLabelNameContainingAndDeletedAtIsNull(String labelName);
+
+    Mono<CourseLabelEntity> findByLabelNameAndDeletedAtIsNull(String labelName);
+
+    @Modifying
+    @Query("UPDATE course_label SET deleted_at = :deletedAt WHERE id = :id")
+    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
+}

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

@@ -0,0 +1,38 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.CourseTypeLabelEntity;
+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;
+import java.util.List;
+
+@Repository
+public interface CourseTypeLabelDao extends R2dbcRepository<CourseTypeLabelEntity, Long> {
+
+    Flux<CourseTypeLabelEntity> findByTypeIdAndDeletedAtIsNull(Long typeId);
+
+    Flux<CourseTypeLabelEntity> findByLabelIdAndDeletedAtIsNull(Long labelId);
+
+    Mono<CourseTypeLabelEntity> findByTypeIdAndLabelIdAndDeletedAtIsNull(Long typeId, Long labelId);
+
+    @Modifying
+    @Query("UPDATE course_type_label SET deleted_at = :deletedAt WHERE type_id = :typeId AND label_id = :labelId")
+    Mono<Integer> deleteByTypeIdAndLabelId(Long typeId, Long labelId, LocalDateTime deletedAt);
+
+    @Modifying
+    @Query("UPDATE course_type_label SET deleted_at = :deletedAt WHERE type_id = :typeId")
+    Mono<Integer> deleteByTypeId(Long typeId, LocalDateTime deletedAt);
+
+    @Modifying
+    @Query("DELETE FROM course_type_label WHERE type_id = :typeId AND label_id = :labelId")
+    Mono<Integer> physicalDeleteByTypeIdAndLabelId(Long typeId, Long labelId);
+
+    @Modifying
+    @Query("UPDATE course_type_label SET deleted_at = :deletedAt WHERE label_id = :labelId")
+    Mono<Integer> deleteByLabelId(Long labelId, LocalDateTime deletedAt);
+}

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

@@ -1,16 +1,19 @@
-
 package cn.novalon.gym.manage.groupcourse.dao;
 
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.repository.Modifying;
 import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Repository
 public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long> {
@@ -36,4 +39,191 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
     @Modifying
     @Query("UPDATE group_course SET deleted_at = :deletedAt WHERE id = :id")
     Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
-}
+
+    @Modifying
+    @Query("UPDATE group_course SET status = '2', updated_at = :updatedAt WHERE status = '0' AND end_time <= NOW() AND deleted_at IS NULL")
+    Mono<Integer> completeExpiredCourses(LocalDateTime updatedAt);
+
+    Flux<GroupCourseEntity> findByCourseTypeAndDeletedAtIsNull(Long courseType);
+
+    /**
+     * 多条件查询团课（使用 DatabaseClient 构建动态 SQL）
+     */
+    default Flux<GroupCourseEntity> searchGroupCourses(DatabaseClient databaseClient, GroupCourseQueryDto query) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        // 默认不查询可预约团课（status = '0' 且未过期）
+        conditions.add("status = '0'");
+        conditions.add("end_time > NOW()");
+
+        // 1. 团课名称模糊查询
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            conditions.add("course_name ILIKE :courseName");
+        }
+
+        // 2. 基于团课类型查询
+        if (query.getCourseType() != null) {
+            conditions.add("course_type = :courseType");
+        }
+
+        // 3. 基于日期时间段查询
+        if (query.getStartDate() != null) {
+            conditions.add("start_time >= :startDate");
+        }
+        if (query.getEndDate() != null) {
+            conditions.add("start_time <= :endDate");
+        }
+
+        // 4. 基于早晨/下午/夜晚时间段查询
+        if (query.getTimePeriod() != null && !query.getTimePeriod().isEmpty()) {
+            switch (query.getTimePeriod().toLowerCase()) {
+                case "morning":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 6 AND EXTRACT(HOUR FROM start_time) < 12");
+                    break;
+                case "afternoon":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 12 AND EXTRACT(HOUR FROM start_time) < 18");
+                    break;
+                case "evening":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 18 AND EXTRACT(HOUR FROM start_time) < 24");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        sql.append(" AND ").append(String.join(" AND ", conditions));
+
+        // 5. 价格排序 / 6. 剩余名额最多排序
+        boolean hasPriceSort = query.getPriceSort() != null && !query.getPriceSort().isEmpty();
+        boolean hasRemainingMost = query.getRemainingMost() != null && query.getRemainingMost();
+
+        if (hasPriceSort || hasRemainingMost) {
+            sql.append(" ORDER BY");
+            List<String> orderClauses = new ArrayList<>();
+
+            if (hasRemainingMost) {
+                orderClauses.add(" (max_members - current_members) DESC");
+            }
+
+            if (hasPriceSort) {
+                if ("asc".equalsIgnoreCase(query.getPriceSort())) {
+                    orderClauses.add(" stored_value_amount ASC");
+                } else if ("desc".equalsIgnoreCase(query.getPriceSort())) {
+                    orderClauses.add(" stored_value_amount DESC");
+                }
+            }
+
+            sql.append(String.join(",", orderClauses));
+        } else {
+            sql.append(" ORDER BY start_time ASC");
+        }
+
+        // 分页
+        int page = query.getPage() != null ? query.getPage() : 0;
+        int size = query.getSize() != null ? query.getSize() : 10;
+        if (size < 1) size = 10;
+        if (size > 100) size = 100;
+        int offset = page * size;
+        sql.append(" LIMIT :limit OFFSET :offset");
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            spec = spec.bind("courseName", "%" + query.getCourseName() + "%");
+        }
+        if (query.getCourseType() != null) {
+            spec = spec.bind("courseType", query.getCourseType());
+        }
+        if (query.getStartDate() != null) {
+            spec = spec.bind("startDate", query.getStartDate());
+        }
+        if (query.getEndDate() != null) {
+            spec = spec.bind("endDate", query.getEndDate());
+        }
+        spec = spec.bind("limit", size);
+        spec = spec.bind("offset", offset);
+
+        return spec.map((row, meta) -> {
+            GroupCourseEntity entity = new GroupCourseEntity();
+            entity.setId(row.get("id", Long.class));
+            entity.setCourseName(row.get("course_name", String.class));
+            entity.setCoachId(row.get("coach_id", Long.class));
+            entity.setCourseType(row.get("course_type", Long.class));
+            entity.setStartTime(row.get("start_time", LocalDateTime.class));
+            entity.setEndTime(row.get("end_time", LocalDateTime.class));
+            entity.setMaxMembers(row.get("max_members", Integer.class));
+            entity.setCurrentMembers(row.get("current_members", Integer.class));
+            String statusStr = row.get("status", String.class);
+            entity.setStatus(statusStr != null ? Long.parseLong(statusStr) : null);
+            entity.setLocation(row.get("location", String.class));
+            entity.setCoverImage(row.get("cover_image", String.class));
+            entity.setDescription(row.get("description", String.class));
+            entity.setStoredValueAmount(row.get("stored_value_amount", java.math.BigDecimal.class));
+            entity.setCreateBy(row.get("create_by", String.class));
+            entity.setUpdateBy(row.get("update_by", String.class));
+            entity.setCreatedAt(row.get("created_at", LocalDateTime.class));
+            entity.setUpdatedAt(row.get("updated_at", LocalDateTime.class));
+            entity.setDeletedAt(row.get("deleted_at", LocalDateTime.class));
+            return entity;
+        }).all();
+    }
+
+    /**
+     * 多条件查询团课总数
+     */
+    default Mono<Long> countSearchGroupCourses(DatabaseClient databaseClient, GroupCourseQueryDto query) {
+        StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        conditions.add("status = '0'");
+        conditions.add("end_time > NOW()");
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            conditions.add("course_name ILIKE :courseName");
+        }
+        if (query.getCourseType() != null) {
+            conditions.add("course_type = :courseType");
+        }
+        if (query.getStartDate() != null) {
+            conditions.add("start_time >= :startDate");
+        }
+        if (query.getEndDate() != null) {
+            conditions.add("start_time <= :endDate");
+        }
+        if (query.getTimePeriod() != null && !query.getTimePeriod().isEmpty()) {
+            switch (query.getTimePeriod().toLowerCase()) {
+                case "morning":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 6 AND EXTRACT(HOUR FROM start_time) < 12");
+                    break;
+                case "afternoon":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 12 AND EXTRACT(HOUR FROM start_time) < 18");
+                    break;
+                case "evening":
+                    conditions.add("EXTRACT(HOUR FROM start_time) >= 18 AND EXTRACT(HOUR FROM start_time) < 24");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        sql.append(" AND ").append(String.join(" AND ", conditions));
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
+            spec = spec.bind("courseName", "%" + query.getCourseName() + "%");
+        }
+        if (query.getCourseType() != null) {
+            spec = spec.bind("courseType", query.getCourseType());
+        }
+        if (query.getStartDate() != null) {
+            spec = spec.bind("startDate", query.getStartDate());
+        }
+        if (query.getEndDate() != null) {
+            spec = spec.bind("endDate", query.getEndDate());
+        }
+
+        return spec.map((row, meta) -> row.get(0, Long.class)).one();
+    }
+}

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

@@ -0,0 +1,42 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseRecommendEntity;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.repository.Modifying;
+import org.springframework.data.r2dbc.repository.Query;
+import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public interface GroupCourseRecommendDao extends R2dbcRepository<GroupCourseRecommendEntity, Long> {
+
+    Mono<GroupCourseRecommendEntity> findByIdAndDeletedAtIsNull(Long id);
+
+    Flux<GroupCourseRecommendEntity> findAllByDeletedAtIsNull();
+
+    Flux<GroupCourseRecommendEntity> findAllByDeletedAtIsNull(Sort sort);
+
+    Flux<GroupCourseRecommendEntity> findByCourseIdAndDeletedAtIsNull(Long courseId);
+
+    Mono<GroupCourseRecommendEntity> findByCourseIdAndDeletedAtIsNullAndIsActiveTrue(Long courseId);
+
+    Flux<GroupCourseRecommendEntity> findByIsActiveTrueAndDeletedAtIsNull();
+
+    Flux<GroupCourseRecommendEntity> findByIsActiveTrueAndDeletedAtIsNull(Sort sort);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET is_active = :isActive, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateActiveStatus(Long id, Boolean isActive, LocalDateTime updatedAt);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET deleted_at = :deletedAt WHERE id = :id")
+    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
+
+    @Modifying
+    @Query("UPDATE group_course_recommend SET deleted_at = :deletedAt WHERE course_id = :courseId")
+    Mono<Integer> softDeleteByCourseId(Long courseId, LocalDateTime deletedAt);
+}

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

@@ -0,0 +1,32 @@
+package cn.novalon.gym.manage.groupcourse.dao;
+
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseTypeEntity;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.repository.Modifying;
+import org.springframework.data.r2dbc.repository.Query;
+import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public interface GroupCourseTypeDao extends R2dbcRepository<GroupCourseTypeEntity, Long> {
+
+    Mono<GroupCourseTypeEntity> findByIdIsAndDeletedAtIsNull(Long id);
+
+    Flux<GroupCourseTypeEntity> findAllByDeletedAtIsNull();
+
+    Flux<GroupCourseTypeEntity> findAllByDeletedAtIsNull(Sort sort);
+
+    Flux<GroupCourseTypeEntity> findByTypeNameContainingAndDeletedAtIsNull(String typeName);
+
+    Flux<GroupCourseTypeEntity> findByCategoryAndDeletedAtIsNull(String category);
+
+    Mono<GroupCourseTypeEntity> findByTypeNameAndDeletedAtIsNull(String typeName);
+
+    @Modifying
+    @Query("UPDATE group_course_type SET deleted_at = :deletedAt WHERE id = :id")
+    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
+}

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

@@ -0,0 +1,43 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class CourseLabel extends BaseDomain {
+
+    //标签名称
+    @Schema(description = "标签名称", example = "适合新手")
+    private String labelName;
+
+    //标签颜色（十六进制）
+    @Schema(description = "标签颜色（十六进制）", example = "#52c41a")
+    private String color;
+
+    //标签描述
+    @Schema(description = "标签描述", example = "适合健身初学者")
+    private String description;
+
+    public String getLabelName() {
+        return labelName;
+    }
+
+    public void setLabelName(String labelName) {
+        this.labelName = labelName;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

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

@@ -52,14 +52,14 @@ public class GroupCourse extends BaseDomain{
     @Schema(description = "课程描述", example = "从入门到入土")
     private String description;
 
-    //点卡额度（消耗次数）
-    @Schema(description = "点卡额度（消耗次数）", example = "1")
-    private Integer pointCardAmount;
-
     //储值卡额度（消耗金额）
     @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
     private java.math.BigDecimal storedValueAmount;
 
+    //二维码路径
+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
     public String getCourseName() {
         return courseName;
     }
@@ -148,14 +148,6 @@ public class GroupCourse extends BaseDomain{
         this.description = description;
     }
 
-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
     public java.math.BigDecimal getStoredValueAmount() {
         return storedValueAmount;
     }
@@ -163,4 +155,12 @@ public class GroupCourse extends BaseDomain{
     public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
         this.storedValueAmount = storedValueAmount;
     }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }

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

@@ -0,0 +1,254 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 团课完整信息领域模型
+ * 包含团课基础信息、关联的类型信息以及类型的标签信息
+ */
+public class GroupCourseDetail extends BaseDomain {
+
+    // ===== 团课基础信息 =====
+    
+    @Schema(description = "课程名称", example = "瑜伽入门")
+    private String courseName;
+
+    @Schema(description = "教练ID", example = "1")
+    private Long coachId;
+
+    @Schema(description = "课程类型ID", example = "1")
+    private Long courseType;
+
+    @Schema(description = "开始时间", example = "2026-06-02T09:00:00")
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间", example = "2026-06-02T10:00:00")
+    private LocalDateTime endTime;
+
+    @Schema(description = "最大参与人数", example = "20")
+    private Integer maxMembers;
+
+    @Schema(description = "当前参与人数", example = "15")
+    private Integer currentMembers;
+
+    @Schema(description = "课程状态", example = "0")
+    private Long status;
+
+    @Schema(description = "上课地点", example = "健身房A区")
+    private String location;
+
+    @Schema(description = "封面图URL", example = "https://example.com/yoga.jpg")
+    private String coverImage;
+
+    @Schema(description = "课程描述", example = "适合初学者的瑜伽课程")
+    private String description;
+
+    @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
+    private BigDecimal storedValueAmount;
+
+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
+    // ===== 关联的类型信息 =====
+
+    @Schema(description = "类型信息")
+    private GroupCourseType typeInfo;
+
+    // ===== 快捷访问属性（从类型信息派生）=====
+
+    @Schema(description = "类型名称", example = "瑜伽入门")
+    private String typeName;
+
+    @Schema(description = "类型分类", example = "柔韧与平衡类")
+    private String typeCategory;
+
+    @Schema(description = "基础难度", example = "2")
+    private Integer baseDifficulty;
+
+    @Schema(description = "难度等级描述", example = "初级")
+    private String difficultyLevel;
+
+    @Schema(description = "综合难度系数", example = "2")
+    private Integer calculatedDifficulty;
+
+    // ===== 标签信息（从类型标签派生）=====
+
+    @Schema(description = "标签列表")
+    private List<CourseLabel> labels;
+
+    // ===== Getters and Setters =====
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Long getCoachId() {
+        return coachId;
+    }
+
+    public void setCoachId(Long coachId) {
+        this.coachId = coachId;
+    }
+
+    public Long getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(Long courseType) {
+        this.courseType = courseType;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getMaxMembers() {
+        return maxMembers;
+    }
+
+    public void setMaxMembers(Integer maxMembers) {
+        this.maxMembers = maxMembers;
+    }
+
+    public Integer getCurrentMembers() {
+        return currentMembers;
+    }
+
+    public void setCurrentMembers(Integer currentMembers) {
+        this.currentMembers = currentMembers;
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getCoverImage() {
+        return coverImage;
+    }
+
+    public void setCoverImage(String coverImage) {
+        this.coverImage = coverImage;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public BigDecimal getStoredValueAmount() {
+        return storedValueAmount;
+    }
+
+    public void setStoredValueAmount(BigDecimal storedValueAmount) {
+        this.storedValueAmount = storedValueAmount;
+    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
+
+    public GroupCourseType getTypeInfo() {
+        return typeInfo;
+    }
+
+    public void setTypeInfo(GroupCourseType typeInfo) {
+        this.typeInfo = typeInfo;
+        // 同步派生属性
+        if (typeInfo != null) {
+            this.typeName = typeInfo.getTypeName();
+            this.typeCategory = typeInfo.getCategory();
+            this.baseDifficulty = typeInfo.getBaseDifficulty();
+            this.difficultyLevel = typeInfo.getDifficultyLevel();
+            this.calculatedDifficulty = typeInfo.getCalculatedDifficulty();
+            this.labels = typeInfo.getLabels();
+        }
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeCategory() {
+        return typeCategory;
+    }
+
+    public void setTypeCategory(String typeCategory) {
+        this.typeCategory = typeCategory;
+    }
+
+    public Integer getBaseDifficulty() {
+        return baseDifficulty;
+    }
+
+    public void setBaseDifficulty(Integer baseDifficulty) {
+        this.baseDifficulty = baseDifficulty;
+    }
+
+    public String getDifficultyLevel() {
+        return difficultyLevel;
+    }
+
+    public void setDifficultyLevel(String difficultyLevel) {
+        this.difficultyLevel = difficultyLevel;
+    }
+
+    public Integer getCalculatedDifficulty() {
+        return calculatedDifficulty;
+    }
+
+    public void setCalculatedDifficulty(Integer calculatedDifficulty) {
+        this.calculatedDifficulty = calculatedDifficulty;
+    }
+
+    public List<CourseLabel> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<CourseLabel> labels) {
+        this.labels = labels;
+    }
+}

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

@@ -0,0 +1,84 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class GroupCourseRecommend extends BaseDomain {
+
+    @Schema(description = "团课ID", example = "1")
+    private Long courseId;
+
+    @Schema(description = "推荐标题", example = "本周热门课程")
+    private String recommendTitle;
+
+    @Schema(description = "推荐内容", example = "这是一门非常棒的课程，快来参加吧！")
+    private String recommendContent;
+
+    @Schema(description = "推荐理由", example = "教练专业，课程内容丰富")
+    private String recommendReason;
+
+    @Schema(description = "优先级（数字越大优先级越高）", example = "10")
+    private Integer priority;
+
+    @Schema(description = "是否启用", example = "true")
+    private Boolean isActive;
+
+    @Schema(description = "团课信息")
+    private GroupCourse groupCourse;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+
+    public GroupCourse getGroupCourse() {
+        return groupCourse;
+    }
+
+    public void setGroupCourse(GroupCourse groupCourse) {
+        this.groupCourse = groupCourse;
+    }
+}

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

@@ -0,0 +1,113 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GroupCourseType extends BaseDomain {
+
+    //类型名称
+    @Schema(description = "类型名称", example = "瑜伽入门")
+    private String typeName;
+
+    //基础难度（1-10）
+    @Schema(description = "基础难度（1-10）", example = "2")
+    private Integer baseDifficulty;
+
+    //类型描述
+    @Schema(description = "类型描述", example = "适合初学者的瑜伽课程")
+    private String description;
+
+    //分类（如：有氧、力量、柔韧等）
+    @Schema(description = "分类", example = "柔韧与平衡类")
+    private String category;
+
+    //标签列表
+    @Schema(description = "标签列表")
+    private List<CourseLabel> labels = new ArrayList<>();
+
+    /**
+     * 计算综合难度系数
+     * 
+     * 当前实现仅返回基础难度，为后续扩展预留空间。
+     * 未来可扩展的影响因素包括：
+     * 1. 课程时长系数（时长越长难度越高）
+     * 2. 教练难度调整系数（教练可根据实际情况微调）
+     * 3. 会员等级适配系数（根据会员等级动态调整显示难度）
+     * 4. 课程强度系数（高强度课程难度加成）
+     * 
+     * @return 综合难度系数（1-10）
+     */
+    @Schema(description = "综合难度系数（预留扩展字段）", example = "2")
+    public Integer getCalculatedDifficulty() {
+        // TODO: 预留扩展点 - 未来可在此处添加更多难度计算逻辑
+        // 例如：return calculateDynamicDifficulty(baseDifficulty, additionalFactors...);
+        return this.baseDifficulty != null ? this.baseDifficulty : 1;
+    }
+
+    /**
+     * 获取难度等级描述
+     * 将数字难度转换为友好的文字描述
+     * 
+     * @return 难度等级描述
+     */
+    @Schema(description = "难度等级描述", example = "初级")
+    public String getDifficultyLevel() {
+        if (baseDifficulty == null) {
+            return "未知";
+        }
+        if (baseDifficulty <= 2) {
+            return "初级";
+        } else if (baseDifficulty <= 4) {
+            return "中级";
+        } else if (baseDifficulty <= 6) {
+            return "中高级";
+        } else if (baseDifficulty <= 8) {
+            return "高级";
+        } else {
+            return "专家级";
+        }
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public Integer getBaseDifficulty() {
+        return baseDifficulty;
+    }
+
+    public void setBaseDifficulty(Integer baseDifficulty) {
+        this.baseDifficulty = baseDifficulty;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public List<CourseLabel> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<CourseLabel> labels) {
+        this.labels = labels;
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dto/GroupCourseQueryDto.java

@@ -0,0 +1,116 @@
+package cn.novalon.gym.manage.groupcourse.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+/**
+ * 团课多条件查询请求DTO
+ *
+ * @author 张翔
+ * @date 2026-06-14
+ */
+@Schema(description = "团课多条件查询参数")
+public class GroupCourseQueryDto {
+
+    @Schema(description = "课程名称（模糊查询）", example = "瑜伽")
+    private String courseName;
+
+    @Schema(description = "课程类型ID", example = "1")
+    private Long courseType;
+
+    @Schema(description = "查询开始日期", example = "2026-06-01T00:00:00")
+    private LocalDateTime startDate;
+
+    @Schema(description = "查询结束日期", example = "2026-06-30T23:59:59")
+    private LocalDateTime endDate;
+
+    @Schema(description = "时间段：morning-早晨(6:00-12:00), afternoon-下午(12:00-18:00), evening-夜晚(18:00-24:00)", example = "morning")
+    private String timePeriod;
+
+    @Schema(description = "价格排序：asc-从低到高, desc-从高到低", example = "asc")
+    private String priceSort;
+
+    @Schema(description = "按剩余名额最多排序", example = "true")
+    private Boolean remainingMost;
+
+    @Schema(description = "页码", example = "0")
+    private Integer page = 0;
+
+    @Schema(description = "每页大小", example = "10")
+    private Integer size = 10;
+
+    // ===== Getters and Setters =====
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Long getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(Long courseType) {
+        this.courseType = courseType;
+    }
+
+    public LocalDateTime getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDateTime startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDateTime getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDateTime endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getTimePeriod() {
+        return timePeriod;
+    }
+
+    public void setTimePeriod(String timePeriod) {
+        this.timePeriod = timePeriod;
+    }
+
+    public String getPriceSort() {
+        return priceSort;
+    }
+
+    public void setPriceSort(String priceSort) {
+        this.priceSort = priceSort;
+    }
+
+    public Boolean getRemainingMost() {
+        return remainingMost;
+    }
+
+    public void setRemainingMost(Boolean remainingMost) {
+        this.remainingMost = remainingMost;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+}

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

@@ -0,0 +1,45 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("course_label")
+public class CourseLabelEntity extends BaseEntity {
+
+    //标签名称
+    @Column("label_name")
+    private String labelName;
+
+    //标签颜色（十六进制）
+    @Column("color")
+    private String color;
+
+    //标签描述
+    @Column("description")
+    private String description;
+
+    public String getLabelName() {
+        return labelName;
+    }
+
+    public void setLabelName(String labelName) {
+        this.labelName = labelName;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

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

@@ -0,0 +1,33 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("course_type_label")
+public class CourseTypeLabelEntity extends BaseEntity {
+
+    //团课类型ID
+    @Column("type_id")
+    private Long typeId;
+
+    //标签ID
+    @Column("label_id")
+    private Long labelId;
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public Long getLabelId() {
+        return labelId;
+    }
+
+    public void setLabelId(Long labelId) {
+        this.labelId = labelId;
+    }
+}

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

@@ -54,14 +54,14 @@ public class GroupCourseEntity extends BaseEntity {
     @Column("description")
     private String description;
 
-    //点卡额度（消耗次数）
-    @Column("point_card_amount")
-    private Integer pointCardAmount;
-
     //储值卡额度（消耗金额）
     @Column("stored_value_amount")
     private java.math.BigDecimal storedValueAmount;
 
+    //二维码路径
+    @Column("qr_code_path")
+    private String qrCodePath;
+
     public String getCourseName() {
         return courseName;
     }
@@ -150,14 +150,6 @@ public class GroupCourseEntity extends BaseEntity {
         this.description = description;
     }
 
-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
     public java.math.BigDecimal getStoredValueAmount() {
         return storedValueAmount;
     }
@@ -165,4 +157,12 @@ public class GroupCourseEntity extends BaseEntity {
     public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
         this.storedValueAmount = storedValueAmount;
     }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }

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

@@ -0,0 +1,77 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.time.LocalDateTime;
+
+@Table("group_course_recommend")
+public class GroupCourseRecommendEntity extends BaseEntity {
+
+    @Column("course_id")
+    private Long courseId;
+
+    @Column("recommend_title")
+    private String recommendTitle;
+
+    @Column("recommend_content")
+    private String recommendContent;
+
+    @Column("recommend_reason")
+    private String recommendReason;
+
+    @Column("priority")
+    private Integer priority;
+
+    @Column("is_active")
+    private Boolean isActive;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+}

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

@@ -0,0 +1,57 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("group_course_type")
+public class GroupCourseTypeEntity extends BaseEntity {
+
+    //类型名称
+    @Column("type_name")
+    private String typeName;
+
+    //基础难度（1-10）
+    @Column("base_difficulty")
+    private Integer baseDifficulty;
+
+    //类型描述
+    @Column("description")
+    private String description;
+
+    //分类（如：有氧、力量、柔韧等）
+    @Column("category")
+    private String category;
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public Integer getBaseDifficulty() {
+        return baseDifficulty;
+    }
+
+    public void setBaseDifficulty(Integer baseDifficulty) {
+        this.baseDifficulty = baseDifficulty;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+}

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

@@ -109,8 +109,8 @@ public class BookingSagaHandler {
 
                                 switch (cardType) {
                                     case COUNT_CARD:
-                                        // 次卡扣除次数
+                                        // 次数卡不再支持团课预约
-                                        return deductCardUsage(recordId, 1, 0.0);
+                                        return Mono.error(new RuntimeException("团课预约仅支持储值卡支付"));
                                     case STORED_VALUE_CARD:
                                         // 储值卡扣除金额
                                         return deductCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
@@ -168,7 +168,8 @@ public class BookingSagaHandler {
 
                                 switch (cardType) {
                                     case COUNT_CARD:
-                                        return restoreCardUsage(recordId, 1, 0.0);
+                                        // 次数卡不再支持团课预约，无需恢复
+                                        return Mono.empty();
                                     case STORED_VALUE_CARD:
                                         return restoreCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
                                     case TIME_CARD:

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

@@ -0,0 +1,217 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
+import cn.novalon.gym.manage.groupcourse.service.ICourseLabelService;
+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.List;
+import java.util.Map;
+
+@Component
+@Tag(name = "团课标签管理", description = "团课标签相关操作")
+public class CourseLabelHandler {
+
+    private final ICourseLabelService courseLabelService;
+
+    public CourseLabelHandler(ICourseLabelService courseLabelService) {
+        this.courseLabelService = courseLabelService;
+    }
+
+    @Operation(summary = "获取所有标签", description = "获取系统中所有标签列表")
+    public Mono<ServerResponse> getAllLabels(ServerRequest request) {
+        return ServerResponse.ok()
+                .body(courseLabelService.findAll(), CourseLabel.class);
+    }
+
+    @Operation(summary = "根据ID获取标签", description = "根据ID获取标签详情")
+    public Mono<ServerResponse> getLabelById(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return courseLabelService.findById(id)
+                .flatMap(label -> ServerResponse.ok().bodyValue(label))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "搜索标签", description = "根据关键词搜索标签")
+    public Mono<ServerResponse> searchLabels(ServerRequest request) {
+        String keyword = request.queryParam("keyword").orElse("");
+        return ServerResponse.ok()
+                .body(courseLabelService.findByKeyword(keyword), CourseLabel.class);
+    }
+
+    @Operation(summary = "创建标签", description = "创建新的标签")
+    public Mono<ServerResponse> createLabel(ServerRequest request) {
+        return request.bodyToMono(CourseLabel.class)
+                .flatMap(courseLabel -> {
+                    if (courseLabel.getLabelName() == null || courseLabel.getLabelName().isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "标签名称不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    if (courseLabel.getLabelName().length() > 50) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "标签名称不能超过50个字符");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    if (courseLabel.getColor() == null || courseLabel.getColor().isEmpty()) {
+                        courseLabel.setColor("#1890ff");
+                    }
+                    
+                    return courseLabelService.create(courseLabel)
+                            .flatMap(label -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "标签创建成功");
+                                response.put("data", label);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "更新标签", description = "更新指定标签信息")
+    public Mono<ServerResponse> updateLabel(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return request.bodyToMono(CourseLabel.class)
+                .flatMap(courseLabel -> {
+                    if (courseLabel.getLabelName() != null && courseLabel.getLabelName().length() > 50) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "标签名称不能超过50个字符");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    return courseLabelService.update(id, courseLabel)
+                            .flatMap(label -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "标签更新成功");
+                                response.put("data", label);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "删除标签", description = "删除指定标签（软删除）")
+    public Mono<ServerResponse> deleteLabel(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return courseLabelService.delete(id)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "标签删除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "获取类型的标签", description = "获取指定团课类型的所有标签")
+    public Mono<ServerResponse> getLabelsByTypeId(ServerRequest request) {
+        Long typeId = Long.valueOf(request.pathVariable("typeId"));
+        return courseLabelService.findByTypeId(typeId)
+                .collectList()
+                .flatMap(list -> ServerResponse.ok().bodyValue(list));
+    }
+
+    @Operation(summary = "为类型添加标签", description = "为指定团课类型添加标签")
+    public Mono<ServerResponse> addLabelsToType(ServerRequest request) {
+        Long typeId = Long.valueOf(request.pathVariable("typeId"));
+        
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    @SuppressWarnings("unchecked")
+                    List<Integer> labelIdsInt = (List<Integer>) body.get("labelIds");
+                    
+                    if (labelIdsInt == null || labelIdsInt.isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "labelIds不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    List<Long> labelIds = labelIdsInt.stream()
+                            .map(Integer::longValue)
+                            .collect(java.util.stream.Collectors.toList());
+                    
+                    return courseLabelService.addLabelsToType(typeId, labelIds)
+                            .then(Mono.defer(() -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "标签添加成功");
+                                return ServerResponse.ok().bodyValue(response);
+                            }))
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "从类型移除标签", description = "从指定团课类型移除标签")
+    public Mono<ServerResponse> removeLabelFromType(ServerRequest request) {
+        Long typeId = Long.valueOf(request.pathVariable("typeId"));
+        Long labelId = Long.valueOf(request.pathVariable("labelId"));
+        
+        return courseLabelService.removeLabelFromType(typeId, labelId)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "标签移除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "清空类型标签", description = "清空指定团课类型的所有标签")
+    public Mono<ServerResponse> clearLabelsFromType(ServerRequest request) {
+        Long typeId = Long.valueOf(request.pathVariable("typeId"));
+        
+        return courseLabelService.clearLabelsFromType(typeId)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "标签清空成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+}

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

@@ -4,6 +4,8 @@ package cn.novalon.gym.manage.groupcourse.handler;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -76,6 +78,14 @@ public class GroupCourseHandler {
                 .switchIfEmpty(ServerResponse.notFound().build());
     }
 
+    @Operation(summary = "根据ID获取团课完整信息", description = "根据ID获取团课完整信息，包括团课基础信息、类型信息和标签信息")
+    public Mono<ServerResponse> getGroupCourseDetailById(ServerRequest request){
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return groupCourseService.findDetailById(id)
+                .flatMap(detail -> ServerResponse.ok().bodyValue(detail))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
     @Operation(summary = "创建团课", description = "创建新的团课")
     public Mono<ServerResponse> createGroupCourse(ServerRequest request) {
         return request.bodyToMono(GroupCourse.class)
@@ -149,7 +159,7 @@ public class GroupCourseHandler {
 
     @Operation(summary = "团课签到", description = "会员签到参加团课")
     public Mono<ServerResponse> signIn(ServerRequest request) {
-        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
         
         return request.bodyToMono(Map.class)
                 .flatMap(body -> {
@@ -160,15 +170,15 @@ public class GroupCourseHandler {
                         return ServerResponse.badRequest().bodyValue(response);
                     }
                     
-                    Object memberIdObj = body.get("memberId");
+                    Object courseIdObj = body.get("courseId");
-                    if (memberIdObj == null) {
+                    if (courseIdObj == null) {
                         Map<String, Object> response = new HashMap<>();
                         response.put("success", false);
-                        response.put("message", "memberId不能为空");
+                        response.put("message", "courseId不能为空");
                         return ServerResponse.badRequest().bodyValue(response);
                     }
                     
-                    Long memberId = ((Number) memberIdObj).longValue();
+                    Long courseId = ((Number) courseIdObj).longValue();
                     
                     return groupCourseService.signIn(courseId, memberId)
                             .flatMap(course -> {
@@ -206,6 +216,27 @@ public class GroupCourseHandler {
                 });
     }
 
+    @Operation(summary = "多条件查询团课", description = "支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询")
+    public Mono<ServerResponse> searchGroupCourses(ServerRequest request) {
+        return request.bodyToMono(GroupCourseQueryDto.class)
+                .flatMap(query -> {
+                    return groupCourseService.searchGroupCourses(query)
+                            .flatMap(response -> {
+                                Map<String, Object> result = new HashMap<>();
+                                result.put("success", true);
+                                result.put("message", "查询成功");
+                                result.put("data", response);
+                                return ServerResponse.ok().bodyValue(result);
+                            });
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> errorResponse = new HashMap<>();
+                    errorResponse.put("success", false);
+                    errorResponse.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(errorResponse);
+                });
+    }
+
     @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据")
     public Mono<ServerResponse> getCacheByKey(ServerRequest request) {
         return request.bodyToMono(Map.class)

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

@@ -0,0 +1,164 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Tag(name = "团课推荐管理", description = "团课推荐相关操作")
+public class GroupCourseRecommendHandler {
+
+    private final IGroupCourseRecommendService recommendService;
+
+    public GroupCourseRecommendHandler(IGroupCourseRecommendService recommendService) {
+        this.recommendService = recommendService;
+    }
+
+    @Operation(summary = "获取所有团课推荐", description = "获取系统中所有团课推荐列表，支持按优先级排序")
+    public Mono<ServerResponse> getAllRecommendations(ServerRequest request) {
+        String sortBy = request.queryParam("sortBy").orElse("priority");
+        String sortOrder = request.queryParam("sortOrder").orElse("desc");
+
+        return ServerResponse.ok()
+                .body(recommendService.findAll(sortBy, sortOrder), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "获取所有启用的团课推荐", description = "获取系统中所有已启用的团课推荐列表（按优先级排序）")
+    public Mono<ServerResponse> getAllActiveRecommendations(ServerRequest request) {
+        return ServerResponse.ok()
+                .body(recommendService.findAllActive(), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "根据ID获取团课推荐", description = "根据ID获取团课推荐详情")
+    public Mono<ServerResponse> getRecommendationById(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return recommendService.findById(id)
+                .flatMap(recommend -> ServerResponse.ok().bodyValue(recommend))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "根据团课ID获取推荐", description = "根据团课ID获取该团课的推荐信息")
+    public Mono<ServerResponse> getRecommendationsByCourseId(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        return ServerResponse.ok()
+                .body(recommendService.findByCourseId(courseId), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "创建团课推荐", description = "创建新的团课推荐")
+    public Mono<ServerResponse> createRecommendation(ServerRequest request) {
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    if (recommend.getCourseId() == null) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "团课ID不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+
+                    return recommendService.create(recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐创建成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "更新团课推荐", description = "更新指定团课推荐信息")
+    public Mono<ServerResponse> updateRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    return recommendService.update(id, recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐更新成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "删除团课推荐", description = "删除指定团课推荐（软删除）")
+    public Mono<ServerResponse> deleteRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.delete(id)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐删除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "启用团课推荐", description = "启用指定团课推荐")
+    public Mono<ServerResponse> enableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.enable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐启用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "禁用团课推荐", description = "禁用指定团课推荐")
+    public Mono<ServerResponse> disableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.disable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐禁用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+}

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

@@ -0,0 +1,137 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
+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 GroupCourseTypeHandler {
+
+    private final IGroupCourseTypeService groupCourseTypeService;
+
+    public GroupCourseTypeHandler(IGroupCourseTypeService groupCourseTypeService) {
+        this.groupCourseTypeService = groupCourseTypeService;
+    }
+
+    @Operation(summary = "获取所有团课类型", description = "获取系统中所有团课类型列表")
+    public Mono<ServerResponse> getAllGroupCourseTypes(ServerRequest request) {
+        boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false"));
+        return ServerResponse.ok()
+                .body(groupCourseTypeService.findAll(includeDeleted), GroupCourseType.class);
+    }
+
+    @Operation(summary = "根据ID获取团课类型", description = "根据ID获取团课类型详情")
+    public Mono<ServerResponse> getGroupCourseTypeById(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return groupCourseTypeService.findById(id)
+                .flatMap(type -> ServerResponse.ok().bodyValue(type))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "根据关键词搜索团课类型", description = "根据类型名称关键词搜索团课类型")
+    public Mono<ServerResponse> searchGroupCourseTypes(ServerRequest request) {
+        String keyword = request.queryParam("keyword").orElse("");
+        return ServerResponse.ok()
+                .body(groupCourseTypeService.findByKeyword(keyword), GroupCourseType.class);
+    }
+
+    @Operation(summary = "根据分类获取团课类型", description = "根据分类获取团课类型列表")
+    public Mono<ServerResponse> getGroupCourseTypesByCategory(ServerRequest request) {
+        String category = request.pathVariable("category");
+        String keyword = request.queryParam("keyword").orElse("");
+        return ServerResponse.ok()
+                .body(groupCourseTypeService.findByCategoryAndKeyword(category, keyword), GroupCourseType.class);
+    }
+
+    @Operation(summary = "获取所有分类", description = "获取所有团课类型分类（去重）")
+    public Mono<ServerResponse> getCategories(ServerRequest request) {
+        return groupCourseTypeService.findCategories()
+                .collectList()
+                .flatMap(list -> ServerResponse.ok().bodyValue(list));
+    }
+
+    @Operation(summary = "创建团课类型", description = "创建新的团课类型")
+    public Mono<ServerResponse> createGroupCourseType(ServerRequest request) {
+        return request.bodyToMono(GroupCourseType.class)
+                .flatMap(groupCourseType -> {
+                    if (groupCourseType.getTypeName() == null || groupCourseType.getTypeName().isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "类型名称不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    // 默认基础难度为1
+                    if (groupCourseType.getBaseDifficulty() == null) {
+                        groupCourseType.setBaseDifficulty(1);
+                    }
+                    
+                    return groupCourseTypeService.create(groupCourseType)
+                            .flatMap(type -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课类型创建成功");
+                                response.put("data", type);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "更新团课类型", description = "更新指定团课类型信息")
+    public Mono<ServerResponse> updateGroupCourseType(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return request.bodyToMono(GroupCourseType.class)
+                .flatMap(groupCourseType -> {
+                    groupCourseType.setId(id);
+                    return groupCourseTypeService.update(id, groupCourseType)
+                            .flatMap(type -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课类型更新成功");
+                                response.put("data", type);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "删除团课类型", description = "删除指定团课类型（软删除）")
+    public Mono<ServerResponse> deleteGroupCourseType(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        
+        return groupCourseTypeService.delete(id)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课类型删除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/initializer/QrCodeInitializer.java

@@ -0,0 +1,89 @@
+package cn.novalon.gym.manage.groupcourse.initializer;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 项目启动时补全缺失的团课二维码
+ * 遍历所有未删除的团课，对qrCodePath为空的课程生成二维码并上传至阿里云OSS
+ */
+@Component
+public class QrCodeInitializer implements CommandLineRunner {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QrCodeInitializer.class);
+    
+    private final IGroupCourseRepository groupCourseRepository;
+    private final ObjectMapper objectMapper;
+    
+    public QrCodeInitializer(IGroupCourseRepository groupCourseRepository,
+                             ObjectMapper objectMapper) {
+        this.groupCourseRepository = groupCourseRepository;
+        this.objectMapper = objectMapper;
+    }
+    
+    @Override
+    public void run(String... args) {
+        logger.info("===== 开始检查团课二维码缺失情况 =====");
+        
+        groupCourseRepository.findByDeletedAtIsNull()
+                .filter(course -> course.getQrCodePath() == null || course.getQrCodePath().isEmpty())
+                .flatMap(course -> {
+                    try {
+                        logger.info("发现缺失二维码的团课 - id={}, name={}", course.getId(), course.getCourseName());
+                        
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime() != null ? course.getStartTime().toString() : null);
+                        qrCodeContent.put("endTime", course.getEndTime() != null ? course.getEndTime().toString() : null);
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码并上传到阿里云OSS
+                        String uuid = UUID.randomUUID().toString().replace("-", "");
+                        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+                        String fileName = "qr_" + uuid + "_" + timestamp + ".png";
+                        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent, fileName);
+                        
+                        course.setQrCodePath(ossUrl);
+                        
+                        // 更新数据库
+                        return groupCourseRepository.update(course)
+                                .doOnSuccess(updated -> logger.info("团课二维码补全成功 - id={}, name={}, ossUrl={}", 
+                                        updated.getId(), updated.getCourseName(), ossUrl))
+                                .doOnError(error -> logger.error("团课二维码补全失败(更新DB) - id={}, name={}, error: {}", 
+                                        course.getId(), course.getCourseName(), error.getMessage()));
+                    } catch (Exception e) {
+                        logger.error("团课二维码补全失败(生成) - id={}, name={}, error: {}", 
+                                course.getId(), course.getCourseName(), e.getMessage(), e);
+                        return Mono.empty();
+                    }
+                })
+                .collectList()
+                .doOnSuccess(list -> logger.info("===== 团课二维码检查完毕，共补全 {} 个缺失二维码 =====", list.size()))
+                .onErrorResume(error -> {
+                    logger.error("团课二维码初始化检查异常: {}", error.getMessage(), error);
+                    return Mono.empty();
+                })
+                .subscribe();
+    }
+}

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

@@ -0,0 +1,32 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface ICourseLabelRepository {
+
+    Mono<CourseLabel> findById(Long id);
+
+    Flux<CourseLabel> findAll();
+
+    Flux<CourseLabel> findByKeyword(String keyword);
+
+    Mono<CourseLabel> findByLabelName(String labelName);
+
+    Mono<CourseLabel> save(CourseLabel courseLabel);
+
+    Mono<CourseLabel> update(CourseLabel courseLabel);
+
+    Mono<Void> deleteById(Long id);
+
+    Flux<CourseLabel> findByTypeId(Long typeId);
+
+    Mono<Void> addLabelsToType(Long typeId, List<Long> labelIds);
+
+    Mono<Void> removeLabelFromType(Long typeId, Long labelId);
+
+    Mono<Void> clearLabelsFromType(Long typeId);
+}

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

@@ -0,0 +1,30 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendRepository {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend);
+
+    Mono<Void> deleteById(Long id);
+
+    Mono<Void> deleteByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive);
+}

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

@@ -4,6 +4,7 @@ package cn.novalon.gym.manage.groupcourse.repository;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import org.springframework.data.domain.Sort;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -27,4 +28,8 @@ public interface IGroupCourseRepository {
     Mono<Void> deleteById(Long id);
     
     Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta);
+    
+    Flux<GroupCourse> findByCourseType(Long courseType);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
 }

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

@@ -0,0 +1,28 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseTypeRepository {
+
+    Mono<GroupCourseType> findById(Long id);
+
+    Flux<GroupCourseType> findAll();
+
+    Flux<GroupCourseType> findAll(boolean includeDeleted);
+
+    Flux<GroupCourseType> findByKeyword(String keyword);
+
+    Flux<GroupCourseType> findByCategory(String category);
+
+    Flux<GroupCourseType> findByCategoryAndKeyword(String category, String keyword);
+
+    Mono<GroupCourseType> findByTypeName(String typeName);
+
+    Mono<GroupCourseType> save(GroupCourseType groupCourseType);
+
+    Mono<GroupCourseType> update(GroupCourseType groupCourseType);
+
+    Mono<Void> deleteById(Long id);
+}

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

@@ -0,0 +1,161 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
+import cn.novalon.gym.manage.groupcourse.dao.CourseLabelDao;
+import cn.novalon.gym.manage.groupcourse.dao.CourseTypeLabelDao;
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
+import cn.novalon.gym.manage.groupcourse.entity.CourseLabelEntity;
+import cn.novalon.gym.manage.groupcourse.entity.CourseTypeLabelEntity;
+import cn.novalon.gym.manage.groupcourse.repository.ICourseLabelRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.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.List;
+
+@Repository
+@Transactional
+public class CourseLabelRepository implements ICourseLabelRepository {
+
+    private static final Logger logger = LoggerFactory.getLogger(CourseLabelRepository.class);
+
+    private final CourseLabelDao courseLabelDao;
+    private final CourseTypeLabelDao courseTypeLabelDao;
+    private final GroupCourseConverter converter;
+
+    public CourseLabelRepository(CourseLabelDao courseLabelDao, CourseTypeLabelDao courseTypeLabelDao, 
+                                  GroupCourseConverter converter) {
+        this.courseLabelDao = courseLabelDao;
+        this.courseTypeLabelDao = courseTypeLabelDao;
+        this.converter = converter;
+    }
+
+    @Override
+    public Mono<CourseLabel> findById(Long id) {
+        return courseLabelDao.findByIdIsAndDeletedAtIsNull(id)
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Flux<CourseLabel> findAll() {
+        return courseLabelDao.findAllByDeletedAtIsNull()
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Flux<CourseLabel> findByKeyword(String keyword) {
+        if (keyword == null || keyword.isEmpty()) {
+            return findAll();
+        }
+        return courseLabelDao.findByLabelNameContainingAndDeletedAtIsNull(keyword)
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Mono<CourseLabel> findByLabelName(String labelName) {
+        return courseLabelDao.findByLabelNameAndDeletedAtIsNull(labelName)
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Mono<CourseLabel> save(CourseLabel courseLabel) {
+        CourseLabelEntity entity = toCourseLabelEntity(courseLabel);
+        return courseLabelDao.save(entity)
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Mono<CourseLabel> update(CourseLabel courseLabel) {
+        return courseLabelDao.findByIdIsAndDeletedAtIsNull(courseLabel.getId())
+                .switchIfEmpty(Mono.error(new RuntimeException("标签不存在")))
+                .flatMap(existing -> {
+                    existing.markNotNew();
+                    if (courseLabel.getLabelName() != null) {
+                        existing.setLabelName(courseLabel.getLabelName());
+                    }
+                    if (courseLabel.getColor() != null) {
+                        existing.setColor(courseLabel.getColor());
+                    }
+                    if (courseLabel.getDescription() != null) {
+                        existing.setDescription(courseLabel.getDescription());
+                    }
+                    existing.setUpdatedAt(LocalDateTime.now());
+                    return courseLabelDao.save(existing);
+                })
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return courseLabelDao.softDelete(id, LocalDateTime.now())
+                .then(courseTypeLabelDao.deleteByLabelId(id, LocalDateTime.now()))
+                .then();
+    }
+
+    @Override
+    public Flux<CourseLabel> findByTypeId(Long typeId) {
+        return courseTypeLabelDao.findByTypeIdAndDeletedAtIsNull(typeId)
+                .flatMap(typeLabel -> courseLabelDao.findByIdIsAndDeletedAtIsNull(typeLabel.getLabelId()))
+                .map(this::toCourseLabel);
+    }
+
+    @Override
+    public Mono<Void> addLabelsToType(Long typeId, List<Long> labelIds) {
+        return Flux.fromIterable(labelIds)
+                .flatMap(labelId -> {
+                    return courseTypeLabelDao.physicalDeleteByTypeIdAndLabelId(typeId, labelId)
+                            .then(Mono.defer(() -> {
+                                CourseTypeLabelEntity entity = new CourseTypeLabelEntity();
+                                entity.setTypeId(typeId);
+                                entity.setLabelId(labelId);
+                                return courseTypeLabelDao.save(entity).then(Mono.empty());
+                            }));
+                })
+                .then();
+    }
+
+    @Override
+    public Mono<Void> removeLabelFromType(Long typeId, Long labelId) {
+        return courseTypeLabelDao.deleteByTypeIdAndLabelId(typeId, labelId, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<Void> clearLabelsFromType(Long typeId) {
+        return courseTypeLabelDao.deleteByTypeId(typeId, LocalDateTime.now())
+                .then();
+    }
+
+    private CourseLabel toCourseLabel(CourseLabelEntity entity) {
+        if (entity == null) {
+            return null;
+        }
+        CourseLabel label = new CourseLabel();
+        label.setId(entity.getId());
+        label.setLabelName(entity.getLabelName());
+        label.setColor(entity.getColor());
+        label.setDescription(entity.getDescription());
+        label.setCreatedAt(entity.getCreatedAt());
+        label.setUpdatedAt(entity.getUpdatedAt());
+        return label;
+    }
+
+    private CourseLabelEntity toCourseLabelEntity(CourseLabel domain) {
+        if (domain == null) {
+            return null;
+        }
+        CourseLabelEntity entity = new CourseLabelEntity();
+        entity.setId(domain.getId());
+        entity.setLabelName(domain.getLabelName());
+        entity.setColor(domain.getColor());
+        entity.setDescription(domain.getDescription());
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        return entity;
+    }
+}

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

@@ -0,0 +1,136 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseRecommendDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseRecommendEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public class GroupCourseRecommendRepository implements IGroupCourseRecommendRepository {
+
+    private final GroupCourseRecommendDao recommendDao;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
+
+    public GroupCourseRecommendRepository(GroupCourseRecommendDao recommendDao, 
+                                          R2dbcEntityTemplate r2dbcEntityTemplate) {
+        this.recommendDao = recommendDao;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendDao.findByIdAndDeletedAtIsNull(id)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendDao.findAllByDeletedAtIsNull()
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        Sort.Direction direction = "asc".equalsIgnoreCase(sortOrder) 
+                ? Sort.Direction.ASC 
+                : Sort.Direction.DESC;
+        Sort sort = Sort.by(direction, sortBy);
+        return recommendDao.findAllByDeletedAtIsNull(sort)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendDao.findByIsActiveTrueAndDeletedAtIsNull(Sort.by(Sort.Direction.DESC, "priority"))
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNull(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNullAndIsActiveTrue(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setCreatedAt(LocalDateTime.now());
+        entity.setUpdatedAt(LocalDateTime.now());
+        if (entity.getPriority() == null) {
+            entity.setPriority(0);
+        }
+        if (entity.getIsActive() == null) {
+            entity.setIsActive(true);
+        }
+
+        return recommendDao.save(entity)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setUpdatedAt(LocalDateTime.now());
+
+        return r2dbcEntityTemplate.update(entity)
+                .then(findById(recommend.getId()));
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return recommendDao.softDelete(id, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<Void> deleteByCourseId(Long courseId) {
+        return recommendDao.softDeleteByCourseId(courseId, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive) {
+        return recommendDao.updateActiveStatus(id, isActive, LocalDateTime.now())
+                .flatMap(updated -> {
+                    if (updated > 0) {
+                        return findById(id);
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    private GroupCourseRecommend toDomain(GroupCourseRecommendEntity entity) {
+        if (entity == null) {
+            return null;
+        }
+        GroupCourseRecommend recommend = new GroupCourseRecommend();
+        BeanUtil.copyProperties(entity, recommend);
+        return recommend;
+    }
+
+    private GroupCourseRecommendEntity toEntity(GroupCourseRecommend domain) {
+        if (domain == null) {
+            return null;
+        }
+        GroupCourseRecommendEntity entity = new GroupCourseRecommendEntity();
+        BeanUtil.copyProperties(domain, entity);
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        return entity;
+    }
+}

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

@@ -6,6 +6,7 @@ import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import org.springframework.data.domain.Sort;
@@ -178,4 +179,33 @@ public class GroupCourseRepository implements IGroupCourseRepository {
                     return Mono.empty();
                 });
     }
+
+    @Override
+    public Flux<GroupCourse> findByCourseType(Long courseType) {
+        return groupCourseDao.findByCourseTypeAndDeletedAtIsNull(courseType)
+                .map(groupCourseConverter::toDomain);
+    }
+
+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        return groupCourseDao.countSearchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                .flatMap(total -> {
+                    if (total == 0) {
+                        return Mono.just(new PageResponse<>(
+                                List.of(), 0, 0L,
+                                query.getPage() != null ? query.getPage() : 0,
+                                query.getSize() != null ? query.getSize() : 10));
+                    }
+                    return groupCourseDao.searchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                            .map(groupCourseConverter::toDomain)
+                            .collectList()
+                            .map(courseList -> {
+                                int size = query.getSize() != null ? query.getSize() : 10;
+                                int totalPages = (int) Math.ceil((double) total / size);
+                                return new PageResponse<>(
+                                        courseList, totalPages, total,
+                                        query.getPage() != null ? query.getPage() : 0, size);
+                            });
+                });
+    }
 }

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

@@ -0,0 +1,132 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseTypeDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseTypeEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.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 GroupCourseTypeRepository implements IGroupCourseTypeRepository {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseTypeRepository.class);
+
+    private final GroupCourseTypeDao groupCourseTypeDao;
+    private final GroupCourseConverter converter;
+
+    public GroupCourseTypeRepository(GroupCourseTypeDao groupCourseTypeDao, GroupCourseConverter converter) {
+        this.groupCourseTypeDao = groupCourseTypeDao;
+        this.converter = converter;
+    }
+
+    @Override
+    public Mono<GroupCourseType> findById(Long id) {
+        return groupCourseTypeDao.findByIdIsAndDeletedAtIsNull(id)
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findAll() {
+        return groupCourseTypeDao.findAll()
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findAll(boolean includeDeleted) {
+        if (includeDeleted) {
+            return groupCourseTypeDao.findAll()
+                    .map(converter::toGroupCourseType);
+        } else {
+            return groupCourseTypeDao.findAllByDeletedAtIsNull()
+                    .map(converter::toGroupCourseType);
+        }
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByKeyword(String keyword) {
+        if (keyword == null || keyword.isEmpty()) {
+            return findAll(false);
+        }
+        return groupCourseTypeDao.findByTypeNameContainingAndDeletedAtIsNull(keyword)
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByCategory(String category) {
+        if (category == null || category.isEmpty()) {
+            return findAll(false);
+        }
+        return groupCourseTypeDao.findByCategoryAndDeletedAtIsNull(category)
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByCategoryAndKeyword(String category, String keyword) {
+        Flux<GroupCourseType> result;
+        
+        if (category != null && !category.isEmpty()) {
+            result = findByCategory(category);
+        } else {
+            result = findAll(false);
+        }
+        
+        if (keyword != null && !keyword.isEmpty()) {
+            result = result.filter(type -> type.getTypeName() != null && 
+                    type.getTypeName().toLowerCase().contains(keyword.toLowerCase()));
+        }
+        
+        return result;
+    }
+
+    @Override
+    public Mono<GroupCourseType> findByTypeName(String typeName) {
+        return groupCourseTypeDao.findByTypeNameAndDeletedAtIsNull(typeName)
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Mono<GroupCourseType> save(GroupCourseType groupCourseType) {
+        GroupCourseTypeEntity entity = converter.toGroupCourseTypeEntity(groupCourseType);
+        return groupCourseTypeDao.save(entity)
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Mono<GroupCourseType> update(GroupCourseType groupCourseType) {
+        return groupCourseTypeDao.findByIdIsAndDeletedAtIsNull(groupCourseType.getId())
+                .switchIfEmpty(Mono.error(new RuntimeException("团课类型不存在")))
+                .flatMap(existing -> {
+                    existing.markNotNew();
+                    if (groupCourseType.getTypeName() != null) {
+                        existing.setTypeName(groupCourseType.getTypeName());
+                    }
+                    if (groupCourseType.getBaseDifficulty() != null) {
+                        existing.setBaseDifficulty(groupCourseType.getBaseDifficulty());
+                    }
+                    if (groupCourseType.getDescription() != null) {
+                        existing.setDescription(groupCourseType.getDescription());
+                    }
+                    if (groupCourseType.getCategory() != null) {
+                        existing.setCategory(groupCourseType.getCategory());
+                    }
+                    existing.setUpdatedAt(LocalDateTime.now());
+                    return groupCourseTypeDao.save(existing);
+                })
+                .map(converter::toGroupCourseType);
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return groupCourseTypeDao.softDelete(id, LocalDateTime.now())
+                .then();
+    }
+}

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

@@ -0,0 +1,46 @@
+package cn.novalon.gym.manage.groupcourse.scheduler;
+
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 团课过期状态自动更新定时任务
+ * 
+ * 功能：定期检查已过期的团课（end_time <= NOW()），自动将 status 从 0 更新为 2（已结束）
+ * 
+ * @date 2026-06-24
+ */
+@Component
+public class GroupCourseExpireScheduler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseExpireScheduler.class);
+
+    private final GroupCourseDao groupCourseDao;
+
+    public GroupCourseExpireScheduler(GroupCourseDao groupCourseDao) {
+        this.groupCourseDao = groupCourseDao;
+    }
+
+    /**
+     * 每分钟检查一次，将已过期但状态仍为 0 的团课标记为已结束（status = 2）
+     */
+    @Scheduled(fixedRate = 60000)
+    public void completeExpiredCourses() {
+        logger.debug("定时任务开始检查已过期团课，更新状态为已结束");
+        
+        groupCourseDao.completeExpiredCourses(LocalDateTime.now())
+                .subscribe(
+                        count -> {
+                            if (count > 0) {
+                                logger.info("定时任务完成，更新了 {} 条过期团课状态为已结束", count);
+                            }
+                        },
+                        error -> logger.error("过期团课状态更新定时任务执行失败：{}", error.getMessage(), error)
+                );
+    }
+}

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

@@ -0,0 +1,30 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface ICourseLabelService {
+
+    Mono<CourseLabel> findById(Long id);
+
+    Flux<CourseLabel> findAll();
+
+    Flux<CourseLabel> findByKeyword(String keyword);
+
+    Mono<CourseLabel> create(CourseLabel courseLabel);
+
+    Mono<CourseLabel> update(Long id, CourseLabel courseLabel);
+
+    Mono<Void> delete(Long id);
+
+    Flux<CourseLabel> findByTypeId(Long typeId);
+
+    Mono<Void> addLabelsToType(Long typeId, List<Long> labelIds);
+
+    Mono<Void> removeLabelFromType(Long typeId, Long labelId);
+
+    Mono<Void> clearLabelsFromType(Long typeId);
+}

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

@@ -0,0 +1,28 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendService {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend);
+
+    Mono<Void> delete(Long id);
+
+    Mono<GroupCourseRecommend> enable(Long id);
+
+    Mono<GroupCourseRecommend> disable(Long id);
+}

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

@@ -4,11 +4,14 @@ package cn.novalon.gym.manage.groupcourse.service;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public interface IGroupCourseService {
     Mono<GroupCourse> findById(Long id);
+    Mono<GroupCourseDetail> findDetailById(Long id);
     Flux<GroupCourse> findAll();
     Flux<GroupCourse> findAll(boolean includeDeleted);
     
@@ -23,4 +26,6 @@ public interface IGroupCourseService {
     Mono<GroupCourse> signIn(Long courseId, Long memberId);
     
     Mono<Void> delete(Long id);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
 }

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

@@ -0,0 +1,32 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseTypeService {
+
+    Mono<GroupCourseType> findById(Long id);
+
+    Flux<GroupCourseType> findAll();
+
+    Flux<GroupCourseType> findAll(boolean includeDeleted);
+
+    Flux<GroupCourseType> findByKeyword(String keyword);
+
+    Flux<GroupCourseType> findByCategory(String category);
+
+    Flux<GroupCourseType> findByCategoryAndKeyword(String category, String keyword);
+
+    Mono<GroupCourseType> create(GroupCourseType groupCourseType);
+
+    Mono<GroupCourseType> update(Long id, GroupCourseType groupCourseType);
+
+    Mono<Void> delete(Long id);
+
+    /**
+     * 获取分类列表（去重）
+     * @return 分类名称列表
+     */
+    Flux<String> findCategories();
+}

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

@@ -0,0 +1,112 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.repository.ICourseLabelRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.ICourseLabelService;
+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.util.List;
+
+@Service
+public class CourseLabelService implements ICourseLabelService {
+
+    private static final Logger logger = LoggerFactory.getLogger(CourseLabelService.class);
+    private static final String CACHE_KEY_DETAIL_PREFIX = "group_course:detail:";
+
+    private final ICourseLabelRepository courseLabelRepository;
+    private final IGroupCourseRepository groupCourseRepository;
+    private final RedisUtil redisUtil;
+
+    public CourseLabelService(ICourseLabelRepository courseLabelRepository,
+                              IGroupCourseRepository groupCourseRepository,
+                              RedisUtil redisUtil) {
+        this.courseLabelRepository = courseLabelRepository;
+        this.groupCourseRepository = groupCourseRepository;
+        this.redisUtil = redisUtil;
+    }
+
+    private Mono<Void> invalidateGroupCourseDetailCache(Long typeId) {
+        return groupCourseRepository.findByCourseType(typeId)
+                .flatMap(course -> {
+                    String cacheKey = CACHE_KEY_DETAIL_PREFIX + course.getId();
+                    return redisUtil.delete(cacheKey)
+                            .doOnSuccess(deleted -> logger.debug("清除团课详情缓存 - courseId={}", course.getId()));
+                })
+                .then();
+    }
+
+    @Override
+    public Mono<CourseLabel> findById(Long id) {
+        return courseLabelRepository.findById(id);
+    }
+
+    @Override
+    public Flux<CourseLabel> findAll() {
+        return courseLabelRepository.findAll();
+    }
+
+    @Override
+    public Flux<CourseLabel> findByKeyword(String keyword) {
+        return courseLabelRepository.findByKeyword(keyword);
+    }
+
+    @Override
+    public Mono<CourseLabel> create(CourseLabel courseLabel) {
+        return courseLabelRepository.findByLabelName(courseLabel.getLabelName())
+                .flatMap(existing -> Mono.<CourseLabel>error(new RuntimeException("标签名称已存在")))
+                .switchIfEmpty(courseLabelRepository.save(courseLabel))
+                .doOnSuccess(label -> logger.info("标签创建成功 - id={}, name={}", label.getId(), label.getLabelName()))
+                .doOnError(error -> logger.error("标签创建失败 - error: {}", error.getMessage()));
+    }
+
+    @Override
+    public Mono<CourseLabel> update(Long id, CourseLabel courseLabel) {
+        courseLabel.setId(id);
+        return courseLabelRepository.update(courseLabel)
+                .doOnSuccess(label -> logger.info("标签更新成功 - id={}", id))
+                .doOnError(error -> logger.error("标签更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> delete(Long id) {
+        return courseLabelRepository.deleteById(id)
+                .doOnSuccess(v -> logger.info("标签删除成功 - id={}", id))
+                .doOnError(error -> logger.error("标签删除失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Flux<CourseLabel> findByTypeId(Long typeId) {
+        return courseLabelRepository.findByTypeId(typeId);
+    }
+
+    @Override
+    public Mono<Void> addLabelsToType(Long typeId, List<Long> labelIds) {
+        return courseLabelRepository.addLabelsToType(typeId, labelIds)
+                .then(invalidateGroupCourseDetailCache(typeId))
+                .doOnSuccess(v -> logger.info("标签添加到类型成功 - typeId={}, labelIds={}", typeId, labelIds))
+                .doOnError(error -> logger.error("标签添加到类型失败 - typeId={}, error: {}", typeId, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> removeLabelFromType(Long typeId, Long labelId) {
+        return courseLabelRepository.removeLabelFromType(typeId, labelId)
+                .then(invalidateGroupCourseDetailCache(typeId))
+                .doOnSuccess(v -> logger.info("从类型移除标签成功 - typeId={}, labelId={}", typeId, labelId))
+                .doOnError(error -> logger.error("从类型移除标签失败 - typeId={}, labelId={}, error: {}", typeId, labelId, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> clearLabelsFromType(Long typeId) {
+        return courseLabelRepository.clearLabelsFromType(typeId)
+                .then(invalidateGroupCourseDetailCache(typeId))
+                .doOnSuccess(v -> logger.info("清空类型标签成功 - typeId={}", typeId))
+                .doOnError(error -> logger.error("清空类型标签失败 - typeId={}, error: {}", typeId, error.getMessage()));
+    }
+}

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

@@ -0,0 +1,142 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Service
+public class GroupCourseRecommendService implements IGroupCourseRecommendService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseRecommendService.class);
+
+    private final IGroupCourseRecommendRepository recommendRepository;
+    private final IGroupCourseRepository groupCourseRepository;
+
+    public GroupCourseRecommendService(IGroupCourseRecommendRepository recommendRepository,
+                                       IGroupCourseRepository groupCourseRepository) {
+        this.recommendRepository = recommendRepository;
+        this.groupCourseRepository = groupCourseRepository;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendRepository.findById(id)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendRepository.findAll()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        return recommendRepository.findAll(sortBy, sortOrder)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendRepository.findAllActive()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendRepository.findByCourseId(courseId)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.error(new RuntimeException("团课ID不能为空"));
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    return recommendRepository.save(recommend)
+                            .doOnSuccess(r -> logger.info("团课推荐创建成功 - id={}, courseId={}", r.getId(), r.getCourseId()))
+                            .doOnError(error -> logger.error("团课推荐创建失败 - error: {}", error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(existing -> {
+                    if (recommend.getRecommendTitle() != null) {
+                        existing.setRecommendTitle(recommend.getRecommendTitle());
+                    }
+                    if (recommend.getRecommendContent() != null) {
+                        existing.setRecommendContent(recommend.getRecommendContent());
+                    }
+                    if (recommend.getRecommendReason() != null) {
+                        existing.setRecommendReason(recommend.getRecommendReason());
+                    }
+                    if (recommend.getPriority() != null) {
+                        existing.setPriority(recommend.getPriority());
+                    }
+                    if (recommend.getIsActive() != null) {
+                        existing.setIsActive(recommend.getIsActive());
+                    }
+                    if (recommend.getCourseId() != null) {
+                        existing.setCourseId(recommend.getCourseId());
+                    }
+
+                    return recommendRepository.update(existing);
+                })
+                .doOnSuccess(r -> logger.info("团课推荐更新成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> delete(Long id) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(recommend -> {
+                    return recommendRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课推荐删除成功 - id={}", id))
+                            .doOnError(error -> logger.error("团课推荐删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> enable(Long id) {
+        return recommendRepository.updateActiveStatus(id, true)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐启用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐启用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> disable(Long id) {
+        return recommendRepository.updateActiveStatus(id, false)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐禁用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐禁用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    private Mono<GroupCourseRecommend> fillGroupCourseInfo(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.just(recommend);
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .map(course -> {
+                    recommend.setGroupCourse(course);
+                    return recommend;
+                })
+                .defaultIfEmpty(recommend);
+    }
+}

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

@@ -4,14 +4,21 @@ package cn.novalon.gym.manage.groupcourse.service.impl;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.enums.CourseEvent;
 import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseStateMachine;
+import cn.novalon.gym.manage.groupcourse.repository.ICourseLabelRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
@@ -21,11 +28,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class GroupCourseService implements IGroupCourseService {
@@ -33,32 +43,129 @@ public class GroupCourseService implements IGroupCourseService {
     
     private final IGroupCourseRepository groupCourseRepository;
     private final IGroupCourseBookingRepository bookingRepository;
+    private final IGroupCourseTypeRepository groupCourseTypeRepository;
+    private final ICourseLabelRepository courseLabelRepository;
     private final IMemberCardRecordService memberCardRecordService;
     private final MemberCardRepository memberCardRepository;
     private final RedisUtil redisUtil;
     private final ObjectMapper objectMapper;
     private final GroupCourseStateMachine stateMachine;
+    private final DatabaseClient databaseClient;
     
     private static final String CACHE_KEY_PREFIX = "group_course:page:";
     private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
+    private static final String CACHE_KEY_DETAIL_PREFIX = "group_course:detail:";
     private static final long CACHE_EXPIRE_SECONDS = 300;
     
     private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0;
     
     public GroupCourseService(IGroupCourseRepository groupCourseRepository, 
                               IGroupCourseBookingRepository bookingRepository,
+                              IGroupCourseTypeRepository groupCourseTypeRepository,
+                              ICourseLabelRepository courseLabelRepository,
                               IMemberCardRecordService memberCardRecordService,
                               MemberCardRepository memberCardRepository,
                               RedisUtil redisUtil,
                               ObjectMapper objectMapper,
-                              GroupCourseStateMachine stateMachine){
+                              GroupCourseStateMachine stateMachine,
+                              DatabaseClient databaseClient){
         this.groupCourseRepository = groupCourseRepository;
         this.bookingRepository = bookingRepository;
+        this.groupCourseTypeRepository = groupCourseTypeRepository;
+        this.courseLabelRepository = courseLabelRepository;
         this.memberCardRecordService = memberCardRecordService;
         this.memberCardRepository = memberCardRepository;
         this.redisUtil = redisUtil;
         this.objectMapper = objectMapper;
         this.stateMachine = stateMachine;
+        this.databaseClient = databaseClient;
+    }
+
+    @Override
+    public Mono<GroupCourseDetail> findDetailById(Long id) {
+        String cacheKey = CACHE_KEY_DETAIL_PREFIX + id;
+        
+        return redisUtil.get(cacheKey, String.class)
+                .flatMap(cachedJson -> {
+                    if (cachedJson != null) {
+                        try {
+                            GroupCourseDetail detail = objectMapper.readValue(cachedJson, GroupCourseDetail.class);
+                            logger.info("缓存命中 - findDetailById: id={}", id);
+                            return Mono.just(detail);
+                        } catch (JsonProcessingException e) {
+                            logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
+                            return redisUtil.delete(cacheKey).then(Mono.empty());
+                        }
+                    }
+                    return Mono.empty();
+                })
+                .switchIfEmpty(
+                    groupCourseRepository.findByIdAndDeletedAtIsNull(id)
+                            .flatMap(course -> {
+                                // 查询类型信息
+                                Long courseTypeId = course.getCourseType();
+                                
+                                if (courseTypeId == null) {
+                                    // 没有类型，直接构建详情
+                                    return Mono.just(buildDetail(course, null));
+                                }
+                                
+                                // 有类型，查询类型信息
+                                return groupCourseTypeRepository.findById(courseTypeId)
+                                        .flatMap(type -> {
+                                            // 查询标签
+                                            return courseLabelRepository.findByTypeId(type.getId())
+                                                    .collectList()
+                                                    .map(labels -> {
+                                                        type.setLabels(labels);
+                                                        return buildDetail(course, type);
+                                                    });
+                                        })
+                                        .switchIfEmpty(Mono.just(buildDetail(course, null)));
+                            })
+                            .flatMap(detail -> {
+                                try {
+                                    String jsonData = objectMapper.writeValueAsString(detail);
+                                    return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS)
+                                            .thenReturn(detail)
+                                            .doOnSuccess(d -> logger.debug("缓存已设置 - findDetailById: id={}", id));
+                                } catch (JsonProcessingException e) {
+                                    logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage());
+                                    return Mono.just(detail);
+                                }
+                            })
+                            .doOnSubscribe(sub -> logger.debug("缓存未命中，查询数据库 - findDetailById: id={}", id))
+                );
+    }
+
+    /**
+     * 构建团课完整信息对象
+     */
+    private GroupCourseDetail buildDetail(GroupCourse course, GroupCourseType type) {
+        GroupCourseDetail detail = new GroupCourseDetail();
+        detail.setId(course.getId());
+        detail.setCourseName(course.getCourseName());
+        detail.setCoachId(course.getCoachId());
+        detail.setCourseType(course.getCourseType());
+        detail.setStartTime(course.getStartTime());
+        detail.setEndTime(course.getEndTime());
+        detail.setMaxMembers(course.getMaxMembers());
+        detail.setCurrentMembers(course.getCurrentMembers());
+        detail.setStatus(course.getStatus());
+        detail.setLocation(course.getLocation());
+        detail.setCoverImage(course.getCoverImage());
+        detail.setDescription(course.getDescription());
+        detail.setStoredValueAmount(course.getStoredValueAmount());
+        detail.setQrCodePath(course.getQrCodePath());
+        detail.setCreatedAt(course.getCreatedAt());
+        detail.setUpdatedAt(course.getUpdatedAt());
+        
+        // 设置类型信息
+        if (type != null) {
+            detail.setTypeInfo(type);
+        }
+        
+        return detail;
     }
 
     @Override
@@ -163,7 +270,38 @@ public class GroupCourseService implements IGroupCourseService {
     @Override
     public Mono<GroupCourse> create(GroupCourse groupCourse) {
         return groupCourseRepository.save(groupCourse)
-                .doOnSuccess(course -> logger.info("团课创建成功 - id={}, name={}", course.getId(), course.getCourseName()))
+                .flatMap(course -> {
+                    try {
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime());
+                        qrCodeContent.put("endTime", course.getEndTime());
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        qrCodeContent.put("createdAt", course.getCreatedAt());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码并上传到阿里云OSS
+                        String qrCodeUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
+                        course.setQrCodePath(qrCodeUrl);
+                        
+                        logger.info("团课二维码上传到OSS成功 - id={}, qrCodeUrl={}", course.getId(), qrCodeUrl);
+                        
+                        // 更新团课信息，保存二维码路径
+                        return groupCourseRepository.update(course)
+                                .doOnSuccess(updatedCourse -> logger.info("团课创建成功 - id={}, name={}", updatedCourse.getId(), updatedCourse.getCourseName()));
+                    } catch (Exception e) {
+                        logger.error("团课二维码生成失败 - id={}, error: {}", course.getId(), e.getMessage(), e);
+                        // 即使二维码生成失败，也返回成功创建的团课
+                        return Mono.just(course);
+                    }
+                })
                 .flatMap(course -> clearCache().thenReturn(course))
                 .doOnError(error -> logger.error("团课创建失败 - error: {}", error.getMessage()));
     }
@@ -203,12 +341,12 @@ public class GroupCourseService implements IGroupCourseService {
                     if (groupCourse.getDescription() != null) {
                         existing.setDescription(groupCourse.getDescription());
                     }
-                    if (groupCourse.getPointCardAmount() != null) {
-                        existing.setPointCardAmount(groupCourse.getPointCardAmount());
-                    }
                     if (groupCourse.getStoredValueAmount() != null) {
                         existing.setStoredValueAmount(groupCourse.getStoredValueAmount());
                     }
+                    if (groupCourse.getQrCodePath() != null) {
+                        existing.setQrCodePath(groupCourse.getQrCodePath());
+                    }
                     return groupCourseRepository.update(existing);
                 })
                 .doOnSuccess(course -> logger.info("团课更新成功 - id={}", id))
@@ -258,12 +396,11 @@ public class GroupCourseService implements IGroupCourseService {
         return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
                 .switchIfEmpty(Mono.error(new RuntimeException("课程不存在")))
                 .flatMap(course -> {
-                    Integer pointCardAmount = course.getPointCardAmount() != null ? course.getPointCardAmount() : 1;
                     Double storedValueAmount = course.getStoredValueAmount() != null ? 
                             course.getStoredValueAmount().doubleValue() : DEFAULT_GROUP_COURSE_PRICE;
                     
-                    logger.info("课程权益信息: courseId={}, pointCardAmount={}, storedValueAmount={}", 
+                    logger.info("课程权益信息: courseId={}, storedValueAmount={}", 
-                            courseId, pointCardAmount, storedValueAmount);
+                            courseId, storedValueAmount);
                     
                     return bookingRepository.findByCourseId(courseId)
                             .filter(booking -> "0".equals(booking.getStatus())) // 只处理已预约状态的记录
@@ -274,8 +411,8 @@ public class GroupCourseService implements IGroupCourseService {
                                     return Mono.empty();
                                 }
                                 
-                                // 根据会员卡类型返还权益
+                                // 根据会员卡类型返还权益（仅储值卡返还金额）
-                                return refundCardUsage(booking.getId(), memberCardRecordId, pointCardAmount, storedValueAmount)
+                                return refundCardUsage(booking.getId(), memberCardRecordId, storedValueAmount)
                                         .doOnSuccess(unused -> logger.info("会员权益返还成功: bookingId={}, memberId={}", 
                                                 booking.getId(), booking.getMemberId()))
                                         .doOnError(error -> logger.error("会员权益返还失败: bookingId={}, memberId={}, error={}", 
@@ -291,11 +428,10 @@ public class GroupCourseService implements IGroupCourseService {
      * 
      * @param bookingId 预约ID
      * @param recordId 会员卡记录ID
-     * @param pointCardAmount 次卡返还次数
      * @param storedValueAmount 储值卡返还金额
      * @return 空Mono
      */
-    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Integer pointCardAmount, Double storedValueAmount) {
+    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Double storedValueAmount) {
         return memberCardRecordService.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
                 .flatMap(record -> {
@@ -306,10 +442,9 @@ public class GroupCourseService implements IGroupCourseService {
                                 Mono<Void> refundOperation;
                                 switch (cardType) {
                                     case COUNT_CARD:
-                                        // 次卡返还次数（基于课程设置的pointCardAmount）
+                                        // 次卡不再支持团课预约，无需返还
-                                        logger.debug("返还次卡次数: recordId={}, amount={}", recordId, pointCardAmount);
+                                        logger.debug("次卡不返还权益: bookingId={}", bookingId);
-                                        refundOperation = memberCardRecordService.renewCard(recordId, pointCardAmount, 0.0, record.getExpireTime())
+                                        refundOperation = Mono.empty();
-                                                .then(Mono.empty());
                                         break;
                                     case STORED_VALUE_CARD:
                                         // 储值卡返还金额（基于课程设置的storedValueAmount）
@@ -341,26 +476,56 @@ public class GroupCourseService implements IGroupCourseService {
     @Override
     public Mono<GroupCourse> signIn(Long courseId, Long memberId) {
         return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
-                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在或已删除")))
                 .flatMap(course -> {
-                    if (course.getStatus() != 0L) {
+                    // 校验1：团课已取消
-                        return Mono.error(new RuntimeException("课程状态不允许签到"));
+                    if (course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已取消，无法签到"));
                     }
                     
+                    // 校验2：团课已结束
+                    if (course.getStatus().equals(CourseStatus.ENDED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验3：签到时间校验（开课前2小时内才能签到）
+                    LocalDateTime now = LocalDateTime.now();
+                    LocalDateTime signInStart = course.getStartTime().minusHours(2);
+                    if (now.isBefore(signInStart)) {
+                        return Mono.error(new RuntimeException("未到签到时间，请在开课前2小时内签到"));
+                    }
+                    if (now.isAfter(course.getEndTime())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验4：课程已满员
                     if (course.getCurrentMembers() >= course.getMaxMembers()) {
-                        return Mono.error(new RuntimeException("课程已满员"));
+                        return Mono.error(new RuntimeException("课程已满员，无法签到"));
                     }
                     
-                    // 检查会员是否已预约此课程
+                    // 校验5：用户今日是否已到店签到（直接查询sign_in_record表）
-                    return bookingRepository.findValidBooking(courseId, memberId)
+                    LocalDateTime todayStart = LocalDateTime.now().toLocalDate().atStartOfDay();
-                            .switchIfEmpty(Mono.error(new RuntimeException("会员未预约此课程")))
+                    LocalDateTime todayEnd = todayStart.plusDays(1);
-                            .flatMap(booking -> {
+                    return databaseClient.sql("SELECT sign_in_status FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false ORDER BY sign_in_time DESC LIMIT 1")
-                                // 更新课程当前人数
+                            .bind("memberId", memberId)
-                                return groupCourseRepository.updateCurrentMembers(courseId, 1)
+                            .bind("startTime", todayStart)
-                                        .flatMap(updatedCourse -> {
+                            .bind("endTime", todayEnd)
-                                            // 更新预约状态为已出席
+                            .map(row -> row.get("sign_in_status", String.class))
-                                            return bookingRepository.updateStatus(booking.getId(), "2")
+                            .one()
-                                                    .thenReturn(updatedCourse);
+                            .switchIfEmpty(Mono.error(new RuntimeException("请先完成到店签到")))
+                            .flatMap(status -> {
+                                if (!"SUCCESS".equals(status)) {
+                                    return Mono.error(new RuntimeException("到店签到未成功，请重新签到"));
+                                }
+                                // 校验6：用户已预约此课程（有效预约，状态为0-已预约）
+                                return bookingRepository.findValidBooking(courseId, memberId)
+                                        .switchIfEmpty(Mono.error(new RuntimeException("您未预约此课程，无法签到")))
+                                        .flatMap(booking -> {
+                                            return groupCourseRepository.updateCurrentMembers(courseId, 1)
+                                                    .flatMap(updatedCourse -> {
+                                                        return bookingRepository.updateStatus(booking.getId(), "2")
+                                                                .thenReturn(updatedCourse);
+                                                    });
                                         });
                             });
                 })
@@ -389,8 +554,21 @@ public class GroupCourseService implements IGroupCourseService {
                 });
     }
 
+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        logger.info("多条件查询团课 - courseName={}, courseType={}, startDate={}, endDate={}, timePeriod={}, priceSort={}, remainingMost={}", 
+                query.getCourseName(), query.getCourseType(), query.getStartDate(), query.getEndDate(), 
+                query.getTimePeriod(), query.getPriceSort(), query.getRemainingMost());
+        
+        return groupCourseRepository.searchGroupCourses(query)
+                .doOnSuccess(result -> logger.info("多条件查询结果 - total={}, page={}, size={}", 
+                        result.getTotalElements(), result.getCurrentPage(), result.getPageSize()))
+                .doOnError(error -> logger.error("多条件查询失败 - error: {}", error.getMessage()));
+    }
+
     private Mono<Void> clearCache() {
         return redisUtil.deleteByPattern(CACHE_KEY_PREFIX + "*")
-                .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*")).then();
+                .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*"))
+                .then(redisUtil.deleteByPattern(CACHE_KEY_DETAIL_PREFIX + "*")).then();
     }
 }

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

@@ -0,0 +1,86 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
+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.util.HashSet;
+import java.util.Set;
+
+@Service
+public class GroupCourseTypeService implements IGroupCourseTypeService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseTypeService.class);
+
+    private final IGroupCourseTypeRepository groupCourseTypeRepository;
+
+    public GroupCourseTypeService(IGroupCourseTypeRepository groupCourseTypeRepository) {
+        this.groupCourseTypeRepository = groupCourseTypeRepository;
+    }
+
+    @Override
+    public Mono<GroupCourseType> findById(Long id) {
+        return groupCourseTypeRepository.findById(id);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findAll() {
+        return groupCourseTypeRepository.findAll(false);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findAll(boolean includeDeleted) {
+        return groupCourseTypeRepository.findAll(includeDeleted);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByKeyword(String keyword) {
+        return groupCourseTypeRepository.findByKeyword(keyword);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByCategory(String category) {
+        return groupCourseTypeRepository.findByCategory(category);
+    }
+
+    @Override
+    public Flux<GroupCourseType> findByCategoryAndKeyword(String category, String keyword) {
+        return groupCourseTypeRepository.findByCategoryAndKeyword(category, keyword);
+    }
+
+    @Override
+    public Mono<GroupCourseType> create(GroupCourseType groupCourseType) {
+        return groupCourseTypeRepository.findByTypeName(groupCourseType.getTypeName())
+                .flatMap(existing -> Mono.<GroupCourseType>error(new RuntimeException("团课类型名称已存在")))
+                .switchIfEmpty(groupCourseTypeRepository.save(groupCourseType))
+                .doOnSuccess(type -> logger.info("团课类型创建成功 - id={}, name={}", type.getId(), type.getTypeName()))
+                .doOnError(error -> logger.error("团课类型创建失败 - error: {}", error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourseType> update(Long id, GroupCourseType groupCourseType) {
+        return groupCourseTypeRepository.update(groupCourseType)
+                .doOnSuccess(type -> logger.info("团课类型更新成功 - id={}", id))
+                .doOnError(error -> logger.error("团课类型更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> delete(Long id) {
+        return groupCourseTypeRepository.deleteById(id)
+                .doOnSuccess(v -> logger.info("团课类型删除成功 - id={}", id))
+                .doOnError(error -> logger.error("团课类型删除失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Flux<String> findCategories() {
+        return groupCourseTypeRepository.findAll(false)
+                .map(GroupCourseType::getCategory)
+                .filter(category -> category != null && !category.isEmpty())
+                .distinct();
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/util/OSSUtil.java

@@ -0,0 +1,109 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.PutObjectRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 阿里云OSS工具类
+ */
+public class OSSUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(OSSUtil.class);
+
+    // OSS配置信息
+    private static final String ENDPOINT = "oss-cn-beijing.aliyuncs.com";
+    private static final String ACCESS_KEY_ID = "LTAI5t9TFh9Vayeahz45kZjg";
+    private static final String ACCESS_KEY_SECRET = "zD6NlCeH5UhjBs4vnQVqn8Ksi3CaZz";
+    private static final String BUCKET_NAME = "ycc-filesaver";
+
+    // OSS访问地址前缀
+    private static final String OSS_URL_PREFIX = "https://" + BUCKET_NAME + "." + ENDPOINT + "/";
+
+    // 文件存储目录
+    private static final String QRCODE_DIR = "qrcode/";
+
+    /**
+     * 上传文件到阿里云OSS
+     *
+     * @param localFilePath 本地文件路径
+     * @param fileName 文件名（不含路径）
+     * @return OSS访问地址
+     */
+    public static String uploadToOSS(String localFilePath, String fileName) {
+        OSS ossClient = null;
+        try {
+            // 创建OSS客户端
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            // 构建OSS文件路径：qrcode/2026/06/18/xxx.png
+            String datePath = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+            String ossFilePath = QRCODE_DIR + datePath + "/" + fileName;
+
+            // 创建上传请求
+            PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, ossFilePath, new File(localFilePath));
+
+            // 上传文件
+            ossClient.putObject(putObjectRequest);
+
+            // 构建访问地址
+            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+
+            logger.info("文件上传到OSS成功: localPath={}, ossUrl={}", localFilePath, accessUrl);
+
+            return accessUrl;
+        } catch (Exception e) {
+            logger.error("文件上传到OSS失败 - localPath: {}, error: {}", localFilePath, e.getMessage(), e);
+            throw new RuntimeException("文件上传到OSS失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+
+    /**
+     * 上传文件到阿里云OSS（自定义存储路径）
+     *
+     * @param localFilePath 本地文件路径
+     * @param ossDirectory OSS存储目录
+     * @param fileName 文件名（不含路径）
+     * @return OSS访问地址
+     */
+    public static String uploadToOSS(String localFilePath, String ossDirectory, String fileName) {
+        OSS ossClient = null;
+        try {
+            // 创建OSS客户端
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            // 构建OSS文件路径
+            String ossFilePath = ossDirectory + fileName;
+
+            // 创建上传请求
+            PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, ossFilePath, new File(localFilePath));
+
+            // 上传文件
+            ossClient.putObject(putObjectRequest);
+
+            // 构建访问地址
+            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+
+            logger.info("文件上传到OSS成功: localPath={}, ossUrl={}", localFilePath, accessUrl);
+
+            return accessUrl;
+        } catch (Exception e) {
+            logger.error("文件上传到OSS失败 - localPath: {}, error: {}", localFilePath, e.getMessage(), e);
+            throw new RuntimeException("文件上传到OSS失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+}

gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/util/QRCodeUtil.java

@@ -0,0 +1,156 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 二维码生成工具类
+ */
+public class QRCodeUtil {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
+    
+    // 二维码默认保存路径（本地临时路径）
+    private static final String DEFAULT_SAVE_PATH = "D:\\Games\\exmp\\image";
+    
+    // 二维码尺寸
+    private static final int QR_CODE_WIDTH = 300;
+    private static final int QR_CODE_HEIGHT = 300;
+    
+    /**
+     * 生成二维码并保存到指定路径
+     * 
+     * @param content 二维码内容
+     * @param savePath 保存路径
+     * @param fileName 文件名（不含扩展名）
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCode(String content, String savePath, String fileName) {
+        try {
+            Path directory = Paths.get(savePath);
+            if (!Files.exists(directory)) {
+                Files.createDirectories(directory);
+                logger.info("创建二维码保存目录: {}", savePath);
+            }
+            
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.MARGIN, 1);
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
+            
+            String filePath = Paths.get(savePath, fileName + ".png").toString();
+            Path path = Paths.get(filePath);
+            
+            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
+            logger.info("二维码生成成功: {}", filePath);
+            
+            return filePath;
+        } catch (WriterException e) {
+            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("二维码保存失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码保存失败: " + e.getMessage(), e);
+        }
+    }
+    
+    /**
+     * 生成二维码并保存到默认路径
+     * 文件名格式: UUID + 创建时间
+     * 
+     * @param content 二维码内容
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCode(String content) {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        String fileName = uuid + "_" + timestamp;
+        
+        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
+    }
+    
+    /**
+     * 生成二维码并保存到默认路径，使用自定义文件名
+     * 
+     * @param content 二维码内容
+     * @param fileName 文件名（不含扩展名）
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCodeWithFileName(String content, String fileName) {
+        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
+    }
+    
+    /**
+     * 生成二维码并上传到阿里云OSS
+     * 文件名格式: UUID + 创建时间
+     * 
+     * @param content 二维码内容
+     * @return 阿里云OSS访问地址
+     */
+    public static String generateQRCodeAndUploadToOSS(String content) {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        String fileName = uuid + "_" + timestamp + ".png";
+        
+        return generateQRCodeAndUploadToOSS(content, fileName);
+    }
+    
+    /**
+     * 生成二维码并上传到阿里云OSS
+     * 
+     * @param content 二维码内容
+     * @param fileName 文件名（含扩展名）
+     * @return 阿里云OSS访问地址
+     */
+    public static String generateQRCodeAndUploadToOSS(String content, String fileName) {
+        try {
+            Path tempDir = Files.createTempDirectory("qrcode_temp");
+            String tempFilePath = tempDir.resolve(fileName).toString();
+            
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.MARGIN, 1);
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
+            
+            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", Paths.get(tempFilePath));
+            logger.info("二维码临时文件生成成功: {}", tempFilePath);
+            
+            String ossUrl = OSSUtil.uploadToOSS(tempFilePath, fileName);
+            
+            Files.deleteIfExists(Paths.get(tempFilePath));
+            Files.deleteIfExists(tempDir);
+            logger.info("临时文件已删除: {}", tempFilePath);
+            
+            return ossUrl;
+        } catch (WriterException e) {
+            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("二维码处理失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码处理失败: " + e.getMessage(), e);
+        }
+    }
+}

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

@@ -1,13 +0,0 @@
-package cn.novalon.gym.manage.groupcourse;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class GymGroupCourseApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

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

@@ -0,0 +1,71 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * QRCodeUtil测试类
+ */
+class QRCodeUtilTest {
+
+    @TempDir
+    Path tempDir;
+
+    @Test
+    void testGenerateQRCode() {
+        String content = "测试二维码内容";
+        String qrCodePath = QRCodeUtil.generateQRCode(content);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        assertTrue(qrCodePath.contains("D:\\Games\\exmp\\image"), "二维码应保存到指定路径");
+        
+        System.out.println("生成的二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeWithCustomPath() {
+        String content = "自定义路径测试";
+        String customPath = tempDir.toString();
+        String fileName = "test_qrcode";
+        
+        String qrCodePath = QRCodeUtil.generateQRCode(content, customPath, fileName);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        assertTrue(qrCodePath.contains(fileName), "二维码文件名应包含指定名称");
+        
+        System.out.println("生成的二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeWithJsonContent() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
+        
+        String qrCodePath = QRCodeUtil.generateQRCode(jsonContent);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        
+        System.out.println("JSON内容二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeAndUploadToOSS() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
+        
+        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
+        
+        assertNotNull(ossUrl, "OSS访问地址不应为空");
+        assertTrue(ossUrl.startsWith("https://"), "OSS访问地址应为HTTPS");
+        assertTrue(ossUrl.contains("ycc-filesaver.oss-cn-beijing.aliyuncs.com"), "OSS访问地址应包含正确的域名");
+        assertTrue(ossUrl.contains("/qrcode/"), "OSS访问地址应包含qrcode目录");
+        assertTrue(ossUrl.endsWith(".png"), "OSS访问地址应为PNG格式");
+        
+        System.out.println("上传到OSS的二维码地址: " + ossUrl);
+    }
+}

gym-manage-api/gym-member/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-member/src/main/java/cn/novalon/gym/manage/member/entity/Member.java

@@ -71,6 +71,22 @@ public class Member extends BaseEntity {
     @Column("official_open_id")
     private String officialOpenId;
 
+    // 阿里云号码认证OpenID
+    @Column("dypns_open_id")
+    private String dypnsOpenId;
+
+    // 身份证号码（AES加密存储）
+    @Column("id_card")
+    private String idCard;
+
+    // 真实姓名（AES加密存储）
+    @Column("real_name")
+    private String realName;
+
+    // 注册渠道：SMS-短信验证码，ONE_CLICK-一键登录，WECHAT-微信授权
+    @Column("register_channel")
+    private String registerChannel;
+
     // 软删除
     @Column("is_deleted")
     private Boolean isDeleted;

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

@@ -32,6 +32,7 @@ public class MemberCardRecordHandler {
 
     @Operation(summary = "购买会员卡", description = "支持时长卡、次卡、储值卡，自动设置到期提醒")
     public Mono<ServerResponse> purchaseCard(ServerRequest request) {
+        
         return request.bodyToMono(PurchaseRequest.class)
                 .flatMap(body -> memberCardService.purchaseCard(
                         body.getMemberId(),

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.member.handler;
 
+import cn.novalon.gym.manage.common.exception.NotFoundException;
 import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.dto.AdminUpdatePhoneDto;
 import cn.novalon.gym.manage.member.dto.SearchMemberDto;
@@ -16,6 +17,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
@@ -50,7 +52,11 @@ public class MemberHandler {
         return memberService.getMemberInfo(memberId)
                 .flatMap(info -> ServerResponse.ok()
                             .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(info));
+                            .bodyValue(info))
+                .onErrorResume(NotFoundException.class, e -> 
+                    ServerResponse.status(HttpStatus.NOT_FOUND)
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .bodyValue(java.util.Map.of("code", 404, "message", e.getMessage())));
     }
 
     @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息")

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.member.service.impl;
 
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
@@ -15,7 +16,6 @@ import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
 import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

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

@@ -65,21 +65,37 @@ public class MemberServiceImpl implements MemberService {
     public Mono<MemberInfoVO> getMemberInfo(Long memberId) {
         String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
 
+        // 先查缓存
         return redisUtil.get(cacheKey, MemberInfoVO.class)
                 .flatMap(cached -> {
                     if (cached != null) {
                         log.debug("从缓存获取会员信息, memberId: {}", memberId);
                         return Mono.just(cached);
                     }
-                    return memberRepository.findById(memberId)
+                    // 缓存没有，查数据库
-                            .map(this::buildMemberInfoResponse)
+                    return queryFromDatabaseAndCache(memberId, cacheKey);
-                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                })
-                                    .then(Mono.just(vo)))
+                .switchIfEmpty(Mono.defer(() -> {
-                            .switchIfEmpty(Mono.error(() -> {
+                    // 缓存返回null，查数据库
-                                log.error("会员不存在: memberId={}", memberId);
+                    return queryFromDatabaseAndCache(memberId, cacheKey);
-                                throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                }));
-                            }));
+    }
-                });
+
+    /**
+     * 从数据库查询并更新缓存
+     */
+    private Mono<MemberInfoVO> queryFromDatabaseAndCache(Long memberId, String cacheKey) {
+        return memberRepository.findById(memberId)
+                .map(this::buildMemberInfoResponse)
+                .flatMap(vo -> {
+                    // 查询到数据后更新缓存
+                    return redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                            .then(Mono.just(vo));
+                })
+                .switchIfEmpty(Mono.error(() -> {
+                    log.error("会员不存在: memberId={}", memberId);
+                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                }));
     }
 
     @Override

gym-manage-api/gym-member/src/test/java/cn/novalon/gym/manage/member/MemberModuleTest.java

@@ -1,16 +0,0 @@
-package cn.novalon.gym.manage.member;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 会员模块测试类
- */
-@SpringBootTest
-public class MemberModuleTest {
-
-    @Test
-    void contextLoads() {
-        // 测试Spring上下文是否能正常加载
-    }
-}

gym-manage-api/info/6666000208197943.txt

@@ -0,0 +1,5 @@
+公钥：MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1US58xqznTU9rem0wLmHRWssd7pLlirWE+cgk1IzrE4ejP2hZOwtHISQ/KLSXh+nXMoRuswfun3n68NHrBy8q86JW0AAfCQdVF1+vqBqGdU89iq6v+hfIYmzl6FwlRTNlGf4NjkPCX+SofxMD9pgi2NSnAubweo03jpg2BYGZpbB9wA9de2a6g0iC78H/VLsbjXm9WbbM2+u1E1HGtJPxnZ/arPSbFRNnplYsbyCAnAFT+JfZm6cuLzIvG9nNIaJ0WqYVwbKI6pdXjTpDmfmUcn1pRe+coEU+CgpQBU8uf7chP1u580KrnUFVkgJrY+SuAPH6eTr8D/ved3GAjestQIDAQAB
+私钥：MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDVRLnzGrOdNT2t6bTAuYdFayx3ukuWKtYT5yCTUjOsTh6M/aFk7C0chJD8otJeH6dcyhG6zB+6fefrw0esHLyrzolbQAB8JB1UXX6+oGoZ1Tz2Krq/6F8hibOXoXCVFM2UZ/g2OQ8Jf5Kh/EwP2mCLY1KcC5vB6jTeOmDYFgZmlsH3AD117ZrqDSILvwf9UuxuNeb1Ztszb67UTUca0k/Gdn9qs9JsVE2emVixvIICcAVP4l9mbpy4vMi8b2c0honRaphXBsojql1eNOkOZ+ZRyfWlF75ygRT4KClAFTy5/tyE/W7nzQqudQVWSAmtj5K4A8fp5OvwP+953cYCN6y1AgMBAAECggEADiwB+1Cj7Odz0NG97Cyn+4nyq4YarcDs9ued94w32NRcHVxhVDaJjOKWS+N5/T03PuhCo1obJaZmOfmBEsPaGcSgxgqLvbQcqtWHrZ01T8Amy+js/gGwCKeA4qucsptuSdVa3ieOg0AR+2ermkYVsk2IWMxArnMkzjus4c8c38Y3xJu+Nhd7HfKokH6TUluh2cwHqZLUJuDNkKLCuEgDJqNMyFGC99tLqGldMLuM2g7RVSNDsmzxXZC2vliLfsrwRF8TAZK0Fx5rgLj5WRnGFt3BfcVznDimHOOoBGyvl+1rFkpeb6iKcfKV9IcZN7iZN2/yunKtouqip4FVht8OAQKBgQD3YjR2rU7aWbLu+54c6YTYI1P+h6K8OLqWm0YgXZPFawxK46rEYWEk8noCI6SpQcNKxmqQ61ysv61yTVBL7bwHSF2mSSkfmzPjBS8aO4NVNCTaxU/S84ky/ROXJwXVXHGaVerXEnZGbVlJfHKM7ui80R9hPdGjn0cqEUgdAxiCNQKBgQDcslV096ok0o4iLuwzYmaM1Mtd9ZWy1fh+IG//0oocKNXA3W3Z0mKUyqEnheD3wRsKmiCVEWY+mD1YuRzDupFtlyNv7eet1dmbumXp+icZGiCHPTDEMHpNdpjWhD0x1juMnsrVyf7DKuL0gtT5I+MIdAVAQ3n4sGtdS6n/RyfQgQKBgQCarTOidJBWJDmmBXuCFlxyi/xLrGELEOlRm7qIKBpqGJmyBZHTghOsd1PkHIcrMSw7h74/6HmkpaB8VGz9XKLxZsTvYNUupusVajteSpG+Z4EXrMFRY+aIFAb4vnR+SHPbjRbt7OQ4+swWD5LMHeE1lgfp1C5NAR0M54tQYIwldQKBgBawtxyJghK7GyXkkSBPU5/TGP2WDEgQu7Wr/BffO5fdkux7V5n3iW8mzh7UIucWEYOriQIKgeqZmGUQ0yZEfkM4MMqHOTSkMfVS2ruNnot0JjgBUIw7N7fTI6+adPg0wHaatNv6IplKRX9CHEdpKyRpWUjcJyQsbz1uVBIM7MkBAoGBAJYDO/uvsYLjlRGJSOiY0u0Nc6aubtdwIx5MB9toLCSj0ATHqB8SYf1KnnGOMxUgjpLZsMnkbEyC8+oHslFNkb/uUdoitpxKgQ/sPwh+GkO+Z38obSXJ8FiRoMA6I7zCH3qgsMN3kmF3Y4njhYqGR0g8o95yNqV3yuVTOcLSzpyx
+汇付公钥：MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxPEF/yDN4/kavunWrR6hl5wFq9vVyCsNsQMYQg1r607YfVmB6oqgkM/ytH8N85LU5bF45CQ12TyMJWdb/ltpy1yZN26olcknVP1IznvPZlXJUCGJndNVJnHXr1HgSphwVvPyOcrn9B1/phdnbO2+96ChFKRjz5fjnatMaRteapMFBvw4qcoumLtWdTLH85scng4SWMBfuj0Q9LdmB377KKkJl3x3fSgjUw4SquS2fUv6tqGQwyzCKRg2k5KRIb/HgaqdyMt7/SjMX5L1QpFNKbYlg7vTpf3jdh4JefvAk+/kiQO34GeWOzJpSNUWs/GxJUg9eWcCqCsM7aHRXhBTWQIDAQAB
+sys_id：6666000208197943
+product_id：XLSISV

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

@@ -53,7 +53,12 @@
             <artifactId>gym-dataCount</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-auth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>

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

@@ -10,14 +10,13 @@ import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDeta
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.server.WebFilter;
 
 import java.util.List;
 
 @SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = {
         ReactiveUserDetailsServiceAutoConfiguration.class })
-@EnableScheduling
+//@EnableScheduling
 @EnableR2dbcRepositories(basePackages = {
         "cn.novalon.gym.manage.db.dao",
         "cn.novalon.gym.manage.sys.audit.repository" ,

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

@@ -1,11 +1,16 @@
 package cn.novalon.gym.manage.app.config;
 
 
+import cn.novalon.gym.manage.auth.handler.PhoneAuthHandler;
 import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
 import cn.novalon.gym.manage.datacount.handler.DataStatisticsHandler;
 import cn.novalon.gym.manage.file.handler.SysFileHandler;
+
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseRecommendHandler;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseTypeHandler;
+import cn.novalon.gym.manage.groupcourse.handler.CourseLabelHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardRecordHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardTransactionHandler;
@@ -69,8 +74,12 @@ public class SystemRouter {
             MemberCardTransactionHandler memberCardTransactionHandler,
             GroupCourseHandler groupCourseHandler,
             GroupCourseBookingHandler groupCourseBookingHandler,
+            GroupCourseRecommendHandler groupCourseRecommendHandler,
+            GroupCourseTypeHandler groupCourseTypeHandler,
+            CourseLabelHandler courseLabelHandler,
             CheckInHandler checkInHandler,
-            DataStatisticsHandler dataStatisticsHandler) {
+            DataStatisticsHandler dataStatisticsHandler,
+            PhoneAuthHandler phoneAuthHandler) {
 
         return route()
                 // ========== 诊断路由 ==========
@@ -186,10 +195,13 @@ public class SystemRouter {
 
                 // ========== 消息路由 ==========
                 .GET("/api/messages/user/{userId}", messageHandler::getMessagesByUser)
+                .GET("/api/messages/user/{userId}/page", messageHandler::getMessagesByUserPage)
                 .GET("/api/messages/user/{userId}/unread", messageHandler::getUnreadCount)
                 .GET("/api/messages/user/{userId}/unread/list", messageHandler::getUnreadList)
+                .GET("/api/messages/user/{userId}/unread/page", messageHandler::getUnreadMessagesPage)
                 .POST("/api/messages", messageHandler::createMessage)
                 .PUT("/api/messages/{id}/read", messageHandler::markAsRead)
+                .PUT("/api/messages/user/{userId}/read", messageHandler::markAllAsRead)
                 .DELETE("/api/messages/{id}", messageHandler::deleteMessage)
 
                 // ========== 文件路由 ==========
@@ -212,6 +224,11 @@ public class SystemRouter {
                 .PUT("/api/permissions/{id}", permissionHandler::updatePermission)
                 .DELETE("/api/permissions/{id}", permissionHandler::deletePermission)
 
+                // ========== 手机号认证路由 ==========
+                .POST("/api/auth/phone/one-click-login", phoneAuthHandler::oneClickLogin)
+                .POST("/api/auth/phone/send-code", phoneAuthHandler::sendSmsCode)
+                .POST("/api/auth/phone/code-login", phoneAuthHandler::codeLogin)
+
                 // ========== 会员模块路由 - 微信认证 ==========
                 .POST("/api/member/auth/miniapp/login", wechatAuthHandler::miniappLogin)
                 .GET("/api/member/auth/mp/callback", wechatAuthHandler::verifyMpSignature)
@@ -265,12 +282,28 @@ public class SystemRouter {
                 // ===== 团课课程管理 =====
                 .GET("/api/groupCourse/list", groupCourseHandler::getAllGroupCourse)
                 .POST("/api/groupCourse/page", groupCourseHandler::getGroupCoursesByPage)
-                .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById)
+
-                .POST("/api/groupCourse", groupCourseHandler::createGroupCourse)
+                // ===== 团课类型管理 =====
-                .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse)
+                .GET("/api/groupCourse/types", groupCourseTypeHandler::getAllGroupCourseTypes)
-                .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse)
+                .GET("/api/groupCourse/types/search", groupCourseTypeHandler::searchGroupCourseTypes)
-                .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse)
+                .GET("/api/groupCourse/types/categories", groupCourseTypeHandler::getCategories)
-                .POST("/api/groupCourse/{courseId}/signin", groupCourseHandler::signIn)
+                .GET("/api/groupCourse/types/category/{category}", groupCourseTypeHandler::getGroupCourseTypesByCategory)
+                .GET("/api/groupCourse/types/{id}", groupCourseTypeHandler::getGroupCourseTypeById)
+                .POST("/api/groupCourse/types", groupCourseTypeHandler::createGroupCourseType)
+                .PUT("/api/groupCourse/types/{id}", groupCourseTypeHandler::updateGroupCourseType)
+                .DELETE("/api/groupCourse/types/{id}", groupCourseTypeHandler::deleteGroupCourseType)
+
+                // ===== 团课标签管理 =====
+                .GET("/api/groupCourse/labels", courseLabelHandler::getAllLabels)
+                .GET("/api/groupCourse/labels/search", courseLabelHandler::searchLabels)
+                .GET("/api/groupCourse/labels/{id}", courseLabelHandler::getLabelById)
+                .GET("/api/groupCourse/types/{typeId}/labels", courseLabelHandler::getLabelsByTypeId)
+                .POST("/api/groupCourse/labels", courseLabelHandler::createLabel)
+                .PUT("/api/groupCourse/labels/{id}", courseLabelHandler::updateLabel)
+                .DELETE("/api/groupCourse/labels/{id}", courseLabelHandler::deleteLabel)
+                .POST("/api/groupCourse/types/{typeId}/labels", courseLabelHandler::addLabelsToType)
+                .DELETE("/api/groupCourse/types/{typeId}/labels/{labelId}", courseLabelHandler::removeLabelFromType)
+                .DELETE("/api/groupCourse/types/{typeId}/labels", courseLabelHandler::clearLabelsFromType)
 
                 // ===== 团课预约管理 =====
                 .POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse)
@@ -278,6 +311,27 @@ public class SystemRouter {
                 .GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId)
                 .GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
                 .GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)
+
+                // ===== 团课推荐管理 =====
+                .GET("/api/groupCourse/recommend/list", groupCourseRecommendHandler::getAllRecommendations)
+                .GET("/api/groupCourse/recommend/active", groupCourseRecommendHandler::getAllActiveRecommendations)
+                .GET("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::getRecommendationById)
+                .GET("/api/groupCourse/recommend/course/{courseId}", groupCourseRecommendHandler::getRecommendationsByCourseId)
+                .POST("/api/groupCourse/recommend", groupCourseRecommendHandler::createRecommendation)
+                .PUT("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::updateRecommendation)
+                .DELETE("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::deleteRecommendation)
+                .POST("/api/groupCourse/recommend/{id}/enable", groupCourseRecommendHandler::enableRecommendation)
+                .POST("/api/groupCourse/recommend/{id}/disable", groupCourseRecommendHandler::disableRecommendation)
+
+                // ===== 团课课程管理（需要放在具体路由之后）=====
+                .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById)
+                .GET("/api/groupCourse/{id}/detail", groupCourseHandler::getGroupCourseDetailById)
+                .POST("/api/groupCourse", groupCourseHandler::createGroupCourse)
+                .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse)
+                .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse)
+                .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse)
+                .POST("/api/groupCourse/signin/{memberId}", groupCourseHandler::signIn)
+                .POST("/api/groupCourse/search", groupCourseHandler::searchGroupCourses)
                 
                 // ========= 签到模块路由 ==========
                 // ===== 签到核心功能 =====
@@ -306,6 +360,7 @@ public class SystemRouter {
                 .GET("/api/datacount/signin", dataStatisticsHandler::getSignInStatistics)
                 .GET("/api/datacount/history", dataStatisticsHandler::queryHistoricalStatistics)
                 .GET("/api/datacount/export", dataStatisticsHandler::exportStatistics)
+
                 .build();
     }
 }

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

@@ -2,9 +2,9 @@ spring:
   cache:
     type: none
   r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
+    url: r2dbc:postgresql://localhost:5432/manage_system
-    username: novalon
+    username: postgres
-    password: novalon123
+    password: 123456
     pool:
       initial-size: 5
       max-size: 20
@@ -12,13 +12,13 @@ spring:
       max-life-time: 30m
       acquire-timeout: 3s
   flyway:
-    url: jdbc:postgresql://localhost:55432/manage_system
+    url: jdbc:postgresql://localhost:5432/manage_system
-    user: novalon
+    user: postgres
-    password: novalon123
+    password: 123456
-    enabled: true
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
-    validate-on-migrate: true
+    validate-on-migrate: false
 
 
 jwt:
@@ -36,3 +36,11 @@ logging:
     cn.novalon.manage: DEBUG
     org.springframework.r2dbc: DEBUG
     org.springframework.web: TRACE
+
+alibaba:
+  cloud:
+    sms:
+      access-key-id: LTAI5t8GhorWLu5WkEx8MDZz
+      access-key-secret: jNDwb9IHvTIESUezLYHZRT5c5NEaCz
+      sign-name: 云渚科技验证平台
+      template-code: 100001

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

@@ -4,8 +4,8 @@ spring:
     activate:
       on-profile: local
   r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
+    url: r2dbc:postgresql://localhost:5432/manage_system
-    username: novalon
+    username: postgres
     password: 123456
     pool:
       initial-size: 5
@@ -14,8 +14,8 @@ spring:
       max-life-time: 30m
       acquire-timeout: 3s
   datasource:
-    url: jdbc:postgresql://localhost:55432/manage_system
+    url: jdbc:postgresql://localhost:5432/manage_system
-    username: novalon
+    username: postgres
     password: 123456
     driver-class-name: org.postgresql.Driver
   flyway:
@@ -23,7 +23,7 @@ spring:
     locations: classpath:db/migration
     baseline-on-migrate: true
     baseline-version: 0
-    validate-on-migrate: true
+    validate-on-migrate: false
   sql:
     init:
       mode: always

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

@@ -4,7 +4,7 @@ spring:
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
   flyway:
-    enabled: true
+    enabled: false
 
 logging:
   level:

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

@@ -5,9 +5,9 @@ spring:
   application:
     name: manage-app
   r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
+    url: r2dbc:postgresql://localhost:5432/manage_system
-    username: novalon
+    username: postgres
-    password: novalon123
+    password: 123456
     pool:
       initial-size: 5
       max-size: 20

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

@@ -15,9 +15,9 @@ spring:
     exclude:
       - org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
   r2dbc:
-    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
+    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:novalon}
+    username: ${DB_USERNAME:postgres}
-    password: ${DB_PASSWORD:novalon123}
+    password: ${DB_PASSWORD:123456}
     pool:
       initial-size: 10
       max-size: 50
@@ -25,16 +25,16 @@ spring:
       max-life-time: 1h
       acquire-timeout: 5s
   datasource:
-    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
+    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:novalon}
+    username: ${DB_USERNAME:postgres}
-    password: ${DB_PASSWORD:novalon123}
+    password: ${DB_PASSWORD:123456}
     driver-class-name: org.postgresql.Driver
   flyway:
-    enabled: true
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
     baseline-version: 0
-    validate-on-migrate: true
+    validate-on-migrate: false
   security:
     user:
       name: disabled
@@ -54,7 +54,7 @@ spring:
   profiles:
     active: dev
   config:
-    import: classpath:member-config.yml
+    import: classpath:keys.properties,classpath:member-config.yml
 
 
 
@@ -94,3 +94,13 @@ springdoc:
   show-actuator: false
   default-consumes-media-type: application/json
   default-produces-media-type: application/json
+
+alibaba:
+  cloud:
+    sms:
+      access-key-id: LTAI5t8GhorWLu5WkEx8MDZz
+      access-key-secret: jNDwb9IHvTIESUezLYHZRT5c5NEaCz
+      sign-name: 云渚科技验证平台
+      template-code: 100001
+      code-length: 6
+      code-expire-seconds: 300

gym-manage-api/manage-app/src/main/resources/keys.properties

@@ -0,0 +1,6 @@
+huifu.private-key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNUdQE59I4bV1dIgLs2IRN3Wl8KI2yS4KpTUQWrvvlUcBTztB8rIeN5lr6Yv4VsZ1TG0FAb0D80JjxEQ1+0HizYNOQ1h2935v2r8h7rx3VTLbMOkmsg8Lb8LQRTbPaJOZfsIZMzBytYiRzWunHaMlCr800EA3q5NMj9VjHQuamxKqyzyHqfkIjA/sZ8q9atVjn8ahUjPKdrGA8b79HexHhCgOSLdK+fWw0eMCsWWYP2qECLsvZ+tjfvqSBXx1kg7womwT1VBCf+0Dx+jJPKR3mxQfz2szoucJYuXRo55kA6yCwoeNsjanLDRkPBSy3NHdKrffP6YODhRHG6KHyayyNAgMBAAECggEATIR69TEETVNCEzRgOxe9A2AYRoa6ukhSdhMFA/c5IuCR747yqh7MwtNwfVRuWRazpZUDTr0uhfT4asad9QUx5YZO54RX1EAn9XkWZ4nY8G46J/iDfapWLrp09U2KTVpfdn5hKWH3QRX7wI4AON2O49HGnSL4NjAx9q1YpYOe2bqevxmB4uD9vR/FHMjZ2qWzPaL7pId98x4DCJCiZctBQqb7gxR8EseD1Ddn2HbH5DEUjoxz2umtL+zrcGKDFBy4kM3r+10FP5jFG4fJfZFQwrzMTEkXJriau9DMRTQ83rWHzNvhdTNUuyqah74ez5V1piVEOXCPudzFsMttD2DyzQKBgQDokQH3WtcQqwFTUo+uWVVup4NoQzNZpEGIHK17afRsf9YnkoJVqjhywq1dhQT+yuyW9geJJKWpHQIAS4gGudhNK+j6d//bbvvbkOmtsdWyZ6Z2EmY8JrPkHdHAcadNJX7vrIc1xPeyci4AHhErDHc3hhD5njuSLx3DUp4iODNxKwKBgQCbjyHvP90YGjh49DWklh2NJgR2+OR6Fd0afdmwtGKeCUP5l2To6rfLBbcSRIWCON4iLME5wLLdHcm5wAQukC4dsUB5iZffp21+7hrrwUw/G0MUzFudfhZkjsDU5i+FwnVMqmsLJPUsjJTOfKsJdA2DjnwfMcgxw9FeClGveSFNJwKBgQDCpjuDECDY7oeZeYyQXGzIxKOTbEtaR8Qha/83QCM3fHd9f35evK2qP45iq6bWqnkCkMEV4/pTZNf77zvWhU2oqYvBtxYKTwW1a8BphGJbg60rPZMb3TjLQLoB3B4uz6dCaqBwPH8kd7RQnNm5siFF84vZoLozTAQZKtj3wxorKQKBgQCGKnEONHqwaw0B5T7O8VoTfxKiug/07B6C1sCGk03rF/q0rkquSKK0S/2Vl9u+cOXFe+w7r2OVKjfuKRpyPpBHs7T0HiQLFhBuRVaat2DXnN/CdG8f6rvNhwHxnYanSwx4TxN7zShYf/doEEZEJP/y01ViYkFUCpvtC+FgAo0iSQKBgFrkJGxPo6T7i5ZF7VoZWdARnypfbOl4gF9GMrXykk0fnKBDTof9Bg34a8OX54cf4yEH1ifZzVtNyzPTH9FxV88TksWRouqi1Uo6///kJI6gXROspE91TpNtNGHPgLhebA83WlFtS/H7i5G6RO+6KO0uflSImfy3Owp/ChyFUGmn
+huifu.public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjVHUBOfSOG1dXSIC7NiETd1pfCiNskuCqU1EFq775VHAU87QfKyHjeZa+mL+FbGdUxtBQG9A/NCY8RENftB4s2DTkNYdvd+b9q/Ie68d1Uy2zDpJrIPC2/C0EU2z2iTmX7CGTMwcrWIkc1rpx2jJQq/NNBAN6uTTI/VYx0LmpsSqss8h6n5CIwP7GfKvWrVY5/GoVIzynaxgPG+/R3sR4QoDki3Svn1sNHjArFlmD9qhAi7L2frY376kgV8dZIO8KJsE9VQQn/tA8foyTykd5sUH89rM6LnCWLl0aOeZAOsgsKHjbI2pyw0ZDwUstzR3Sq33z+mDg4URxuih8mssjQIDAQAB
+
+# 支付宝沙箱配置
+ALIPAY_APP_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCDKDW/bBiA8oclszYZmLIAS/yR4p47UGMR0yfsbrTgXwikHZp3YUhsNn2l8Ks2izgfciSwtxaKThnhYoK3h9toC8s09+641iFSq3yHg/vYuaEXMJzlk3Ilg//GFSXcB8mntAEX+xZE5NVyFmmx21OcoLH0kAwwwc9TgLtw71Ix6H6BgVy9oDozbi/ZlpVUNhODqUt9m/Spq7sdrdK78zW63JsqekszgdzyCdJPgVk7WRl4DWzJElT5eA1RKfiykAlxlohLLksU655nrdvRc9ZastRy+pVLGsOwrEDGyzNt6L+9dzKa/kdYSYVigHL7u7RZoUUDCfqJurLLfDM93/brAgMBAAECggEAS7zrlLfCSqxCuNWNVyijGaLHniLkRtI7824hLtobHzohzku+CFQoMz0gP7QD2sJ4TUhnwZhorsM9FLcDTyJn4+RzmwnVU+1rXsbiaYsg4t0HFlIfOD91+g4IpIVP0Ii6vVooC4YWLQCL9Y7VyDwkQ11Uhiqsr3cr10eOdj/tEh4fdC1/eWPvxFUKbIcMEI7DtBe5Y6jwkQ569kFrYsBjFnMWxftym1C/GvUIIhUP+2QWN5SmEcABlUPV4LbgwmkfSkwIvC4qcSR3+irM1Z4jikGtRPrxwVc3I7BjJZ+aLqLL89FL10X96pAq/NvjMS6lC5cumStEj483VjrEZQbOIQKBgQDRYGg4oCOaHR+cRvosQLYA89thzmFaB+MhKkKV9HWbCO/lM4jLX+nxNwPIeKmg9rfxAUuUnVpaLEgfIlQ6awR4bfu21fuSl40HFNSkJct9yWbT3T9dDov7Y1dFexFO59t+s+8/67wO5PP6FBGbPQu3bRLsAfVCeDm+7Tzv73T1EQKBgQCgXN57dVO0yo9jXZFfp+70Dhth9BonTGOZ+s2Wg9yCp8NmHeQ3fUGvWm0yCGCViw23YpYpfXdiRLm4kHe4oRR8xaWpTzdsq/9R7EmkcJc7GxSGCu/uEAcVquTgMol+lP6a5glQNmuCY4gooGs0ASfoBTX7i1+5kj06URRWnsO8OwKBgQC6u2GYBvJZk1nK1d5uszPfO51P6HEYi2o8/OSvuntczqatYr3ArAUH1Unxc/PNE9zO+5m9rGyVeWLFKae3BhTRlz1kPgmFHtZvF1viHbcTsxibIXpOcxfTFzERTYYNOmme4bkh6AsruXQCd/2P1uzpJUU36TMkmfbeWdT8JDLKEQKBgBJcj9zzAjKhPunRvOOHBwVK2DfPC2+Uf5MR9JhXYNhU/TqkEY2I+gxp/jbMXsLAuUFWOHtnslO+KsXHRO4PA5mFyAIq393Bk+p9c7EwcyCBaUgv2GkZzLXea3aAUt37kWuLC2Xz1TuIyf5c3+mEeF1Iu3Wh78P/yqLyxbFlXGQhAoGBAJ+3Ul8bwNKeTus9HGZkBdFylD93krnvb3AVwQBl8PzoBftPICsayOeTzKeYEza5wRVjw5+1zT/jz/hnCiNMFhxWfQ9/66Do7ae4bIsNm0cqnDFF6aIiCOu3PSDjMCgGGVnMcMSjmO5nIUQw2YHEloIzC8wi1XmxfLJBBcKnly2D
+ALIPAY_ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjZ/rlsJERPZ+GD6UzMYc6n2Rh8m0QV9Z39Iro6eMfxPaERMlKwhJpgmDWXMcpREmwMyoTCK77nLgNLRdc72XGR58aZFsAAQCs7V0kVtUf+IXtfQNNgY4c4tvtLH8E37vJTFBihZ8/UI+XOuX4xf/o+pfK9o2cqaVSt5E9kOrzv8hwDgG9vqOt2beqgETjeKYUwX2cWcAeu0xKoQW6JmzDje9/c7DAtLipmIDFrWVSzu8BFJqFzArv2u84pyDnuaLrqQ5rz3ktbn0QirbGlL5k/6E3CUB55CCF8+jEzQsjQUGQlTch9Dl7XAJLT8Lh1q2bat7KievEa1mNfzJmG5MDQIDAQAB

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

@@ -16,9 +16,33 @@ wechat:
 
   # 手机号加密配置
   phone-encryption:
-    secret-key: ${PHONE_ENCRYPTION_SECRET_KEY}
+    secret-key: ${PHONE_ENCRYPTION_SECRET_KEY:P8539ANjWJWsRbVHZKhM8Q==}
-    iv: ${PHONE_ENCRYPTION_IV}
+    iv: ${PHONE_ENCRYPTION_IV:3tHp07uMRYh1xKsIXvYJMA==}
 
 spring:
   elasticsearch:
-    uris: http://localhost:9200
+    uris: http://localhost:9200
+
+payment:
+  huifu:
+    sys-id: "6666000207573586"
+    product-id: "XLSISV"
+    huifu-id: "6666000207573586"
+    acct-id: "F28226571"
+    private-key: ${huifu.private-key}
+    public-key: ${huifu.public-key}
+    create-url: "https://api.huifu.com/v4/trade/payment/create"
+    query-url: "https://api.huifu.com/v4/trade/payment/query"
+    refund-url: "https://api.huifu.com/v4/trade/refund"
+    notify-url: "http://localhost:8084/api/payment/notify"
+
+# 支付宝配置（沙箱环境）
+alipay:
+  app-id: "9021000164699238"
+  app-private-key: ${ALIPAY_APP_PRIVATE_KEY}
+  alipay-public-key: ${ALIPAY_ALIPAY_PUBLIC_KEY}
+  sign-type: "RSA2"
+  charset: "UTF-8"
+  gateway: "https://openapi-sandbox.dl.alipaydev.com/gateway.do"
+  notify-url: "http://localhost:8084/api/payment/notify"
+  sandbox: true

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

@@ -9,10 +9,7 @@ spring:
       max-size: 10
       
   flyway:
-    enabled: true
+    enabled: false
-    locations: classpath:db/migration
-    baseline-on-migrate: true
-    validate-on-migrate: true
     
   sql:
     init:

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

@@ -0,0 +1,19 @@
+package cn.novalon.gym.manage.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "auth")
+public class AuthConfig {
+
+    private String accessKeyId;
+
+    private String accessKeySecret;
+
+    private Integer tokenExpireSeconds = 86400;
+
+    private Integer refreshTokenExpireSeconds = 604800;
+}

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/constant/RedisKeyConstants.java

@@ -61,4 +61,13 @@ public final class RedisKeyConstants {
      * appType: miniapp(小程序), mp(公众号)
      */
     public static final String WECHAT_ACCESS_TOKEN = "wechat:access_token:";
+
+    // ==================== 认证模块 ====================
+
+    /**
+     * 手机短信验证码缓存
+     * 格式：sms:code:{phone}
+     * 用途：存储登录/注册等场景的短信验证码
+     */
+    public static final String SMS_CODE = "sms:code:";
 }

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/exception/ErrorCode.java

@@ -7,6 +7,7 @@ public class ErrorCode {
     public static final String PERMISSION_PREFIX = "PERMISSION_";
     public static final String CONFLICT_PREFIX = "CONFLICT_";
     public static final String SYSTEM_PREFIX = "SYSTEM_";
+    public static final String AUTH_PREFIX = "AUTH_";
 
     public static final String VALIDATION_REQUIRED = VALIDATION_PREFIX + "001";
     public static final String VALIDATION_INVALID_FORMAT = VALIDATION_PREFIX + "002";
@@ -29,4 +30,7 @@ public class ErrorCode {
     public static final String SYSTEM_INTERNAL_ERROR = SYSTEM_PREFIX + "001";
     public static final String SYSTEM_DATABASE_ERROR = SYSTEM_PREFIX + "002";
     public static final String SYSTEM_NETWORK_ERROR = SYSTEM_PREFIX + "003";
+
+    public static final String AUTH_PHONE_ERROR = AUTH_PREFIX + "001";
+    public static final String AUTH_CODE_ERROR = AUTH_PREFIX + "002";
 }

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/response/Result.java

@@ -0,0 +1,54 @@
+package cn.novalon.gym.manage.common.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Result<T> {
+
+    private Integer code;
+
+    private String message;
+
+    private T data;
+
+    private Long timestamp;
+
+    public static <T> Result<T> success(T data) {
+        return Result.<T>builder()
+                .code(200)
+                .message("success")
+                .data(data)
+                .timestamp(System.currentTimeMillis())
+                .build();
+    }
+
+    public static <T> Result<T> success(String message) {
+        return Result.<T>builder()
+                .code(200)
+                .message(message)
+                .timestamp(System.currentTimeMillis())
+                .build();
+    }
+
+    public static <T> Result<T> fail(Integer code, String message) {
+        return Result.<T>builder()
+                .code(code)
+                .message(message)
+                .timestamp(System.currentTimeMillis())
+                .build();
+    }
+
+    public static <T> Result<T> fail(String message) {
+        return Result.<T>builder()
+                .code(500)
+                .message(message)
+                .timestamp(System.currentTimeMillis())
+                .build();
+    }
+}

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

@@ -0,0 +1,86 @@
+package cn.novalon.gym.manage.common.util;
+
+import cn.novalon.gym.manage.common.config.JwtProperties;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class JwtUtil {
+
+    private final JwtProperties jwtProperties;
+
+    private SecretKey getSigningKey() {
+        String secret = jwtProperties.getSecret();
+        if (secret.length() < 32) {
+            StringBuilder sb = new StringBuilder(secret);
+            while (sb.length() < 32) {
+                sb.append(secret);
+            }
+            secret = sb.substring(0, 32);
+        }
+        return Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public String generateToken(String userId, String phone) {
+        Date now = new Date();
+        Date expiryDate = new Date(now.getTime() + jwtProperties.getExpiration());
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("userId", userId);
+        claims.put("phone", phone);
+
+        return Jwts.builder()
+                .setClaims(claims)
+                .setSubject(userId)
+                .setIssuedAt(now)
+                .setExpiration(expiryDate)
+                .signWith(getSigningKey())
+                .compact();
+    }
+
+    public String generateRefreshToken(String userId) {
+        Date now = new Date();
+        Date expiryDate = new Date(now.getTime() + jwtProperties.getExpiration() * 7);
+
+        return Jwts.builder()
+                .setSubject(userId)
+                .setIssuedAt(now)
+                .setExpiration(expiryDate)
+                .signWith(getSigningKey())
+                .compact();
+    }
+
+    public Claims parseToken(String token) {
+        return Jwts.parserBuilder()
+                .setSigningKey(getSigningKey())
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    public String getUserIdFromToken(String token) {
+        return parseToken(token).getSubject();
+    }
+
+    public boolean validateToken(String token) {
+        try {
+            parseToken(token);
+            return true;
+        } catch (Exception e) {
+            log.warn("JWT token validation failed: {}", e.getMessage());
+            return false;
+        }
+    }
+}

gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/SysUserMessageEntity.java

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.db.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
@@ -21,10 +22,10 @@ public class SysUserMessageEntity {
     @Column("user_id")
     private Long userId;
 
-    @Column("title")
+    @Column("message_title")
     private String title;
 
-    @Column("content")
+    @Column("message_content")
     private String content;
 
     @Column("message_type")
@@ -33,9 +34,13 @@ public class SysUserMessageEntity {
     @Column("is_read")
     private String isRead;
 
-    @Column("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column("created_at")
     private LocalDateTime createTime;
 
+    @Column("deleted_at")
+    private LocalDateTime deletedAt;
+
     public Long getId() {
         return id;
     }
@@ -91,4 +96,12 @@ public class SysUserMessageEntity {
     public void setCreateTime(LocalDateTime createTime) {
         this.createTime = createTime;
     }
+
+    public LocalDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(LocalDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
 }

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.db.repository;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import cn.novalon.gym.manage.notify.core.repository.ISysUserMessageRepository;
 import cn.novalon.gym.manage.db.converter.SysUserMessageConverter;
@@ -13,6 +15,8 @@ import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 /**
  * 用户消息仓储实现类
  * 
@@ -75,6 +79,87 @@ public class SysUserMessageRepository implements ISysUserMessageRepository {
         return r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class);
     }
 
+    @Override
+    public Mono<PageResponse<SysUserMessage>> findByUserIdPage(Long userId, PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
+
+        SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
+        criteria.setUserId(userId);
+        org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
+
+        return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
+                .matching(dbQuery.with(pageable))
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<SysUserMessage> messageList = tuple.getT1().stream()
+                            .map(sysUserMessageConverter::toDomain)
+                            .toList();
+                    return new PageResponse<>(messageList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    public Mono<PageResponse<SysUserMessage>> findByUserIdAndIsReadPage(Long userId, String isRead, PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
+
+        SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
+        criteria.setUserId(userId);
+        criteria.setIsRead(isRead);
+        org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
+
+        return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
+                .matching(dbQuery.with(pageable))
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<SysUserMessage> messageList = tuple.getT1().stream()
+                            .map(sysUserMessageConverter::toDomain)
+                            .toList();
+                    return new PageResponse<>(messageList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    public Mono<Long> markAllAsReadByUserId(Long userId) {
+        org.springframework.data.relational.core.query.Update update = org.springframework.data.relational.core.query.Update.update("is_read", "1");
+        
+        org.springframework.data.relational.core.query.Query query = org.springframework.data.relational.core.query.Query.query(
+                org.springframework.data.relational.core.query.Criteria.where("user_id").is(userId)
+                        .and("deleted_at").isNull()
+        );
+
+        return r2dbcEntityTemplate.update(SysUserMessageEntity.class)
+                .matching(query)
+                .apply(update);
+    }
+
     @Override
     public Mono<SysUserMessage> save(SysUserMessage message) {
         SysUserMessageEntity entity = sysUserMessageConverter.toEntity(message);

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

@@ -0,0 +1,76 @@
+-- ============================================
+-- 团课类型表
+-- ============================================
+
+-- 团课类型表
+CREATE TABLE IF NOT EXISTS group_course_type (
+    id BIGSERIAL PRIMARY KEY,
+    type_name VARCHAR(100) NOT NULL,
+    base_difficulty INTEGER DEFAULT 1,
+    description TEXT,
+    category VARCHAR(50),
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+COMMENT ON TABLE group_course_type IS '团课类型表';
+COMMENT ON COLUMN group_course_type.id IS '主键ID';
+COMMENT ON COLUMN group_course_type.type_name IS '类型名称';
+COMMENT ON COLUMN group_course_type.base_difficulty IS '基础难度（1-10）';
+COMMENT ON COLUMN group_course_type.description IS '类型描述';
+COMMENT ON COLUMN group_course_type.category IS '分类（如：有氧、力量、柔韧等）';
+COMMENT ON COLUMN group_course_type.create_by IS '创建人';
+COMMENT ON COLUMN group_course_type.update_by IS '更新人';
+COMMENT ON COLUMN group_course_type.created_at IS '创建时间';
+COMMENT ON COLUMN group_course_type.updated_at IS '更新时间';
+COMMENT ON COLUMN group_course_type.deleted_at IS '删除时间（软删除）';
+
+-- 创建索引
+CREATE INDEX idx_group_course_type_type_name ON group_course_type(type_name);
+CREATE INDEX idx_group_course_type_category ON group_course_type(category);
+
+-- 插入初始团课类型数据（参考exmp.txt）
+INSERT INTO group_course_type (type_name, base_difficulty, description, category) VALUES
+('慢走/椭圆机轻松模式', 1, '几乎无难度，适合所有人', '基础有氧与热身'),
+('固定自行车（低阻力）', 2, '注意座椅高度调节即可', '基础有氧与热身'),
+('跑步机慢跑', 3, '需要基本协调性，膝盖有压力', '基础有氧与热身'),
+('跳绳（连续基础跳）', 3, '需要手脚配合，心肺要求明显', '基础有氧与热身'),
+('坐姿腿屈伸/腿弯举', 2, '很容易找到发力感', '固定器械训练'),
+('坐姿推胸机', 3, '需注意肩胛后收，避免耸肩', '固定器械训练'),
+('高位下拉（坐姿）', 3, '需控制不要过度后仰', '固定器械训练'),
+('史密斯机深蹲', 4, '轨迹固定，但需保持核心稳定', '固定器械训练'),
+('蝴蝶机夹胸', 3, '易用肘关节代偿，需锁定肩关节', '固定器械训练'),
+('平板支撑', 3, '耐力考验，技巧低', '自重基础动作'),
+('跪姿俯卧撑', 3, '上肢力量较弱者首选', '自重基础动作'),
+('标准俯卧撑', 5, '需核心收紧，身体成直线', '自重基础动作'),
+('引体向上（弹力带辅助）', 6, '背部和手臂力量要求高', '自重基础动作'),
+('标准引体向上', 8, '力量-体重比极高，多数男性无法完成1次', '自重基础动作'),
+('徒手深蹲', 3, '注意膝盖方向与背部直立', '自重基础动作'),
+('单腿深蹲（手枪蹲）', 8, '需要极高下肢力量、柔韧性和平衡', '自重基础动作'),
+('哑铃二头弯举', 4, '容易晃动借力，但较安全', '自由重量杠铃/哑铃'),
+('哑铃侧平举', 5, '极易用斜方肌代偿，真正练到三角肌中束很难', '自由重量杠铃/哑铃'),
+('杠铃卧推', 7, '肩关节压力大，起桥、沉肩、稳定手腕均有技巧，有压伤风险', '自由重量杠铃/哑铃'),
+('杠铃深蹲（颈后）', 8, '全身协调性、核心抗压、杠位放置、呼吸模式，学习曲线陡峭', '自由重量杠铃/哑铃'),
+('传统硬拉', 9, '风险极高，需要精确的脊柱中立、髋铰链、背阔肌收紧，错误时伤腰', '自由重量杠铃/哑铃'),
+('高翻/抓举（奥运举重）', 10, '需要爆发力、柔韧、精准衔接，非数月训练不能掌握', '自由重量杠铃/哑铃'),
+('波比跳（标准版）', 6, '连续做时心肺压力极大', '高强度与爆发力'),
+('冲刺跑（短跑）', 7, '对腘绳肌和脚踝爆发力要求高', '高强度与爆发力'),
+('跳箱（合理高度）', 6, '需要落地缓冲技巧', '高强度与爆发力'),
+('负重雪橇推', 6, '主要考验腿部耐力和意志力', '高强度与爆发力'),
+('双力臂（引体向上后翻腕上杠）', 9, '需要爆发引体 + 极高相对力量', '高强度与爆发力'),
+('静态拉伸（坐姿体前屈）', 2, '无风险，但需要坚持', '柔韧与平衡类'),
+('瑜伽下犬式', 3, '常见，但需背部与手臂对齐', '柔韧与平衡类'),
+('单腿罗马尼亚硬拉（徒手）', 6, '极考验平衡和髋稳定', '柔韧与平衡类'),
+('全深蹲（脚跟贴地，亚洲蹲）', 5, '踝关节灵活度限制多数人', '柔韧与平衡类'),
+('竖叉/横叉', 8, '需要数月甚至数年拉伸', '柔韧与平衡类'),
+('瑜伽入门', 2, '适合初学者的瑜伽课程，注重基础体式', '柔韧与平衡类'),
+('瑜伽进阶', 5, '针对有一定基础的学员，包含更复杂体式', '柔韧与平衡类'),
+('普拉提', 4, '注重核心力量和身体控制', '柔韧与平衡类'),
+('动感单车', 4, '高强度有氧运动，节奏感强', '基础有氧与热身'),
+('搏击操', 5, '结合拳击动作的有氧运动', '高强度与爆发力'),
+('HIIT训练', 7, '高强度间歇训练，对心肺要求极高', '高强度与爆发力'),
+('核心训练', 4, '针对核心肌群的专项训练', '自重基础动作')
+ON CONFLICT DO NOTHING;

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

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

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

@@ -0,0 +1,73 @@
+-- ============================================
+-- 团课标签相关表
+-- ============================================
+
+-- 团课标签表
+CREATE TABLE IF NOT EXISTS course_label (
+    id BIGSERIAL PRIMARY KEY,
+    label_name VARCHAR(50) NOT NULL,
+    color VARCHAR(20) DEFAULT '#1890ff',
+    description VARCHAR(200),
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+-- 团课类型-标签关联表
+CREATE TABLE IF NOT EXISTS course_type_label (
+    id BIGSERIAL PRIMARY KEY,
+    type_id BIGINT NOT NULL,
+    label_id BIGINT NOT NULL,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP,
+    UNIQUE (type_id, label_id)
+);
+
+COMMENT ON TABLE course_label IS '团课标签表';
+COMMENT ON COLUMN course_label.id IS '主键ID';
+COMMENT ON COLUMN course_label.label_name IS '标签名称';
+COMMENT ON COLUMN course_label.color IS '标签颜色（十六进制）';
+COMMENT ON COLUMN course_label.description IS '标签描述';
+COMMENT ON COLUMN course_label.create_by IS '创建人';
+COMMENT ON COLUMN course_label.update_by IS '更新人';
+COMMENT ON COLUMN course_label.created_at IS '创建时间';
+COMMENT ON COLUMN course_label.updated_at IS '更新时间';
+COMMENT ON COLUMN course_label.deleted_at IS '删除时间（软删除）';
+
+COMMENT ON TABLE course_type_label IS '团课类型-标签关联表';
+COMMENT ON COLUMN course_type_label.id IS '主键ID';
+COMMENT ON COLUMN course_type_label.type_id IS '团课类型ID';
+COMMENT ON COLUMN course_type_label.label_id IS '标签ID';
+COMMENT ON COLUMN course_type_label.create_by IS '创建人';
+COMMENT ON COLUMN course_type_label.update_by IS '更新人';
+COMMENT ON COLUMN course_type_label.created_at IS '创建时间';
+COMMENT ON COLUMN course_type_label.updated_at IS '更新时间';
+COMMENT ON COLUMN course_type_label.deleted_at IS '删除时间（软删除）';
+
+-- 创建索引
+CREATE INDEX idx_course_label_label_name ON course_label(label_name);
+CREATE INDEX idx_course_type_label_type_id ON course_type_label(type_id);
+CREATE INDEX idx_course_type_label_label_id ON course_type_label(label_id);
+
+-- 插入初始标签数据
+INSERT INTO course_label (label_name, color, description) VALUES
+('适合新手', '#52c41a', '适合健身初学者'),
+('中级过渡', '#faad14', '适合有一定基础的学员'),
+('高级进阶', '#f5222d', '适合高级学员'),
+('减脂塑形', '#722ed1', '有助于减脂塑形'),
+('增肌强化', '#13c2c2', '有助于增肌强化'),
+('柔韧性训练', '#eb2f96', '注重柔韧性提升'),
+('核心训练', '#1890ff', '注重核心力量'),
+('心肺训练', '#fa8c16', '提升心肺功能'),
+('低冲击', '#52c41a', '低冲击运动，适合关节保护'),
+('高强度', '#f5222d', '高强度间歇训练'),
+('团体互动', '#722ed1', '注重团队协作'),
+('私教推荐', '#13c2c2', '私教推荐课程'),
+('热门课程', '#ff1493', '人气较高的课程'),
+('新课上线', '#00ced1', '新上线的课程')
+ON CONFLICT DO NOTHING;

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

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