fix: 更新测试用例适配 API 路径变更和 userType 参数

- Gateway 测试路径从 /api/auth/ 更新为 /api/admin/auth/
- 移除 /api/checkIn/ 公开路径测试，替换为 /api/admin/auth/ 前缀测试
- SysAuthHandlerTest generateToken stub 增加 ADMIN userType 参数

e2e-tests/auth-test.spec.ts

@@ -5,7 +5,7 @@ test.describe('认证和授权测试', () => {
   let userId: number;
 
   test.beforeAll(async ({ request }) => {
-    const response = await request.post('http://localhost:8080/api/auth/login', {
+    const response = await request.post('http://localhost:8080/api/admin/auth/login', {
       headers: {
         'Content-Type': 'application/json'
       },
@@ -28,7 +28,7 @@ test.describe('认证和授权测试', () => {
     });
 
     await test.step('发送登录请求', async () => {
-      const response = await page.request.post('http://localhost:8080/api/auth/login', {
+      const response = await page.request.post('http://localhost:8080/api/admin/auth/login', {
         headers: {
           'Content-Type': 'application/json'
         },
@@ -78,7 +78,7 @@ test.describe('认证和授权测试', () => {
     });
 
     await test.step('查询指定用户信息', async () => {
-      const response = await page.request.get(`http://localhost:8080/api/users/${userId}`, {
+      const response = await page.request.get(`http://localhost:8080/api/admin/users/${userId}`, {
         headers: {
           'Authorization': `Bearer ${authToken}`
         }
@@ -98,10 +98,10 @@ test.describe('认证和授权测试', () => {
   test('权限验证测试', async ({ page }) => {
     await test.step('测试访问受保护的API', async () => {
       const protectedEndpoints = [
-        '/api/users',
-        '/api/roles',
-        '/api/menus',
-        '/api/config'
+        '/api/admin/users',
+        '/api/admin/roles',
+        '/api/admin/menus',
+        '/api/admin/config'
       ];
 
       for (const endpoint of protectedEndpoints) {

e2e-tests/config-management.spec.ts

@@ -4,7 +4,7 @@ test.describe('参数配置功能测试', () => {
   let authToken: string;
 
   test.beforeAll(async ({ request }) => {
-    const response = await request.post('http://localhost:8080/api/auth/login', {
+    const response = await request.post('http://localhost:8080/api/admin/auth/login', {
       headers: {
         'Content-Type': 'application/json'
       },

e2e-tests/dict-management.spec.ts

@@ -4,7 +4,7 @@ test.describe('字典管理功能测试', () => {
   let authToken: string;
 
   test.beforeAll(async ({ request }) => {
-    const response = await request.post('http://localhost:8080/api/auth/login', {
+    const response = await request.post('http://localhost:8080/api/admin/auth/login', {
       headers: {
         'Content-Type': 'application/json'
       },

e2e-tests/global-setup.ts

@@ -269,7 +269,7 @@ async function verifyAllServices(): Promise<void> {
 
   console.log('   验证网关到后端的连通性...');
   try {
-    const response = await fetch('http://localhost:8080/api/auth/login', {
+    const response = await fetch('http://localhost:8080/api/admin/auth/login', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ username: 'admin', password: 'Test@123' }),
@@ -316,7 +316,7 @@ async function waitForBackendReady(): Promise<void> {
           console.log(`✅ 后端服务健康检查通过 (尝试 ${i + 1}/${maxRetries})`);
 
           try {
-            const loginTest = await fetch('http://localhost:8084/api/auth/login', {
+            const loginTest = await fetch('http://localhost:8084/api/admin/auth/login', {
               method: 'POST',
               headers: { 'Content-Type': 'application/json' },
               body: JSON.stringify({ username: 'admin', password: 'Test@123' }),
@@ -364,7 +364,7 @@ async function waitForGatewayReady(): Promise<void> {
           console.log(`✅ 网关服务健康检查通过 (尝试 ${i + 1}/${maxRetries})`);
 
           try {
-            const loginTest = await fetch('http://localhost:8080/api/auth/login', {
+            const loginTest = await fetch('http://localhost:8080/api/admin/auth/login', {
               method: 'POST',
               headers: { 'Content-Type': 'application/json' },
               body: JSON.stringify({ username: 'admin', password: 'Test@123' }),
@@ -425,7 +425,7 @@ async function waitForFrontendReady(): Promise<void> {
 async function cleanupTestData(): Promise<void> {
   try {
     // 登录获取token（通过网关）
-    const loginResponse = await fetch('http://localhost:8080/api/auth/login', {
+    const loginResponse = await fetch('http://localhost:8080/api/admin/auth/login', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -458,7 +458,7 @@ async function cleanupTestData(): Promise<void> {
       for (const user of users) {
         if (user.id > 10) {
           try {
-            await fetch(`http://localhost:8080/api/users/${user.id}`, {
+            await fetch(`http://localhost:8080/api/admin/users/${user.id}`, {
               method: 'DELETE',
               headers: {
                 'Authorization': `Bearer ${token}`
@@ -486,7 +486,7 @@ async function cleanupTestData(): Promise<void> {
       for (const role of roles) {
         if (role.id > 4) {
           try {
-            await fetch(`http://localhost:8080/api/roles/${role.id}`, {
+            await fetch(`http://localhost:8080/api/admin/roles/${role.id}`, {
               method: 'DELETE',
               headers: {
                 'Authorization': `Bearer ${token}`

e2e-tests/journeys/admin-complete-workflow.spec.ts

@@ -50,7 +50,7 @@ test.describe('管理员完整工作流', () => {
     await test.step('提交表单', async () => {
       const [response] = await Promise.all([
         page.waitForResponse(resp => 
-          resp.url().includes('/api/roles') && resp.request().method() === 'POST',
+          resp.url().includes('/api/admin/roles') && resp.request().method() === 'POST',
           { timeout: 10000 }
         ).catch(() => null),
         page.locator('.el-dialog button:has-text("确定")').click()

e2e-tests/journeys/user-permission-boundary.spec.ts

@@ -112,7 +112,7 @@ test.describe('用户权限边界验证', () => {
     });
 
     await test.step('尝试访问受限API', async () => {
-      const response = await page.request.get('/api/users?page=0&size=10');
+      const response = await page.request.get('/api/admin/users?page=0&size=10');
       expect([200, 401, 403]).toContain(response.status());
     });
   });

e2e-tests/menu-management.spec.ts

@@ -4,7 +4,7 @@ test.describe('菜单管理功能测试', () => {
   let authToken: string;
 
   test.beforeAll(async ({ request }) => {
-    const response = await request.post('http://localhost:8080/api/auth/login', {
+    const response = await request.post('http://localhost:8080/api/admin/auth/login', {
       headers: {
         'Content-Type': 'application/json'
       },

e2e-tests/utils/api-client.ts

@@ -10,7 +10,7 @@ export class ApiClient {
   }
 
   async login(username: string, password: string): Promise<{ token: string; userId: number }> {
-    const response = await this.request.post(`${this.baseURL}/api/auth/login`, {
+    const response = await this.request.post(`${this.baseURL}/api/admin/auth/login`, {
       data: {
         username,
         password,
@@ -29,7 +29,7 @@ export class ApiClient {
   }
 
   async logout(token: string): Promise<void> {
-    await this.request.post(`${this.baseURL}/api/auth/logout`, {
+    await this.request.post(`${this.baseURL}/api/admin/auth/logout`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -37,7 +37,7 @@ export class ApiClient {
   }
 
   async getUsers(token: string): Promise<any[]> {
-    const response = await this.request.get(`${this.baseURL}/api/users`, {
+    const response = await this.request.get(`${this.baseURL}/api/admin/users`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -51,7 +51,7 @@ export class ApiClient {
   }
 
   async createUser(token: string, userData: any): Promise<any> {
-    const response = await this.request.post(`${this.baseURL}/api/users`, {
+    const response = await this.request.post(`${this.baseURL}/api/admin/users`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -66,7 +66,7 @@ export class ApiClient {
   }
 
   async updateUser(token: string, userId: number, userData: any): Promise<any> {
-    const response = await this.request.put(`${this.baseURL}/api/users/${userId}`, {
+    const response = await this.request.put(`${this.baseURL}/api/admin/users/${userId}`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -81,7 +81,7 @@ export class ApiClient {
   }
 
   async deleteUser(token: string, userId: number): Promise<void> {
-    const response = await this.request.delete(`${this.baseURL}/api/users/${userId}`, {
+    const response = await this.request.delete(`${this.baseURL}/api/admin/users/${userId}`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -93,7 +93,7 @@ export class ApiClient {
   }
 
   async getRoles(token: string): Promise<any[]> {
-    const response = await this.request.get(`${this.baseURL}/api/roles`, {
+    const response = await this.request.get(`${this.baseURL}/api/admin/roles`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -107,7 +107,7 @@ export class ApiClient {
   }
 
   async createRole(token: string, roleData: any): Promise<any> {
-    const response = await this.request.post(`${this.baseURL}/api/roles`, {
+    const response = await this.request.post(`${this.baseURL}/api/admin/roles`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -122,7 +122,7 @@ export class ApiClient {
   }
 
   async deleteRole(token: string, roleId: number): Promise<void> {
-    const response = await this.request.delete(`${this.baseURL}/api/roles/${roleId}`, {
+    const response = await this.request.delete(`${this.baseURL}/api/admin/roles/${roleId}`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },
@@ -134,7 +134,7 @@ export class ApiClient {
   }
 
   async getMenus(token: string): Promise<any[]> {
-    const response = await this.request.get(`${this.baseURL}/api/menus`, {
+    const response = await this.request.get(`${this.baseURL}/api/admin/menus`, {
       headers: {
         Authorization: `Bearer ${token}`,
       },

e2e-tests/utils/testDataManager.ts

@@ -55,7 +55,7 @@ export class TestDataManager {
   }
 
   static async createTestUser(request: APIRequestContext, userData: TestUser): Promise<any> {
-    const response = await request.post(`${this.apiBaseUrl}/api/users`, {
+    const response = await request.post(`${this.apiBaseUrl}/api/admin/users`, {
       data: userData,
     });
     
@@ -75,7 +75,7 @@ export class TestDataManager {
   }
 
   static async createTestRole(request: APIRequestContext, roleData: TestRole): Promise<any> {
-    const response = await request.post(`${this.apiBaseUrl}/api/roles`, {
+    const response = await request.post(`${this.apiBaseUrl}/api/admin/roles`, {
       data: roleData,
     });
     
@@ -100,7 +100,7 @@ export class TestDataManager {
       return;
     }
     
-    const response = await request.delete(`${this.apiBaseUrl}/api/users/${userData.id}`);
+    const response = await request.delete(`${this.apiBaseUrl}/api/admin/users/${userData.id}`);
     if (!response.ok()) {
       console.warn(`Failed to delete test user ${username}: ${await response.text()}`);
     }
@@ -114,7 +114,7 @@ export class TestDataManager {
       return;
     }
     
-    const response = await request.delete(`${this.apiBaseUrl}/api/roles/${roleData.id}`);
+    const response = await request.delete(`${this.apiBaseUrl}/api/admin/roles/${roleData.id}`);
     if (!response.ok()) {
       console.warn(`Failed to delete test role ${roleKey}: ${await response.text()}`);
     }

gym-manage-api/gym-checkIn/.gitignore

@@ -0,0 +1,48 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Virtual machine crash logs
+hs_err_pid*
+replay_pid*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+# IDE
+.idea/
+*.iml
+.vscode/
+.settings/
+.classpath
+.project
+
+# OS
+.DS_Store
+Thumbs.db

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

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>gym-checkIn</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym CheckIn</name>
+    <description>Check-In Management Module - Member Attendance Services</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-spring-boot3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-reactor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>r2dbc-postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+
+        <!-- 添加 ZXing JavaSE 扩展（用于生成图片） -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>1.5.5.Final</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>0.2.0</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.12</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>check</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <rule>
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit>
+                                            <counter>INSTRUCTION</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.60</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>4.8.6.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs</artifactId>
+                        <version>4.8.6</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>spotbugs-check</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>High</threshold>
+                    <failOnError>true</failOnError>
+                    <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,46 @@
+package cn.novalon.gym.manage.checkIn.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "qr.config")
+public class QRCodeConfig {
+
+    /**
+     * 二维码宽度（像素）
+     */
+    private Integer width = 300;
+
+    /**
+     * 二维码高度（像素）
+     */
+    private Integer height = 300;
+
+    /**
+     * 白边宽度
+     */
+    private Integer margin = 1;
+
+    /**
+     * 容错率：L, M, Q, H
+     */
+    private String errorCorrection = "M";
+
+    /**
+     * 图片格式：png, jpg
+     */
+    private String format = "png";
+
+    /**
+     * 是否启用Logo
+     */
+    private Boolean logoEnabled = false;
+
+    /**
+     * Logo路径
+     */
+    private String logoPath = "";
+}

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/constant/QRRedisKey.java

@@ -0,0 +1,43 @@
+package cn.novalon.gym.manage.checkIn.constant;
+
+import java.time.LocalDate;
+import java.util.UUID;
+
+/**
+ * 打卡模块 Redis 键常量
+ *
+ * @author 付嘉
+ * @date 2026-05-30
+ */
+public final class QRRedisKey {
+
+    private static final String SEPARATOR = ":";
+    private static final String QRCODE_USER_DAILY = "qrcode:user:daily";
+    private static final String QRCODE_CONTENT = "QR_";
+    private QRRedisKey() {
+        // 私有构造，防止实例化
+    }
+
+    /**
+     * 用户当日二维码
+     * 格式：qrcode:user:daily:{userId}:{date}
+     * 示例：qrcode:user:daily:1001:2026-05-30
+     */
+    public static String qrcodeUserDaily(Long userId, LocalDate date) {
+        return QRCODE_USER_DAILY + SEPARATOR + userId + SEPARATOR + date;
+    }
+
+    /**
+     * 用户当日二维码（今天）
+     */
+    public static String qrcodeUserToday(Long userId) {
+        return qrcodeUserDaily(userId, LocalDate.now());
+    }
+
+    /**
+     * 生成二维码内容（每个用户每次调用都不同）
+     */
+    public static String generateQrcodeContent() {
+        return QRCODE_CONTENT + UUID.randomUUID().toString().replace("-", "");
+    }
+}

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/dto/QRCodeDto.java

@@ -0,0 +1,13 @@
+package cn.novalon.gym.manage.checkIn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class QRCodeDto {
+
+    private String qrContent;
+
+    private boolean isUsed;
+}

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

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

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

@@ -0,0 +1,69 @@
+package cn.novalon.gym.manage.checkIn.handler;
+
+import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+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
+public class CheckInHandler {
+
+    private final AuthUtil authUtil;
+    private final CheckServiceImpl checkService;
+
+    /**
+     * 签到
+     *
+     * POST /api/checkIn
+     *
+     */
+    public Mono<ServerResponse> checkIn(ServerRequest request) {
+
+        Long memberId = 1L;
+//        authUtil.getMemberIdOrThrow(request);
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String qrContent = (String) body.get("qrContent");
+                    log.info("收到签到请求, memberId: {}, qrContent: {}", memberId, qrContent);
+
+                    return checkService.checkIn(memberId, qrContent)
+                            .flatMap(result -> ServerResponse.ok()
+                                    .contentType(MediaType.APPLICATION_JSON)
+                                    .bodyValue(Map.of("code", 200, "message", "签到成功")));
+                })
+                .onErrorResume(e -> {
+                    log.error("签到失败", e);
+                    return ServerResponse.status(HttpStatus.BAD_REQUEST)
+                            .bodyValue(Map.of("code", 400, "message", e.getMessage()));
+                });
+    }
+
+    /**
+     * 获取二维码
+     *
+     * GET /api/checkin/qrcode
+     *
+     */
+    public Mono<ServerResponse> getQRCode(ServerRequest request) {
+
+        Long memberId = 1L;
+//        authUtil.getMemberIdOrThrow(request);
+
+        log.info("收到用户{}获取二维码请求", memberId);
+
+        return checkService.getQRCode(memberId)
+                .flatMap(qrCodeVo -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(qrCodeVo));
+    }
+}

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

@@ -0,0 +1,11 @@
+package cn.novalon.gym.manage.checkIn.service;
+
+import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
+import reactor.core.publisher.Mono;
+
+public interface ICheckInService {
+
+    Mono<QRCodeVo> getQRCode(Long memberId);
+
+    Mono<String> checkIn(Long memberId, String qrContent);
+}

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

@@ -0,0 +1,97 @@
+package cn.novalon.gym.manage.checkIn.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
+import cn.hutool.json.JSONUtil;
+import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
+import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
+import cn.novalon.gym.manage.checkIn.service.ICheckInService;
+import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
+import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CheckServiceImpl implements ICheckInService {
+
+    @Autowired
+    private final QRCodeConfig qrCodeConfig;
+
+    private final RedisUtil redisUtil;
+
+    @Override
+    public Mono<QRCodeVo> getQRCode(Long memberId) {
+        log.info("开始查询会员信息");
+        // TODO: 获取会员信息 - 查会员卡有效期/剩余次数，过期返回，先查缓存，缓存不存在则查数据库
+        // if (member有效期过了) throw new RuntimeException("会员有效期已过，拒绝生成二维码");
+        log.info("会员信息查询完成");
+
+        log.info("开始生成二维码");
+        String qrContent = QRRedisKey.generateQrcodeContent();
+        Map<String, Object> redisMap = new HashMap<>();
+        redisMap.put("qrContent", qrContent);
+        redisMap.put("isUsed", false);
+
+        return redisUtil.setWithExpire(
+                        RedisKeyConstants.QRCODE_USER_DAILY+memberId+LocalDate.now(),
+                        redisMap,
+                        getSecondsUntilEndOfDay()
+                )
+                .then(Mono.fromSupplier(() -> {
+                    String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
+                            BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
+                    return new QRCodeVo(qrCodeBase64,false,qrCodeConfig.getWidth(),qrCodeConfig.getHeight());
+                }));
+    }
+
+    @Override
+    public Mono<String> checkIn(Long memberId, String qrContent) {
+        String key = RedisKeyConstants.QRCODE_USER_DAILY+memberId+LocalDate.now();
+
+        return redisUtil.get(key)
+                .flatMap(cachedQrContent -> {
+                    if (cachedQrContent != null) {
+                        // 匹配成功，执行签到逻辑
+                        Map<String, Object> map = JSONUtil.parseObj(cachedQrContent);
+                        if(map.get("qrContent").equals(qrContent)){
+                            if((boolean)map.get("isUsed")){
+                                log.error("重复签到");
+                                throw new RuntimeException("您已经在"+map.get("checkInTime")+"完成签到，请勿重复签到");
+                            }
+                            log.info("二维码匹配成功，memberId: {}", memberId);
+                            // TODO查会员卡缓存，按照卡有效期进行扣减次数，没有缓存查数据库
+                            map.put("isUsed", true);
+                            map.put("checkInTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+                            return redisUtil.set(key,map).
+                                    then(Mono.just("签到成功"));
+                        }
+                    }
+                    throw new RuntimeException("二维码无效");
+                })
+                .switchIfEmpty(Mono.error(new RuntimeException("二维码已过期或不存在")));
+    }
+
+    private long getSecondsUntilEndOfDay() {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime endOfDay = now.toLocalDate().atTime(23, 59, 59);
+
+        if (now.isAfter(endOfDay)) return 1;
+
+        return ChronoUnit.SECONDS.between(now, endOfDay);
+    }
+}

gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/vo/QRCodeVo.java

@@ -0,0 +1,17 @@
+package cn.novalon.gym.manage.checkIn.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class QRCodeVo {
+
+    private String qrCodeBase64;
+
+    private boolean isUsed;
+
+    private Integer width;
+
+    private Integer height;
+}

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

@@ -0,0 +1,98 @@
+package cn.novalon.gym.manage.checkIn.websocket;
+
+import cn.hutool.json.JSONUtil;
+import cn.novalon.gym.manage.checkIn.dto.QRCodeDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.WebSocketMessage;
+import org.springframework.web.reactive.socket.WebSocketSession;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+@Component
+public class MyWebSocketHandler implements WebSocketHandler {
+
+    // 存储所有连接
+    private static final Map<String, WebSocketSession> sessions = new ConcurrentHashMap<>();
+
+    @Override
+    public Mono<Void> handle(WebSocketSession session) {
+        String sessionId = session.getId();
+
+        // 连接建立
+        sessions.put(sessionId, session);
+        log.info("WebSocket 连接建立，sessionId：{}，当前连接数：{}", sessionId, sessions.size());
+
+        // 处理接收到的消息
+        Flux<WebSocketMessage> output = session.receive()
+                .doOnNext(message -> {
+                    String payload = message.getPayloadAsText();
+                    log.info("收到消息：{}", payload);
+                })
+                .map(message -> {
+                    String payload = message.getPayloadAsText();
+                    String response = processMessage(payload, sessionId);
+                    return session.textMessage(response);
+                });
+
+        // 连接关闭时清理
+        return session.send(output)
+                .doFinally(signalType -> {
+                    sessions.remove(sessionId);
+                    log.info("WebSocket 连接关闭，sessionId：{}，剩余连接数：{}", sessionId, sessions.size());
+                });
+    }
+
+    /**
+     * 处理消息逻辑
+     */
+    private String processMessage(String message, String sessionId) {
+        try {
+            // 解析 QRCodeDto
+            QRCodeDto qrCodeDto = JSONUtil.toBean(message, QRCodeDto.class);
+
+            String response;
+
+            // 判断二维码是否有效
+            if (qrCodeDto.getQrContent() != null
+                    && !qrCodeDto.getQrContent().isEmpty()
+                    && !qrCodeDto.isUsed()) {
+                // 有效：qrContent 有值且 isUsed 为 false
+                response = "正在进行签到";
+
+                // 可选：将二维码标记为已使用（需要调用后端服务）
+                // checkInService.handleCheckIn(qrCodeDto.getQrContent());
+
+                log.info("二维码有效，sessionId：{}，qrContent：{}", sessionId, qrCodeDto.getQrContent());
+            } else {
+                // 无效：qrContent 为空 或 isUsed 为 true
+                String reason = "";
+                if (qrCodeDto.getQrContent() == null || qrCodeDto.getQrContent().isEmpty()) {
+                    reason = "二维码内容为空";
+                } else if (qrCodeDto.isUsed()) {
+                    reason = "二维码已被使用";
+                }
+                response = "二维码无效：" + reason;
+                log.warn("二维码无效，sessionId：{}，原因：{}", sessionId, reason);
+            }
+
+            return response;
+
+        } catch (Exception e) {
+            log.error("解析消息失败，sessionId：{}", sessionId, e);
+            return "消息格式错误";
+        }
+    }
+
+    /**
+     * 获取当前在线连接数
+     */
+    public static int getOnlineCount() {
+        return sessions.size();
+    }
+}

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

@@ -0,0 +1,10 @@
+# 二维码配置
+qr:
+  config:
+    width: 300 # 二维码宽度（像素）
+    height: 300 # 二维码高度（像素）
+    margin: 1 # 白边宽度（像素）
+    format: png # 图片格式：png / jpg
+    error-correction: L #容错率：L, M, Q, H，如果启用Logo（logo-enabled: true），必须设置为 H
+    logo-enabled: false # 是否启用Logo（启用时error-correction必须为H）
+#    logo-path: static/logo.png    # Logo图片路径（支持相对路径或绝对路径）

gym-manage-api/gym-checkIn/src/test/java/cn/novalon/gym/manage/checkin/CheckInModuleTest.java

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

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

@@ -0,0 +1 @@
+# Test Configuration

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

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

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

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.novalon.gym.manage</groupId>
-        <artifactId>gym-manage-api</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>cn.novalon.gym.manage</groupId>
-    <artifactId>gym-groupCourse</artifactId>
-    <version>1.0.0</version>
-    <name>gym-groupCourse</name>
-    <description>Group Course Management Module</description>
-    <url/>
-    <licenses>
-        <license/>
-    </licenses>
-    <developers>
-        <developer/>
-    </developers>
-    <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
-    </scm>
-    <properties>
-        <java.version>21</java.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-db</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations-jakarta</artifactId>
-            <version>2.2.43</version>
-            <scope>compile</scope>
-        </dependency>
-
-
-<!--        Redis依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

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

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

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

@@ -1,63 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.dao;
-
-import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 团课预约记录DAO接口
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-@Repository
-public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookingEntity, Long> {
-
-    /**
-     * 根据ID查询未删除的预约记录
-     */
-    Mono<GroupCourseBookingEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    /**
-     * 根据会员ID查询所有预约记录
-     */
-    Flux<GroupCourseBookingEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
-
-    /**
-     * 根据会员ID查询所有预约记录（带排序）
-     */
-    Flux<GroupCourseBookingEntity> findByMemberIdAndDeletedAtIsNull(Long memberId, Sort sort);
-
-    /**
-     * 根据团课ID查询所有预约记录
-     */
-    Flux<GroupCourseBookingEntity> findByCourseIdAndDeletedAtIsNull(Long courseId);
-
-    /**
-     * 根据团课ID和会员ID查询预约记录
-     */
-    Mono<GroupCourseBookingEntity> findByCourseIdAndMemberIdAndDeletedAtIsNull(Long courseId, Long memberId);
-
-    /**
-     * 根据团课ID和状态查询预约记录
-     */
-    Flux<GroupCourseBookingEntity> findByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
-
-    /**
-     * 查询会员在指定课程的有效预约（状态为已预约且未取消）
-     */
-    Mono<GroupCourseBookingEntity> findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(Long courseId, Long memberId, String status);
-
-    /**
-     * 根据会员卡ID查询预约记录
-     */
-    Flux<GroupCourseBookingEntity> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId);
-
-    /**
-     * 统计团课已预约人数
-     */
-    Mono<Long> countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
-}

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

@@ -1,23 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.dao;
-
-import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Repository
-public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long> {
-
-    Mono<GroupCourseEntity> findByIdIsAndDeletedAtIsNull(Long id);
-
-    Flux<GroupCourseEntity> findAll();
-
-    Flux<GroupCourseEntity> findAll(Sort sort);
-
-    Flux<GroupCourseEntity> findAllByDeletedAtIsNull();
-
-    Flux<GroupCourseEntity> findAllByDeletedAtIsNull(Sort sort);
-}

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

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

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

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

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

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

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

@@ -1,144 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.entity;
-
-import cn.novalon.gym.manage.db.entity.BaseEntity;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDateTime;
-
-@Table("group_course")
-public class GroupCourseEntity extends BaseEntity {
-
-    //课程名称
-    @Column("course_name")
-    private String courseName;
-
-    //教练id
-    @Column("coach_id")
-    private Long coachId;
-
-    //课程类型
-    @Column("course_type")
-    private Long courseType;
-
-    //开始时间
-    @Column("start_time")
-    private LocalDateTime startTime;
-
-    //结束时间
-    @Column("end_time")
-    private LocalDateTime endTime;
-
-    //最大参与人数
-    @Column("max_members")
-    private Integer maxMembers;
-
-    //当前参与人数
-    @Column("current_members")
-    private Integer currentMembers;
-
-    //课程状态：0-正常，1-已取消，2-已结束
-    @Column("status")
-    private Long status;
-
-    //上课地点
-    @Column("location")
-    private String location;
-
-    //封面图URL
-    @Column("cover_image")
-    private String coverImage;
-
-    //课程描述
-    @Column("description")
-    private String description;
-
-    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;
-    }
-}

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

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

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

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

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

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

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

@@ -1,120 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.handler;
-
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
-import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 团课预约Handler
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-@Component
-@Tag(name = "团课预约", description = "团课预约相关操作")
-public class GroupCourseBookingHandler {
-
-    private final IGroupCourseBookingService bookingService;
-
-    public GroupCourseBookingHandler(IGroupCourseBookingService bookingService) {
-        this.bookingService = bookingService;
-    }
-
-    /**
-     * 预约团课
-     */
-    @Operation(summary = "预约团课", description = "会员预约指定团课")
-    public Mono<ServerResponse> bookCourse(ServerRequest request) {
-        return request.bodyToMono(Map.class)
-                .flatMap(body -> {
-                    Long courseId = ((Number) body.get("courseId")).longValue();
-                    Long memberId = ((Number) body.get("memberId")).longValue();
-                    Long memberCardId = ((Number) body.get("memberCardId")).longValue();
-
-                    return bookingService.bookCourse(courseId, memberId, memberCardId)
-                            .flatMap(booking -> {
-                                Map<String, Object> response = new HashMap<>();
-                                response.put("success", true);
-                                response.put("message", "预约成功");
-                                response.put("data", booking);
-                                return ServerResponse.ok().bodyValue(response);
-                            })
-                            .onErrorResume(error -> {
-                                Map<String, Object> response = new HashMap<>();
-                                response.put("success", false);
-                                response.put("message", error.getMessage());
-                                return ServerResponse.badRequest().bodyValue(response);
-                            });
-                });
-    }
-
-    /**
-     * 取消预约
-     */
-    @Operation(summary = "取消预约", description = "会员取消已预约的团课")
-    public Mono<ServerResponse> cancelBooking(ServerRequest request) {
-        Long bookingId = Long.valueOf(request.pathVariable("bookingId"));
-
-        return request.bodyToMono(Map.class)
-                .flatMap(body -> {
-                    Long memberId = ((Number) body.get("memberId")).longValue();
-
-                    return bookingService.cancelBooking(bookingId, memberId)
-                            .flatMap(booking -> {
-                                Map<String, Object> response = new HashMap<>();
-                                response.put("success", true);
-                                response.put("message", "取消成功");
-                                response.put("data", booking);
-                                return ServerResponse.ok().bodyValue(response);
-                            })
-                            .onErrorResume(error -> {
-                                Map<String, Object> response = new HashMap<>();
-                                response.put("success", false);
-                                response.put("message", error.getMessage());
-                                return ServerResponse.badRequest().bodyValue(response);
-                            });
-                });
-    }
-
-    /**
-     * 查询会员预约记录
-     */
-    @Operation(summary = "查询会员预约记录", description = "根据会员ID查询所有预约记录")
-    public Mono<ServerResponse> getBookingsByMemberId(ServerRequest request) {
-        Long memberId = Long.valueOf(request.pathVariable("memberId"));
-
-        return ServerResponse.ok()
-                .body(bookingService.getBookingsByMemberId(memberId), GroupCourseBooking.class);
-    }
-
-    /**
-     * 查询预约详情
-     */
-    @Operation(summary = "查询预约详情", description = "根据预约ID查询预约详情")
-    public Mono<ServerResponse> getBookingById(ServerRequest request) {
-        Long bookingId = Long.valueOf(request.pathVariable("bookingId"));
-
-        return bookingService.getBookingById(bookingId)
-                .flatMap(booking -> ServerResponse.ok().bodyValue(booking))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    /**
-     * 查询课程预约记录
-     */
-    @Operation(summary = "查询课程预约记录", description = "根据团课ID查询所有预约记录")
-    public Mono<ServerResponse> getBookingsByCourseId(ServerRequest request) {
-        Long courseId = Long.valueOf(request.pathVariable("courseId"));
-
-        return ServerResponse.ok()
-                .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class);
-    }
-}

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

@@ -1,130 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.handler;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.util.RedisUtil;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Validator;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-@Tag(name="团课管理",description = "团课相关操作")
-public class GroupCourseHandler {
-    private final IGroupCourseService groupCourseService;
-    private final Validator validator;
-    private final RedisUtil redisUtil;
-    private final ObjectMapper objectMapper;
-    
-    public GroupCourseHandler(IGroupCourseService groupCourseService, 
-                              Validator validator,
-                              RedisUtil redisUtil,
-                              ObjectMapper objectMapper){
-        this.groupCourseService = groupCourseService;
-        this.validator = validator;
-        this.redisUtil = redisUtil;
-        this.objectMapper = objectMapper;
-    }
-
-    @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表")
-    public Mono<ServerResponse> getAllGroupCourse(ServerRequest request){
-        boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false"));
-        return ServerResponse.ok()
-                .body(groupCourseService.findAll(includeDeleted), GroupCourse.class);
-    }
-
-    @Operation(summary = "分页获取团课", description = "根据分页参数获取团课列表")
-    public Mono<ServerResponse> getGroupCoursesByPage(ServerRequest request) {
-        return request.bodyToMono(PageRequest.class)
-                .flatMap(pageRequest -> {
-                    boolean includeDeleted = request.queryParam("includeDeleted")
-                            .map(Boolean::parseBoolean)
-                            .orElse(false);
-                    
-                    if (pageRequest.getPage() < 0) {
-                        pageRequest.setPage(0);
-                    }
-                    if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
-                        pageRequest.setSize(10);
-                    }
-                    if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
-                        pageRequest.setSort("id");
-                    }
-                    if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
-                        pageRequest.setOrder("asc");
-                    }
-
-                    return groupCourseService.findByPage(pageRequest, includeDeleted)
-                            .flatMap(response -> ServerResponse.ok().bodyValue(response));
-                });
-    }
-
-    @Operation(summary = "根据ID获取团课", description = "根据ID获取团课详情")
-    public Mono<ServerResponse> getGroupCourseById(ServerRequest request){
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return ServerResponse.ok()
-                .body(groupCourseService.findById(id), GroupCourse.class);
-    }
-
-    @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据")
-    public Mono<ServerResponse> getCacheByKey(ServerRequest request) {
-        return request.bodyToMono(Map.class)
-                .flatMap(body -> {
-                    String key = (String) body.get("key");
-                    
-                    if (key == null || key.isEmpty()) {
-                        Map<String, Object> error = new HashMap<>();
-                        error.put("success", false);
-                        error.put("message", "key参数不能为空");
-                        return ServerResponse.badRequest().bodyValue(error);
-                    }
-                    
-                    return redisUtil.get(key)
-                            .map(cachedValue -> {
-                                Map<String, Object> result = new HashMap<>();
-                                if (cachedValue != null) {
-                                    result.put("success", true);
-                                    result.put("key", key);
-                                    result.put("value", cachedValue);
-                                    result.put("message", "缓存命中");
-                                    
-                                    try {
-                                        if (cachedValue instanceof String) {
-                                            Object jsonObject = objectMapper.readValue((String) cachedValue, Object.class);
-                                            result.put("parsedValue", jsonObject);
-                                            result.put("valueType", "JSON字符串");
-                                        } else {
-                                            result.put("valueType", cachedValue.getClass().getSimpleName());
-                                        }
-                                    } catch (Exception e) {
-                                        result.put("parsedValue", null);
-                                        result.put("valueType", "无法解析");
-                                    }
-                                } else {
-                                    result.put("success", false);
-                                    result.put("key", key);
-                                    result.put("value", null);
-                                    result.put("message", "缓存未命中");
-                                }
-                                
-                                return result;
-                            })
-                            .flatMap(result -> ServerResponse.ok().bodyValue(result))
-                            .onErrorResume(error -> {
-                                Map<String, Object> errorResponse = new HashMap<>();
-                                errorResponse.put("success", false);
-                                errorResponse.put("message", "请求处理失败: " + error.getMessage());
-                                return ServerResponse.status(500).bodyValue(errorResponse);
-                            });
-                });
-    }
-}

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

@@ -1,59 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.repository;
-
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 团课预约记录Repository接口
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-public interface IGroupCourseBookingRepository {
-
-    /**
-     * 根据ID查询预约记录
-     */
-    Mono<GroupCourseBooking> findById(Long id);
-
-    /**
-     * 根据会员ID查询预约记录列表
-     */
-    Flux<GroupCourseBooking> findByMemberId(Long memberId);
-
-    /**
-     * 根据团课ID查询预约记录列表
-     */
-    Flux<GroupCourseBooking> findByCourseId(Long courseId);
-
-    /**
-     * 查询会员是否已预约某课程
-     */
-    Mono<GroupCourseBooking> findByCourseIdAndMemberId(Long courseId, Long memberId);
-
-    /**
-     * 查询会员在指定课程的有效预约
-     */
-    Mono<GroupCourseBooking> findValidBooking(Long courseId, Long memberId);
-
-    /**
-     * 统计课程有效预约人数
-     */
-    Mono<Long> countValidBookings(Long courseId);
-
-    /**
-     * 保存预约记录
-     */
-    Mono<GroupCourseBooking> save(GroupCourseBooking booking);
-
-    /**
-     * 更新预约记录
-     */
-    Mono<GroupCourseBooking> update(GroupCourseBooking booking);
-
-    /**
-     * 根据会员卡ID查询预约记录
-     */
-    Flux<GroupCourseBooking> findByMemberCardId(Long memberCardId);
-}

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

@@ -1,20 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.repository;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.dto.PageResponse;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import org.springframework.data.domain.Sort;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IGroupCourseRepository {
-    Mono<GroupCourse> findByIdAndDeletedAtIsNull(Long id);
-    Flux<GroupCourse> findAll();
-    Flux<GroupCourse> findAll(Sort sort);
-    Flux<GroupCourse> findByDeletedAtIsNull();
-    Flux<GroupCourse> findByDeletedAtIsNull(Sort sort);
-    
-    Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest);
-    Mono<PageResponse<GroupCourse>> findByPageAndNotDeleted(PageRequest pageRequest);
-}

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

@@ -1,85 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.repository.impl;
-
-import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
-import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
-import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 团课预约记录Repository实现类
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-@Repository
-public class GroupCourseBookingRepository implements IGroupCourseBookingRepository {
-
-    private final GroupCourseBookingDao groupCourseBookingDao;
-    private final GroupCourseConverter groupCourseConverter;
-
-    public GroupCourseBookingRepository(GroupCourseBookingDao groupCourseBookingDao,
-                                        GroupCourseConverter groupCourseConverter) {
-        this.groupCourseBookingDao = groupCourseBookingDao;
-        this.groupCourseConverter = groupCourseConverter;
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> findById(Long id) {
-        return groupCourseBookingDao.findByIdIsAndDeletedAtIsNull(id)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Flux<GroupCourseBooking> findByMemberId(Long memberId) {
-        return groupCourseBookingDao.findByMemberIdAndDeletedAtIsNull(memberId, Sort.by(Sort.Direction.DESC, "bookingTime"))
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Flux<GroupCourseBooking> findByCourseId(Long courseId) {
-        return groupCourseBookingDao.findByCourseIdAndDeletedAtIsNull(courseId)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> findByCourseIdAndMemberId(Long courseId, Long memberId) {
-        return groupCourseBookingDao.findByCourseIdAndMemberIdAndDeletedAtIsNull(courseId, memberId)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> findValidBooking(Long courseId, Long memberId) {
-        return groupCourseBookingDao.findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(courseId, memberId, "0")
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Mono<Long> countValidBookings(Long courseId) {
-        return groupCourseBookingDao.countByCourseIdAndStatusAndDeletedAtIsNull(courseId, "0");
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> save(GroupCourseBooking booking) {
-        GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking);
-        return groupCourseBookingDao.save(entity)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> update(GroupCourseBooking booking) {
-        GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking);
-        return groupCourseBookingDao.save(entity)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-
-    @Override
-    public Flux<GroupCourseBooking> findByMemberCardId(Long memberCardId) {
-        return groupCourseBookingDao.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
-                .map(groupCourseConverter::toBookingDomain);
-    }
-}

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

@@ -1,131 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.repository.impl;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.dto.PageResponse;
-import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
-import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
-import org.springframework.data.relational.core.query.Query;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-
-@Repository
-public class GroupCourseRepository implements IGroupCourseRepository {
-    private final GroupCourseDao groupCourseDao;
-    private final GroupCourseConverter groupCourseConverter;
-    private final R2dbcEntityTemplate r2dbcEntityTemplate;
-
-    public GroupCourseRepository(GroupCourseDao groupCourseDao, GroupCourseConverter groupCourseConverter,
-                                  R2dbcEntityTemplate r2dbcEntityTemplate){
-        this.groupCourseDao = groupCourseDao;
-        this.groupCourseConverter = groupCourseConverter;
-        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
-    }
-
-    @Override
-    public Mono<GroupCourse> findByIdAndDeletedAtIsNull(Long id) {
-        return groupCourseDao.findByIdIsAndDeletedAtIsNull(id)
-                .map(groupCourseConverter::toDomain);
-    }
-
-    @Override
-    public Flux<GroupCourse> findAll() {
-        return groupCourseDao.findAll()
-                .map(groupCourseConverter::toDomain);
-    }
-
-    @Override
-    public Flux<GroupCourse> findAll(Sort sort) {
-        return groupCourseDao.findAll(sort)
-                .map(groupCourseConverter::toDomain);
-    }
-
-    @Override
-    public Flux<GroupCourse> findByDeletedAtIsNull() {
-        return groupCourseDao.findAllByDeletedAtIsNull()
-                .map(groupCourseConverter::toDomain);
-    }
-
-    @Override
-    public Flux<GroupCourse> findByDeletedAtIsNull(Sort sort) {
-        return groupCourseDao.findAllByDeletedAtIsNull(sort)
-                .map(groupCourseConverter::toDomain);
-    }
-
-    @Override
-    public Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest) {
-        int page = pageRequest.getPage();
-        int size = pageRequest.getSize();
-        String sort = pageRequest.getSort();
-        String order = pageRequest.getOrder();
-
-        Sort sortObj = Sort.unsorted();
-        if (sort != null && !sort.isEmpty()) {
-            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
-        }
-
-        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
-
-        Query query = Query.empty();
-
-        return r2dbcEntityTemplate.select(GroupCourseEntity.class)
-                .matching(query.with(pageable))
-                .all()
-                .collectList()
-                .zipWith(r2dbcEntityTemplate.count(query, GroupCourseEntity.class))
-                .map(tuple -> {
-                    long total = tuple.getT2();
-                    int totalPages = (int) Math.ceil((double) total / size);
-                    List<GroupCourse> courseList = tuple.getT1().stream()
-                            .map(groupCourseConverter::toDomain)
-                            .toList();
-                    return new PageResponse<>(courseList, totalPages, total, page, size);
-                });
-    }
-
-    @Override
-    public Mono<PageResponse<GroupCourse>> findByPageAndNotDeleted(PageRequest pageRequest) {
-        int page = pageRequest.getPage();
-        int size = pageRequest.getSize();
-        String sort = pageRequest.getSort();
-        String order = pageRequest.getOrder();
-
-        Sort sortObj = Sort.unsorted();
-        if (sort != null && !sort.isEmpty()) {
-            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
-        }
-
-        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
-
-        return groupCourseDao.findAllByDeletedAtIsNull(sortObj)
-                .collectList()
-                .zipWith(groupCourseDao.findAllByDeletedAtIsNull().count())
-                .map(tuple -> {
-                    List<GroupCourseEntity> allEntities = tuple.getT1();
-                    long total = tuple.getT2();
-                    
-                    int fromIndex = page * size;
-                    int toIndex = Math.min(fromIndex + size, allEntities.size());
-                    
-                    List<GroupCourse> courseList;
-                    if (fromIndex < allEntities.size()) {
-                        courseList = allEntities.subList(fromIndex, toIndex).stream()
-                                .map(groupCourseConverter::toDomain)
-                                .toList();
-                    } else {
-                        courseList = List.of();
-                    }
-                    
-                    int totalPages = (int) Math.ceil((double) total / size);
-                    return new PageResponse<>(courseList, totalPages, total, page, size);
-                });
-    }
-}

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

@@ -1,57 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.service;
-
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 团课预约服务接口
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-public interface IGroupCourseBookingService {
-
-    /**
-     * 预约团课
-     * 
-     * @param courseId 团课ID
-     * @param memberId 会员ID
-     * @param memberCardId 会员卡ID
-     * @return 预约记录
-     */
-    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardId);
-
-    /**
-     * 取消预约
-     * 
-     * @param bookingId 预约ID
-     * @param memberId 会员ID
-     * @return 取消后的预约记录
-     */
-    Mono<GroupCourseBooking> cancelBooking(Long bookingId, Long memberId);
-
-    /**
-     * 根据会员ID查询预约记录列表
-     * 
-     * @param memberId 会员ID
-     * @return 预约记录列表
-     */
-    Flux<GroupCourseBooking> getBookingsByMemberId(Long memberId);
-
-    /**
-     * 根据预约ID查询预约详情
-     * 
-     * @param bookingId 预约ID
-     * @return 预约记录
-     */
-    Mono<GroupCourseBooking> getBookingById(Long bookingId);
-
-    /**
-     * 根据团课ID查询预约记录列表
-     * 
-     * @param courseId 团课ID
-     * @return 预约记录列表
-     */
-    Flux<GroupCourseBooking> getBookingsByCourseId(Long courseId);
-}

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

@@ -1,16 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.service;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.dto.PageResponse;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface IGroupCourseService {
-    Mono<GroupCourse> findById(Long id);
-    Flux<GroupCourse> findAll();
-    Flux<GroupCourse> findAll(boolean includeDeleted);
-    
-    Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted);
-}

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

@@ -1,76 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author:liwentao
- * @date:2026/5/15-05-15-16:05
- */
-@Service
-public class RedisService {
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
-    // 设置值
-    public void set(String key, Object value) {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    // 设置值并指定过期时间（秒）
-    public void setWithExpire(String key, Object value, long timeout) {
-        redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
-    }
-
-    // 获取值
-    public Object get(String key) {
-        return redisTemplate.opsForValue().get(key);
-    }
-
-    // 删除key
-    public Boolean delete(String key) {
-        return redisTemplate.delete(key);
-    }
-
-    // 判断key是否存在
-    public Boolean hasKey(String key) {
-        return redisTemplate.hasKey(key);
-    }
-
-    // 设置过期时间
-    public Boolean expire(String key, long timeout) {
-        return redisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    // Hash操作
-    public void putHash(String key, String hashKey, Object value) {
-        redisTemplate.opsForHash().put(key, hashKey, value);
-    }
-
-    public Object getHash(String key, String hashKey) {
-        return redisTemplate.opsForHash().get(key, hashKey);
-    }
-
-    // List操作
-    public void leftPush(String key, Object value) {
-        redisTemplate.opsForList().leftPush(key, value);
-    }
-
-    public Object rightPop(String key) {
-        return redisTemplate.opsForList().rightPop(key);
-    }
-
-    // Set操作
-    public void addToSet(String key, Object... values) {
-        redisTemplate.opsForSet().add(key, values);
-    }
-
-    public Set<Object> getSet(String key) {
-        return redisTemplate.opsForSet().members(key);
-    }
-}

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

@@ -1,284 +0,0 @@
-package cn.novalon.gym.manage.groupcourse.service.impl;
-
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
-import cn.novalon.gym.manage.groupcourse.event.BookingReminderEventPublisher;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
-import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.UUID;
-
-/**
- * 团课预约服务实现类
- * 
- * 业务规则：
- * - 预约需在课程开始前至少30分钟
- * - 取消预约需在课程开始前至少2小时
- * - 每节课最多20人
- * - 预约成功后发送提醒
- * - 预约成功后扣减权益
- * 
- * 技术要点：
- * - 使用Redis缓存团课信息
- * - 使用分布式锁防止预约冲突
- * - 使用响应式编程实现高并发预约
- * 
- * @author 张翔
- * @date 2026-06-01
- */
-@Service
-public class GroupCourseBookingService implements IGroupCourseBookingService {
-
-    private static final Logger logger = LoggerFactory.getLogger(GroupCourseBookingService.class);
-
-    private final IGroupCourseBookingRepository bookingRepository;
-    private final IGroupCourseRepository courseRepository;
-    private final GroupCourseRedisService redisService;
-    private final BookingReminderEventPublisher bookingReminderEventPublisher;
-
-    // 预约提前时间限制（分钟）
-    private static final long BOOKING_MIN_ADVANCE_MINUTES = 30;
-    // 取消预约提前时间限制（小时）
-    private static final long CANCEL_MIN_ADVANCE_HOURS = 2;
-
-    public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository,
-                                     IGroupCourseRepository courseRepository,
-                                     GroupCourseRedisService redisService,
-                                     BookingReminderEventPublisher bookingReminderEventPublisher) {
-        this.bookingRepository = bookingRepository;
-        this.courseRepository = courseRepository;
-        this.redisService = redisService;
-        this.bookingReminderEventPublisher = bookingReminderEventPublisher;
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardId) {
-        logger.info("开始预约团课：courseId={}, memberId={}, memberCardId={}", courseId, memberId, memberCardId);
-
-        // 生成唯一请求ID用于分布式锁
-        String requestId = UUID.randomUUID().toString();
-
-        // 1. 获取分布式锁
-        return redisService.acquireLock(courseId, requestId)
-                .flatMap(lockAcquired -> {
-                    if (!lockAcquired) {
-                        return Mono.error(new RuntimeException("系统繁忙，请稍后重试"));
-                    }
-
-                    // 2. 尝试从缓存获取课程信息，如果缓存不存在则从数据库获取
-                    return getCourseWithCache(courseId)
-                            .flatMap(course -> {
-                                // 3. 验证课程状态
-                                if (!"0".equals(String.valueOf(course.getStatus()))) {
-                                    return releaseLockAndError(courseId, requestId, "课程状态不可预约");
-                                }
-
-                                // 4. 验证预约时间
-                                LocalDateTime now = LocalDateTime.now();
-                                LocalDateTime startTime = course.getStartTime();
-                                long minutesUntilStart = ChronoUnit.MINUTES.between(now, startTime);
-                                if (minutesUntilStart < BOOKING_MIN_ADVANCE_MINUTES) {
-                                    return releaseLockAndError(courseId, requestId, 
-                                            "需在课程开始前" + BOOKING_MIN_ADVANCE_MINUTES + "分钟预约");
-                                }
-
-                                // 5. 验证是否已预约
-                                return bookingRepository.findValidBooking(courseId, memberId)
-                                        .flatMap(existingBooking -> {
-                                            return releaseLockAndError(courseId, requestId, "您已预约该课程");
-                                        })
-                                        .switchIfEmpty(
-                                            // 6. 使用Redis原子操作验证课程人数是否已满
-                                            validateAndIncrementBookingCount(courseId, course.getMaxMembers())
-                                                .flatMap(countValid -> {
-                                                    if (countValid > course.getMaxMembers()) {
-                                                        return releaseLockAndError(courseId, requestId, "课程已满");
-                                                    }
-
-                                                    // 7. 创建预约记录
-                                                    GroupCourseBooking booking = new GroupCourseBooking();
-                                                    booking.setCourseId(courseId);
-                                                    booking.setMemberId(memberId);
-                                                    booking.setMemberCardId(memberCardId);
-                                                    booking.setBookingTime(LocalDateTime.now());
-                                                    booking.setStatus("0"); // 0-已预约
-
-                                                    // 添加课程信息到预约记录
-                                                    booking.setCourseName(course.getCourseName());
-                                                    booking.setCourseStartTime(course.getStartTime());
-                                                    booking.setCourseEndTime(course.getEndTime());
-                                                    booking.setLocation(course.getLocation());
-
-                                                    // 8. 保存预约记录
-                                                    return bookingRepository.save(booking)
-                                                        .flatMap(savedBooking -> {
-                                                            // 9. 释放锁
-                                                            return redisService.releaseLock(courseId, requestId)
-                                                                .then(Mono.just(savedBooking));
-                                                        })
-                                                        .doOnSuccess(savedBooking -> {
-                                                            logger.info("预约成功：bookingId={}, courseId={}, memberId={}",
-                                                                    savedBooking.getId(), courseId, memberId);
-                                                            // 发布预约成功事件
-                                                            bookingReminderEventPublisher.publishBookingSuccessEvent(
-                                                                    savedBooking.getId(),
-                                                                    savedBooking.getMemberId(),
-                                                                    savedBooking.getCourseName(),
-                                                                    savedBooking.getCourseStartTime().toString()
-                                                            );
-                                                        })
-                                                        .doOnError(error -> {
-                                                            // 回滚Redis计数
-                                                            redisService.decrementBookingCount(courseId).subscribe();
-                                                            logger.error("预约失败：courseId={}, memberId={}, error={}",
-                                                                    courseId, memberId, error.getMessage());
-                                                        });
-                                                })
-                                        );
-                            })
-                            .onErrorResume(error -> {
-                                // 发生错误时释放锁
-                                redisService.releaseLock(courseId, requestId).subscribe();
-                                return Mono.error(error);
-                            });
-                });
-    }
-
-    /**
-     * 从缓存或数据库获取课程信息
-     */
-    private Mono<GroupCourse> getCourseWithCache(Long courseId) {
-        return redisService.getCachedCourse(courseId)
-                .switchIfEmpty(
-                    // 缓存未命中，从数据库查询
-                    courseRepository.findByIdAndDeletedAtIsNull(courseId)
-                        .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
-                        .flatMap(course -> {
-                            // 将课程信息存入缓存
-                            return redisService.cacheCourse(course).then(Mono.just(course));
-                        })
-                );
-    }
-
-    /**
-     * 验证并增加预约人数（使用Redis原子操作）
-     */
-    private Mono<Integer> validateAndIncrementBookingCount(Long courseId, Integer maxMembers) {
-        return redisService.incrementBookingCount(courseId)
-                .map(count -> {
-                    // 同时查询数据库中的预约数进行双重验证
-                    // 这里简化处理，实际生产环境应该结合数据库查询
-                    return count.intValue();
-                });
-    }
-
-    /**
-     * 释放锁并返回错误
-     */
-    private Mono<GroupCourseBooking> releaseLockAndError(Long courseId, String requestId, String errorMessage) {
-        return redisService.releaseLock(courseId, requestId)
-                .then(Mono.error(new RuntimeException(errorMessage)));
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> cancelBooking(Long bookingId, Long memberId) {
-        logger.info("开始取消预约：bookingId={}, memberId={}", bookingId, memberId);
-
-        // 生成唯一请求ID用于分布式锁
-        String requestId = UUID.randomUUID().toString();
-
-        // 获取锁防止并发取消
-        return redisService.acquireLock(bookingId, requestId)
-                .flatMap(lockAcquired -> {
-                    if (!lockAcquired) {
-                        return Mono.error(new RuntimeException("系统繁忙，请稍后重试"));
-                    }
-
-                    // 1. 查询预约记录
-                    return bookingRepository.findById(bookingId)
-                            .switchIfEmpty(Mono.error(new RuntimeException("预约记录不存在")))
-                            .flatMap(booking -> {
-                                // 2. 验证预约归属
-                                if (!booking.getMemberId().equals(memberId)) {
-                                    return releaseLockAndError(bookingId, requestId, "无权取消他人预约");
-                                }
-
-                                // 3. 验证预约状态
-                                if (!"0".equals(booking.getStatus())) {
-                                    return releaseLockAndError(bookingId, requestId, "预约状态不允许取消");
-                                }
-
-                                // 4. 验证取消时间
-                                LocalDateTime now = LocalDateTime.now();
-                                LocalDateTime startTime = booking.getCourseStartTime();
-                                long hoursUntilStart = ChronoUnit.HOURS.between(now, startTime);
-                                if (hoursUntilStart < CANCEL_MIN_ADVANCE_HOURS) {
-                                    return releaseLockAndError(bookingId, requestId, 
-                                            "需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消");
-                                }
-
-                                // 5. 更新预约状态
-                                booking.setStatus("1"); // 1-已取消
-                                booking.setCancelTime(LocalDateTime.now());
-
-                                // 6. 保存更新
-                                return bookingRepository.update(booking)
-                                    .flatMap(updatedBooking -> {
-                                        // 7. 减少Redis中的预约人数计数
-                                        return redisService.decrementBookingCount(booking.getCourseId())
-                                            .then(Mono.just(updatedBooking));
-                                    })
-                                    .flatMap(updatedBooking -> {
-                                        // 8. 释放锁
-                                        return redisService.releaseLock(bookingId, requestId)
-                                            .then(Mono.just(updatedBooking));
-                                    })
-                                    .doOnSuccess(updatedBooking -> {
-                                        logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId);
-                                        // 发布预约取消事件
-                                        bookingReminderEventPublisher.publishBookingCancelEvent(
-                                                updatedBooking.getId(),
-                                                updatedBooking.getMemberId(),
-                                                updatedBooking.getCourseName()
-                                        );
-                                    })
-                                    .doOnError(error -> {
-                                        logger.error("取消预约失败：bookingId={}, memberId={}, error={}",
-                                                bookingId, memberId, error.getMessage());
-                                    });
-                            })
-                            .onErrorResume(error -> {
-                                redisService.releaseLock(bookingId, requestId).subscribe();
-                                return Mono.error(error);
-                            });
-                });
-    }
-
-    @Override
-    public Flux<GroupCourseBooking> getBookingsByMemberId(Long memberId) {
-        logger.debug("查询会员预约记录：memberId={}", memberId);
-        return bookingRepository.findByMemberId(memberId)
-                .doOnComplete(() -> logger.debug("查询完成：memberId={}", memberId));
-    }
-
-    @Override
-    public Mono<GroupCourseBooking> getBookingById(Long bookingId) {
-        logger.debug("查询预约详情：bookingId={}", bookingId);
-        return bookingRepository.findById(bookingId);
-    }
-
-    @Override
-    public Flux<GroupCourseBooking> getBookingsByCourseId(Long courseId) {
-        logger.debug("查询课程预约记录：courseId={}", courseId);
-        return bookingRepository.findByCourseId(courseId)
-                .doOnComplete(() -> logger.debug("查询完成：courseId={}", courseId));
-    }
-}

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

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

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

@@ -1,136 +0,0 @@
-
-package cn.novalon.gym.manage.groupcourse.service.impl;
-
-import cn.novalon.gym.manage.common.dto.PageRequest;
-import cn.novalon.gym.manage.common.dto.PageResponse;
-import cn.novalon.gym.manage.common.util.RedisUtil;
-import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
-import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
-import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Service
-public class GroupCourseService implements IGroupCourseService {
-    private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class);
-    
-    private final IGroupCourseRepository groupCourseRepository;
-    private final RedisUtil redisUtil;
-    private final ObjectMapper objectMapper;
-    
-    private static final String CACHE_KEY_PREFIX = "group_course:page:";
-    private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
-    private static final long CACHE_EXPIRE_SECONDS = 300;
-    
-    public GroupCourseService(IGroupCourseRepository groupCourseRepository, 
-                              RedisUtil redisUtil,
-                              ObjectMapper objectMapper){
-        this.groupCourseRepository = groupCourseRepository;
-        this.redisUtil = redisUtil;
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public Mono<GroupCourse> findById(Long id) {
-        String cacheKey = CACHE_KEY_ID_PREFIX + id;
-        
-        return redisUtil.get(cacheKey, String.class)
-                .flatMap(cachedJson -> {
-                    if (cachedJson != null) {
-                        try {
-                            GroupCourse groupCourse = objectMapper.readValue(cachedJson, GroupCourse.class);
-                            logger.info("缓存命中 - findById: id={}", id);
-                            return Mono.just(groupCourse);
-                        } catch (JsonProcessingException e) {
-                            logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
-                            return redisUtil.delete(cacheKey).then(Mono.empty());
-                        }
-                    }
-                    return Mono.empty();
-                })
-                .switchIfEmpty(
-                    groupCourseRepository.findByIdAndDeletedAtIsNull(id)
-                            .flatMap(groupCourse -> {
-                                try {
-                                    String jsonData = objectMapper.writeValueAsString(groupCourse);
-                                    return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS)
-                                            .thenReturn(groupCourse)
-                                            .doOnSuccess(gc -> logger.debug("缓存已设置 - findById: id={}", id));
-                                } catch (JsonProcessingException e) {
-                                    logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage());
-                                    return Mono.just(groupCourse);
-                                }
-                            })
-                            .doOnSubscribe(sub -> logger.debug("缓存未命中，查询数据库 - findById: id={}", id))
-                );
-    }
-
-    @Override
-    public Flux<GroupCourse> findAll() {
-        return groupCourseRepository.findAll();
-    }
-
-    @Override
-    public Flux<GroupCourse> findAll(boolean includeDeleted) {
-        if(includeDeleted){
-            return groupCourseRepository.findAll();
-        }else{
-            return groupCourseRepository.findByDeletedAtIsNull();
-        }
-    }
-
-    @Override
-    public Mono<PageResponse<GroupCourse>> findByPage(PageRequest pageRequest, boolean includeDeleted) {
-        int page = pageRequest.getPage();
-        int size = pageRequest.getSize();
-        String sort = pageRequest.getSort();
-        String order = pageRequest.getOrder();
-        String keyword = pageRequest.getKeyword() != null ? pageRequest.getKeyword() : "";
-        
-        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword;
-
-        return redisUtil.get(cacheKey, String.class)
-                .flatMap(cachedJson -> {
-                    if (cachedJson != null) {
-                        try {
-                            PageResponse<GroupCourse> pageResponse = objectMapper.readValue(cachedJson, 
-                                objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class));
-                            logger.info("缓存命中 - findByPage: key={}", cacheKey);
-                            return Mono.just(pageResponse);
-                        } catch (JsonProcessingException e) {
-                            logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage());
-                            return redisUtil.delete(cacheKey).then(Mono.empty());
-                        }
-                    }
-                    return Mono.empty();
-                })
-                .switchIfEmpty(
-                    Mono.defer(() -> {
-                        logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey);
-                        Mono<PageResponse<GroupCourse>> resultMono;
-                        if (includeDeleted) {
-                            resultMono = groupCourseRepository.findByPage(pageRequest);
-                        } else {
-                            resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest);
-                        }
-                        
-                        return resultMono.flatMap(pageResponse -> {
-                            try {
-                                String jsonData = objectMapper.writeValueAsString(pageResponse);
-                                return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS)
-                                        .thenReturn(pageResponse)
-                                        .doOnSuccess(pr -> logger.debug("缓存已设置 - findByPage: key={}", cacheKey));
-                            } catch (JsonProcessingException e) {
-                                logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage());
-                                return Mono.just(pageResponse);
-                            }
-                        });
-                    })
-                );
-    }
-}

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

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

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

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

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

@@ -43,7 +43,7 @@ public class MemberHandler {
     @Operation(summary = "获取会员信息", description = "根据当前登录用户获取会员基本信息")
     public Mono<ServerResponse> getMemberInfo(ServerRequest request) {
 
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        Long memberId = authUtil.getMemberUserIdOrThrow(request);
 
         log.info("获取会员信息, memberId: {}", memberId);
 
@@ -56,7 +56,7 @@ public class MemberHandler {
     @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息")
     public Mono<ServerResponse> updateMemberInfo(ServerRequest request) {
 
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        Long memberId = authUtil.getMemberUserIdOrThrow(request);
 
         log.info("更新会员信息, memberId: {}", memberId);
 
@@ -70,7 +70,7 @@ public class MemberHandler {
     @Operation(summary = "绑定手机号", description = "通过微信小程序手机号code绑定会员手机号")
     public Mono<ServerResponse> bindPhone(ServerRequest request) {
 
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        Long memberId = authUtil.getMemberUserIdOrThrow(request);
 
         String phoneCode = request.queryParam("phoneCode").orElse("");
 
@@ -87,7 +87,7 @@ public class MemberHandler {
     @Operation(summary = "查询服务号关注状态", description = "查询会员是否关注微信服务号")
     public Mono<ServerResponse> checkSubscribeStatus(ServerRequest request) {
 
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        Long memberId = authUtil.getMemberUserIdOrThrow(request);
 
         log.info("查询服务号关注状态, memberId: {}", memberId);
 
@@ -102,7 +102,7 @@ public class MemberHandler {
     @Operation(summary = "管理员更新手机号", description = "后台管理员为会员更新手机号")
     public Mono<ServerResponse> adminUpdatePhone(ServerRequest request) {
 
-        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long adminId = authUtil.getAdminUserIdOrThrow(request);
 
         String memberIdStr = request.pathVariable("id");
         long memberId = NumberUtils.toLong(memberIdStr, 0L);
@@ -134,7 +134,7 @@ public class MemberHandler {
     @Operation(summary = "管理员查看会员详情", description = "后台管理员查看指定会员的详细信息")
     public Mono<ServerResponse> adminGetMemberInfo(ServerRequest request) {
 
-        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long adminId = authUtil.getAdminUserIdOrThrow(request);
 
         String memberIdStr = request.pathVariable("id");
         long memberId = NumberUtils.toLong(memberIdStr, 0L);
@@ -162,7 +162,7 @@ public class MemberHandler {
     @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息")
     public Mono<ServerResponse> adminUpdateMemberInfo(ServerRequest request) {
 
-        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long adminId = authUtil.getAdminUserIdOrThrow(request);
 
         String memberIdStr = request.pathVariable("id");
         long memberId = NumberUtils.toLong(memberIdStr, 0L);
@@ -181,7 +181,7 @@ public class MemberHandler {
     @Operation(summary = "搜索会员列表", description = "后台管理员按关键词搜索会员，支持性别筛选和分页")
     public Mono<ServerResponse> searchMembers(ServerRequest request) {
 
-        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long adminId = authUtil.getAdminUserIdOrThrow(request);
 
         String keyword = request.queryParam("searchValue").orElse(null);
         Integer pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
@@ -212,7 +212,7 @@ public class MemberHandler {
     @Operation(summary = "查看会员列表", description = "后台管理员分页查看所有会员列表")
     public Mono<ServerResponse> getAllMembers(ServerRequest request) {
 
-        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long adminId = authUtil.getAdminUserIdOrThrow(request);
 
         int pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
         int pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);

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,7 @@ import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
 import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import cn.novalon.gym.manage.common.util.RedisUtil;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

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

@@ -21,17 +21,26 @@ import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
 import cn.novalon.gym.manage.member.vo.MemberDetailVO;
 import cn.novalon.gym.manage.member.vo.MemberInfoVO;
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.core.IndexResponse;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

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

@@ -4,6 +4,8 @@ import cn.novalon.gym.manage.common.exception.ConflictException;
 import cn.novalon.gym.manage.common.exception.ErrorCode;
 import cn.novalon.gym.manage.common.exception.NotFoundException;
 import cn.novalon.gym.manage.common.exception.SystemException;
+import cn.novalon.gym.manage.common.util.HtmlEscapeUtil;
+import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.dto.WechatLoginDto;
 import cn.novalon.gym.manage.member.entity.Member;
 import cn.novalon.gym.manage.member.es.entity.MemberES;
@@ -301,9 +303,9 @@ public class WechatAuthServiceImpl implements WechatAuthService {
         }
 
         List<String> roles = new ArrayList<>();
-        String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
+        String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles, "MEMBER");
 
-        log.info("JWT Token 生成成功, memberId: {}", member.getId());
+        log.info("JWT Token 生成成功, memberId: {}, userType=MEMBER", member.getId());
 
         int expiresIn = 86400;
 
@@ -314,6 +316,7 @@ public class WechatAuthServiceImpl implements WechatAuthService {
                 .expiresIn(expiresIn)
                 .isNewUser(isNewUser)
                 .needCompleteInfo(needCompleteInfo)
+                .userType("MEMBER")
                 .build();
     }
 }

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

@@ -35,4 +35,7 @@ public class WechatLoginVO {
 
     // 是否需要补全信息（昵称、手机号等）
     private Boolean needCompleteInfo;
+
+    // 用户类型（MEMBER）
+    private String userType;
 }

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

@@ -43,6 +43,11 @@
             <artifactId>gym-member</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-checkIn</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -143,12 +148,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>gym-groupCourse</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -23,8 +23,7 @@ import java.util.List;
         "cn.novalon.gym.manage.db.dao",
         "cn.novalon.gym.manage.sys.audit.repository" ,
         "cn.novalon.gym.manage.gymmembercard.dao",
-        "cn.novalon.gym.manage.member.repository",
-        "cn.novalon.gym.manage.groupcourse.dao"
+        "cn.novalon.gym.manage.member.repository"
 })
 @EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository")
 public class ManageApplication {

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

@@ -1,43 +0,0 @@
-package cn.novalon.gym.manage.app.config;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * @author:liwentao
- * @date:2026/5/15-05-15-16:01
- */
-@Configuration
-public class RedisConfig {
-
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(factory);
-
-        // 创建ObjectMapper并配置
-        ObjectMapper om = new ObjectMapper();
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL);
-
-        // 使用GenericJackson2JsonRedisSerializer替代已弃用的方式
-        GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer(om);
-
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
-        StringRedisSerializer stringSerializer = new StringRedisSerializer();
-        template.setKeySerializer(stringSerializer);
-        template.setValueSerializer(genericJackson2JsonRedisSerializer);
-        template.setHashKeySerializer(stringSerializer);
-        template.setHashValueSerializer(genericJackson2JsonRedisSerializer);
-
-        template.afterPropertiesSet();
-        return template;
-    }
-}

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

@@ -1,9 +1,8 @@
 package cn.novalon.gym.manage.app.config;
 
 
+import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
 import cn.novalon.gym.manage.file.handler.SysFileHandler;
-import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
-import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardRecordHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardTransactionHandler;
@@ -35,7 +34,7 @@ import static org.springframework.web.reactive.function.server.RouterFunctions.r
  * 
  * 文件定义：配置WebFlux函数式路由，将HTTP请求映射到对应的Handler方法
  * 涉及业务：用户、角色、字典、菜单、公告、文件等所有RESTful API路由
- * 算法：使用RouterFunctions.route()构建函数式路由规则
+ * 路由规范：后台管理 API 统一前缀 /api/admin/**，前台会员 API 统一前缀 /api/member/**
  *
  * @author 张翔
  * @date 2026-03-13
@@ -65,155 +64,154 @@ public class SystemRouter {
             MemberCardHandler memberCardHandler,
             MemberCardRecordHandler memberCardRecordHandler,
             MemberCardTransactionHandler memberCardTransactionHandler,
-            GroupCourseHandler groupCourseHandler,
-            GroupCourseBookingHandler groupCourseBookingHandler) {
+            CheckInHandler checkInHandler) {
 
         return route()
-                // ========== 诊断路由 ==========
-                .GET("/api/diagnostic/password", passwordDiagnosticHandler::diagnose)
+                // ========== 诊断路由（管理端） ==========
+                .GET("/api/admin/diagnostic/password", passwordDiagnosticHandler::diagnose)
 
-                // ========== 字典路由 ==========
-                .GET("/api/dictionaries", dictionaryHandler::getAllDictionaries)
-                .GET("/api/dictionaries/{id}", dictionaryHandler::getDictionaryById)
-                .GET("/api/dictionaries/type/{type}", dictionaryHandler::getDictionariesByType)
-                .GET("/api/dictionaries/check/exists", dictionaryHandler::checkTypeAndCodeExists)
-                .POST("/api/dictionaries", dictionaryHandler::createDictionary)
-                .PUT("/api/dictionaries/{id}", dictionaryHandler::updateDictionary)
-                .DELETE("/api/dictionaries/{id}", dictionaryHandler::deleteDictionary)
+                // ========== 字典路由（管理端） ==========
+                .GET("/api/admin/dictionaries", dictionaryHandler::getAllDictionaries)
+                .GET("/api/admin/dictionaries/{id}", dictionaryHandler::getDictionaryById)
+                .GET("/api/admin/dictionaries/type/{type}", dictionaryHandler::getDictionariesByType)
+                .GET("/api/admin/dictionaries/check/exists", dictionaryHandler::checkTypeAndCodeExists)
+                .POST("/api/admin/dictionaries", dictionaryHandler::createDictionary)
+                .PUT("/api/admin/dictionaries/{id}", dictionaryHandler::updateDictionary)
+                .DELETE("/api/admin/dictionaries/{id}", dictionaryHandler::deleteDictionary)
 
-                // ========== 用户路由 ==========
-                .GET("/api/users", userHandler::getAllUsers)
-                .GET("/api/users/page", userHandler::getUsersByPage)
-                .GET("/api/users/count", userHandler::getUserCount)
-                .GET("/api/users/username/{username}", userHandler::getUserByUsername)
-                .GET("/api/users/check/username", userHandler::checkUsernameExists)
-                .GET("/api/users/check/email", userHandler::checkEmailExists)
-                .POST("/api/users", userHandler::createUser)
-                .GET("/api/users/{id}", userHandler::getUserById)
-                .PUT("/api/users/{id}", userHandler::updateUser)
-                .DELETE("/api/users/{id}", userHandler::deleteUser)
-                .POST("/api/users/{id}/action/change-password", userHandler::changePassword)
-                .POST("/api/users/{id}/action/logical-delete", userHandler::logicalDeleteUser)
-                .POST("/api/users/logical-delete", userHandler::logicalDeleteUsers)
-                .POST("/api/users/action/restore", userHandler::restoreUsers)
-                .POST("/api/users/{id}/action/restore", userHandler::restoreUser)
-                .GET("/api/users/{id}/roles", userHandler::getUserRoles)
-                .POST("/api/users/{id}/roles", userHandler::assignRoles)
+                // ========== 用户路由（管理端） ==========
+                .GET("/api/admin/users", userHandler::getAllUsers)
+                .GET("/api/admin/users/page", userHandler::getUsersByPage)
+                .GET("/api/admin/users/count", userHandler::getUserCount)
+                .GET("/api/admin/users/username/{username}", userHandler::getUserByUsername)
+                .GET("/api/admin/users/check/username", userHandler::checkUsernameExists)
+                .GET("/api/admin/users/check/email", userHandler::checkEmailExists)
+                .POST("/api/admin/users", userHandler::createUser)
+                .GET("/api/admin/users/{id}", userHandler::getUserById)
+                .PUT("/api/admin/users/{id}", userHandler::updateUser)
+                .DELETE("/api/admin/users/{id}", userHandler::deleteUser)
+                .POST("/api/admin/users/{id}/action/change-password", userHandler::changePassword)
+                .POST("/api/admin/users/{id}/action/logical-delete", userHandler::logicalDeleteUser)
+                .POST("/api/admin/users/logical-delete", userHandler::logicalDeleteUsers)
+                .POST("/api/admin/users/action/restore", userHandler::restoreUsers)
+                .POST("/api/admin/users/{id}/action/restore", userHandler::restoreUser)
+                .GET("/api/admin/users/{id}/roles", userHandler::getUserRoles)
+                .POST("/api/admin/users/{id}/roles", userHandler::assignRoles)
 
-                // ========== 菜单路由 ==========
-                .GET("/api/menus", menuHandler::getAllMenus)
-                .GET("/api/menus/tree", menuHandler::getMenuTree)
-                .GET("/api/menus/{id}", menuHandler::getMenuById)
-                .POST("/api/menus", menuHandler::createMenu)
-                .PUT("/api/menus/{id}", menuHandler::updateMenu)
-                .DELETE("/api/menus/{id}", menuHandler::deleteMenu)
+                // ========== 菜单路由（管理端） ==========
+                .GET("/api/admin/menus", menuHandler::getAllMenus)
+                .GET("/api/admin/menus/tree", menuHandler::getMenuTree)
+                .GET("/api/admin/menus/{id}", menuHandler::getMenuById)
+                .POST("/api/admin/menus", menuHandler::createMenu)
+                .PUT("/api/admin/menus/{id}", menuHandler::updateMenu)
+                .DELETE("/api/admin/menus/{id}", menuHandler::deleteMenu)
 
-                // ========== 角色路由 ==========
-                .GET("/api/roles", roleHandler::getAllRoles)
-                .GET("/api/roles/page", roleHandler::getRolesByPage)
-                .GET("/api/roles/count", roleHandler::getRoleCount)
-                .GET("/api/roles/name/{roleName}", roleHandler::getRoleByName)
-                .GET("/api/roles/check-name", roleHandler::checkNameExists)
-                .GET("/api/roles/{id}", roleHandler::getRoleById)
-                .POST("/api/roles", roleHandler::createRole)
-                .PUT("/api/roles/{id}", roleHandler::updateRole)
-                .DELETE("/api/roles/{id}", roleHandler::deleteRole)
-                .POST("/api/roles/{id}/restore", roleHandler::restoreRole)
-                .GET("/api/roles/{id}/permissions", permissionHandler::getPermissionsByRoleId)
-                .POST("/api/roles/{id}/permissions", permissionHandler::assignPermissionsToRole)
+                // ========== 角色路由（管理端） ==========
+                .GET("/api/admin/roles", roleHandler::getAllRoles)
+                .GET("/api/admin/roles/page", roleHandler::getRolesByPage)
+                .GET("/api/admin/roles/count", roleHandler::getRoleCount)
+                .GET("/api/admin/roles/name/{roleName}", roleHandler::getRoleByName)
+                .GET("/api/admin/roles/check-name", roleHandler::checkNameExists)
+                .GET("/api/admin/roles/{id}", roleHandler::getRoleById)
+                .POST("/api/admin/roles", roleHandler::createRole)
+                .PUT("/api/admin/roles/{id}", roleHandler::updateRole)
+                .DELETE("/api/admin/roles/{id}", roleHandler::deleteRole)
+                .POST("/api/admin/roles/{id}/restore", roleHandler::restoreRole)
+                .GET("/api/admin/roles/{id}/permissions", permissionHandler::getPermissionsByRoleId)
+                .POST("/api/admin/roles/{id}/permissions", permissionHandler::assignPermissionsToRole)
 
-                // ========== 配置路由 ==========
-                .GET("/api/config", configHandler::getAllConfigs)
-                .GET("/api/config/{id}", configHandler::getConfigById)
-                .GET("/api/config/key/{configKey}", configHandler::getConfigByKey)
-                .POST("/api/config", configHandler::createConfig)
-                .PUT("/api/config/{id}", configHandler::updateConfig)
-                .DELETE("/api/config/{id}", configHandler::deleteConfig)
+                // ========== 配置路由（管理端） ==========
+                .GET("/api/admin/config", configHandler::getAllConfigs)
+                .GET("/api/admin/config/{id}", configHandler::getConfigById)
+                .GET("/api/admin/config/key/{configKey}", configHandler::getConfigByKey)
+                .POST("/api/admin/config", configHandler::createConfig)
+                .PUT("/api/admin/config/{id}", configHandler::updateConfig)
+                .DELETE("/api/admin/config/{id}", configHandler::deleteConfig)
 
-                // ========== 日志路由 ==========
-                .GET("/api/logs/login", logHandler::getAllLoginLogs)
-                .GET("/api/logs/login/page", logHandler::getLoginLogsByPage)
-                .GET("/api/logs/login/count", logHandler::getLoginLogCount)
-                .GET("/api/logs/login/today/count", logHandler::getTodayLoginCount)
-                .GET("/api/logs/login/recent", logHandler::getRecentLoginLogs)
-                .GET("/api/logs/login/{id}", logHandler::getLoginLogById)
-                .POST("/api/logs/login", logHandler::createLoginLog)
-                .GET("/api/logs/exception", logHandler::getAllExceptionLogs)
-                .GET("/api/logs/exception/page", logHandler::getExceptionLogsByPage)
-                .GET("/api/logs/exception/count", logHandler::getExceptionLogCount)
-                .GET("/api/logs/exception/{id}", logHandler::getExceptionLogById)
-                .POST("/api/logs/exception", logHandler::createExceptionLog)
-                .GET("/api/logs/operation", operationLogHandler::getAllOperationLogs)
-                .GET("/api/logs/operation/export", operationLogHandler::exportOperationLogs)
-                .GET("/api/logs/operation/page", operationLogHandler::getOperationLogsByPage)
-                .GET("/api/logs/operation/count", operationLogHandler::getOperationLogCount)
-                .GET("/api/logs/operation/{id}", operationLogHandler::getOperationLogById)
-                .POST("/api/logs/operation", operationLogHandler::createOperationLog)
+                // ========== 日志路由（管理端） ==========
+                .GET("/api/admin/logs/login", logHandler::getAllLoginLogs)
+                .GET("/api/admin/logs/login/page", logHandler::getLoginLogsByPage)
+                .GET("/api/admin/logs/login/count", logHandler::getLoginLogCount)
+                .GET("/api/admin/logs/login/today/count", logHandler::getTodayLoginCount)
+                .GET("/api/admin/logs/login/recent", logHandler::getRecentLoginLogs)
+                .GET("/api/admin/logs/login/{id}", logHandler::getLoginLogById)
+                .POST("/api/admin/logs/login", logHandler::createLoginLog)
+                .GET("/api/admin/logs/exception", logHandler::getAllExceptionLogs)
+                .GET("/api/admin/logs/exception/page", logHandler::getExceptionLogsByPage)
+                .GET("/api/admin/logs/exception/count", logHandler::getExceptionLogCount)
+                .GET("/api/admin/logs/exception/{id}", logHandler::getExceptionLogById)
+                .POST("/api/admin/logs/exception", logHandler::createExceptionLog)
+                .GET("/api/admin/logs/operation", operationLogHandler::getAllOperationLogs)
+                .GET("/api/admin/logs/operation/export", operationLogHandler::exportOperationLogs)
+                .GET("/api/admin/logs/operation/page", operationLogHandler::getOperationLogsByPage)
+                .GET("/api/admin/logs/operation/count", operationLogHandler::getOperationLogCount)
+                .GET("/api/admin/logs/operation/{id}", operationLogHandler::getOperationLogById)
+                .POST("/api/admin/logs/operation", operationLogHandler::createOperationLog)
 
-                // ========== 认证路由 ==========
-                .POST("/api/auth/login", authHandler::login)
-                .POST("/api/auth/register", authHandler::register)
-                .POST("/api/auth/logout", authHandler::logout)
+                // ========== 认证路由（管理端） ==========
+                .POST("/api/admin/auth/login", authHandler::login)
+                .POST("/api/admin/auth/register", authHandler::register)
+                .POST("/api/admin/auth/logout", authHandler::logout)
 
-                // ========== 统计路由 ==========
-                .GET("/api/stats/overview", statsHandler::getOverview)
+                // ========== 统计路由（管理端） ==========
+                .GET("/api/admin/stats/overview", statsHandler::getOverview)
 
-                // ========== 数据字典路由 ==========
-                .GET("/api/dict/types", dictHandler::getAllDictTypes)
-                .GET("/api/dict/types/{id}", dictHandler::getDictTypeById)
-                .GET("/api/dict/types/type/{dictType}", dictHandler::getDictTypeByType)
-                .POST("/api/dict/types", dictHandler::createDictType)
-                .PUT("/api/dict/types/{id}", dictHandler::updateDictType)
-                .DELETE("/api/dict/types/{id}", dictHandler::deleteDictType)
-                .GET("/api/dict/data", dictHandler::getAllDictData)
-                .GET("/api/dict/data/type/{dictType}", dictHandler::getDictDataByType)
-                .GET("/api/dict/data/{id}", dictHandler::getDictDataById)
-                .POST("/api/dict/data", dictHandler::createDictData)
-                .PUT("/api/dict/data/{id}", dictHandler::updateDictData)
-                .DELETE("/api/dict/data/{id}", dictHandler::deleteDictData)
+                // ========== 数据字典路由（管理端） ==========
+                .GET("/api/admin/dict/types", dictHandler::getAllDictTypes)
+                .GET("/api/admin/dict/types/{id}", dictHandler::getDictTypeById)
+                .GET("/api/admin/dict/types/type/{dictType}", dictHandler::getDictTypeByType)
+                .POST("/api/admin/dict/types", dictHandler::createDictType)
+                .PUT("/api/admin/dict/types/{id}", dictHandler::updateDictType)
+                .DELETE("/api/admin/dict/types/{id}", dictHandler::deleteDictType)
+                .GET("/api/admin/dict/data", dictHandler::getAllDictData)
+                .GET("/api/admin/dict/data/type/{dictType}", dictHandler::getDictDataByType)
+                .GET("/api/admin/dict/data/{id}", dictHandler::getDictDataById)
+                .POST("/api/admin/dict/data", dictHandler::createDictData)
+                .PUT("/api/admin/dict/data/{id}", dictHandler::updateDictData)
+                .DELETE("/api/admin/dict/data/{id}", dictHandler::deleteDictData)
 
-                // ========== 公告路由 ==========
-                .GET("/api/notices", noticeHandler::getAllNotices)
-                .GET("/api/notices/{id}", noticeHandler::getNoticeById)
-                .GET("/api/notices/status/{status}", noticeHandler::getNoticesByStatus)
-                .POST("/api/notices", noticeHandler::createNotice)
-                .PUT("/api/notices/{id}", noticeHandler::updateNotice)
-                .DELETE("/api/notices/{id}", noticeHandler::deleteNotice)
+                // ========== 公告路由（管理端） ==========
+                .GET("/api/admin/notices", noticeHandler::getAllNotices)
+                .GET("/api/admin/notices/{id}", noticeHandler::getNoticeById)
+                .GET("/api/admin/notices/status/{status}", noticeHandler::getNoticesByStatus)
+                .POST("/api/admin/notices", noticeHandler::createNotice)
+                .PUT("/api/admin/notices/{id}", noticeHandler::updateNotice)
+                .DELETE("/api/admin/notices/{id}", noticeHandler::deleteNotice)
 
-                // ========== 消息路由 ==========
-                .GET("/api/messages/user/{userId}", messageHandler::getMessagesByUser)
-                .GET("/api/messages/user/{userId}/unread", messageHandler::getUnreadCount)
-                .GET("/api/messages/user/{userId}/unread/list", messageHandler::getUnreadList)
-                .POST("/api/messages", messageHandler::createMessage)
-                .PUT("/api/messages/{id}/read", messageHandler::markAsRead)
-                .DELETE("/api/messages/{id}", messageHandler::deleteMessage)
+                // ========== 消息路由（管理端） ==========
+                .GET("/api/admin/messages/user/{userId}", messageHandler::getMessagesByUser)
+                .GET("/api/admin/messages/user/{userId}/unread", messageHandler::getUnreadCount)
+                .GET("/api/admin/messages/user/{userId}/unread/list", messageHandler::getUnreadList)
+                .POST("/api/admin/messages", messageHandler::createMessage)
+                .PUT("/api/admin/messages/{id}/read", messageHandler::markAsRead)
+                .DELETE("/api/admin/messages/{id}", messageHandler::deleteMessage)
 
-                // ========== 文件路由 ==========
-                .GET("/api/files", fileHandler::getAllFiles)
-                .GET("/api/files/{id}", fileHandler::getFileById)
-                .POST("/api/files/upload", fileHandler::uploadFile)
-                .GET("/api/files/{id}/download", fileHandler::downloadFile)
-                .GET("/api/files/download/{fileName}", fileHandler::downloadFileByName)
-                .GET("/api/files/{id}/preview", fileHandler::previewFile)
-                .GET("/api/files/preview/{fileName}", fileHandler::previewFileByName)
-                .DELETE("/api/files/{id}", fileHandler::deleteFile)
+                // ========== 文件路由（管理端） ==========
+                .GET("/api/admin/files", fileHandler::getAllFiles)
+                .GET("/api/admin/files/{id}", fileHandler::getFileById)
+                .POST("/api/admin/files/upload", fileHandler::uploadFile)
+                .GET("/api/admin/files/{id}/download", fileHandler::downloadFile)
+                .GET("/api/admin/files/download/{fileName}", fileHandler::downloadFileByName)
+                .GET("/api/admin/files/{id}/preview", fileHandler::previewFile)
+                .GET("/api/admin/files/preview/{fileName}", fileHandler::previewFileByName)
+                .DELETE("/api/admin/files/{id}", fileHandler::deleteFile)
 
-                // ========== 权限路由 ==========
-                .GET("/api/permissions", permissionHandler::getAllPermissions)
-                .GET("/api/permissions/{id}", permissionHandler::getPermissionById)
-                .GET("/api/permissions/code/{code}", permissionHandler::getPermissionByCode)
-                .GET("/api/permissions/check-code", permissionHandler::checkCodeExists)
-                .GET("/api/permissions/count", permissionHandler::getPermissionCount)
-                .POST("/api/permissions", permissionHandler::createPermission)
-                .PUT("/api/permissions/{id}", permissionHandler::updatePermission)
-                .DELETE("/api/permissions/{id}", permissionHandler::deletePermission)
+                // ========== 权限路由（管理端） ==========
+                .GET("/api/admin/permissions", permissionHandler::getAllPermissions)
+                .GET("/api/admin/permissions/{id}", permissionHandler::getPermissionById)
+                .GET("/api/admin/permissions/code/{code}", permissionHandler::getPermissionByCode)
+                .GET("/api/admin/permissions/check-code", permissionHandler::checkCodeExists)
+                .GET("/api/admin/permissions/count", permissionHandler::getPermissionCount)
+                .POST("/api/admin/permissions", permissionHandler::createPermission)
+                .PUT("/api/admin/permissions/{id}", permissionHandler::updatePermission)
+                .DELETE("/api/admin/permissions/{id}", permissionHandler::deletePermission)
 
-                // ========== 会员模块路由 - 微信认证 ==========
+                // ========== 会员模块路由 - 微信认证（前台公开） ==========
                 .POST("/api/member/auth/miniapp/login", wechatAuthHandler::miniappLogin)
                 .GET("/api/member/auth/mp/callback", wechatAuthHandler::verifyMpSignature)
                 .POST("/api/member/auth/mp/callback", wechatAuthHandler::mpCallback)
                 
-                // ========== 会员模块路由 - 会员信息 ==========
+                // ========== 会员模块路由 - 会员信息（前台） ==========
                 .GET("/api/member/info", memberHandler::getMemberInfo)
                 .PUT("/api/member/info", memberHandler::updateMemberInfo)
                 .POST("/api/member/phone/bind", memberHandler::bindPhone)
@@ -228,48 +226,35 @@ public class SystemRouter {
 
 
                 // ========================================
-                // ========== 会员卡管理路由 ==============
+                // ========== 会员卡管理路由（管理端） ==============
                 // ========================================
 
                 // ===== 会员卡类型管理 =====
-                .GET("/api/member-cards/active", memberCardHandler::getActiveCards)
-                .GET("/api/member-cards/{memberCardId}", memberCardHandler::getMemberCardById)
-                .POST("/api/member-cards", memberCardHandler::createMemberCard)
+                .GET("/api/admin/member-cards/active", memberCardHandler::getActiveCards)
+                .GET("/api/admin/member-cards/{memberCardId}", memberCardHandler::getMemberCardById)
+                .POST("/api/admin/member-cards", memberCardHandler::createMemberCard)
 
                 // ===== 会员卡记录管理（核心业务）=====
-                .POST("/api/member-card-records/purchase", memberCardRecordHandler::purchaseCard)
-                .POST("/api/member-card-records/{recordId}/renew", memberCardRecordHandler::renewCard)
-                .POST("/api/member-card-records/{recordId}/use", memberCardRecordHandler::useCard)
-                .POST("/api/member-card-records/{recordId}/refund", memberCardRecordHandler::refundCard)
-                .GET("/api/member-card-records/my-cards/{memberId}", memberCardRecordHandler::getMyCards)
-                .GET("/api/member-card-records/{recordId}", memberCardRecordHandler::getMemberCardRecordById)
-                .POST("/api/member-card-records/process-expired", memberCardRecordHandler::processExpiredCards)
+                .POST("/api/admin/member-card-records/purchase", memberCardRecordHandler::purchaseCard)
+                .POST("/api/admin/member-card-records/{recordId}/renew", memberCardRecordHandler::renewCard)
+                .POST("/api/admin/member-card-records/{recordId}/use", memberCardRecordHandler::useCard)
+                .POST("/api/admin/member-card-records/{recordId}/refund", memberCardRecordHandler::refundCard)
+                .GET("/api/admin/member-card-records/my-cards/{memberId}", memberCardRecordHandler::getMyCards)
+                .GET("/api/admin/member-card-records/{recordId}", memberCardRecordHandler::getMemberCardRecordById)
+                .POST("/api/admin/member-card-records/process-expired", memberCardRecordHandler::processExpiredCards)
 
                 // ===== 会员卡交易流水管理 =====
-                .POST("/api/member-card-transactions", memberCardTransactionHandler::insertTransaction)
-                .GET("/api/member-card-transactions", memberCardTransactionHandler::getTransactionsWithConditions)
-                .GET("/api/member-card-transactions/member/{memberId}", memberCardTransactionHandler::getMemberTransactions)
-                .GET("/api/member-card-transactions/card/{cardId}", memberCardTransactionHandler::getTransactionsByCardId)
-                .GET("/api/member-card-transactions/statistics/deduct/{cardId}", memberCardTransactionHandler::getDeductCountByCardId)
-                .GET("/api/member-card-transactions/statistics/renew", memberCardTransactionHandler::getRenewAmountByTimeRange)
-                .GET("/api/member-card-transactions/statistics/purchase/{memberId}", memberCardTransactionHandler::getPurchaseAmountByMember)
-
-                // ========================================
-                // ========== 团课管理路由 =================
-                // ========================================
-
-                // ===== 团课课程管理 =====
-                .GET("/api/groupCourse/list", groupCourseHandler::getAllGroupCourse)
-                .POST("/api/groupCourse/page", groupCourseHandler::getGroupCoursesByPage)
-                .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById)
-
-                // ===== 团课预约管理 =====
-                .POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse)
-                .POST("/api/groupCourse/booking/{bookingId}/cancel", groupCourseBookingHandler::cancelBooking)
-                .GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId)
-                .GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)
-                .GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
+                .POST("/api/admin/member-card-transactions", memberCardTransactionHandler::insertTransaction)
+                .GET("/api/admin/member-card-transactions", memberCardTransactionHandler::getTransactionsWithConditions)
+                .GET("/api/admin/member-card-transactions/member/{memberId}", memberCardTransactionHandler::getMemberTransactions)
+                .GET("/api/admin/member-card-transactions/card/{cardId}", memberCardTransactionHandler::getTransactionsByCardId)
+                .GET("/api/admin/member-card-transactions/statistics/deduct/{cardId}", memberCardTransactionHandler::getDeductCountByCardId)
+                .GET("/api/admin/member-card-transactions/statistics/renew", memberCardTransactionHandler::getRenewAmountByTimeRange)
+                .GET("/api/admin/member-card-transactions/statistics/purchase/{memberId}", memberCardTransactionHandler::getPurchaseAmountByMember)
 
+                // ========= 签到路由（前台会员） ==========
+                .POST("/api/member/checkIn", checkInHandler::checkIn)
+                .GET("/api/member/checkIn/qrcode", checkInHandler::getQRCode)
                 .build();
     }
 }

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

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

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

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

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

@@ -56,6 +56,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,64 @@
+package cn.novalon.gym.manage.common.constant;
+
+/**
+ * Redis 缓存 Key 常量类
+ * 统一管理项目中所有 Redis 缓存的 key 前缀
+ *
+ * @author auto-generated
+ * @date 2026-05-30
+ */
+public final class RedisKeyConstants {
+
+    private RedisKeyConstants() {
+    }
+
+    // ==================== 会员模块 ====================
+
+    /**
+     * 会员信息缓存
+     * 格式：member:info:{memberId}
+     */
+    public static final String MEMBER_INFO = "member:info:";
+
+    /**
+     * 会员详情缓存
+     * 格式：member:detail:{memberId}
+     */
+    public static final String MEMBER_DETAIL = "member:detail:";
+
+    /**
+     * 会员卡类型缓存
+     * 格式：member:card:{memberCardId}
+     */
+    public static final String MEMBER_CARD = "member:card:";
+
+    /**
+     * 会员卡记录缓存（包含剩余次数/金额）
+     * 格式：member:card:record:{recordId}
+     */
+    public static final String MEMBER_CARD_RECORD = "member:card:record:";
+
+    /**
+     * 会员退款申请缓存
+     * 格式：member:refund:{recordId}
+     */
+    public static final String MEMBER_REFUND = "member:refund:";
+
+    // ==================== 签到模块 ====================
+
+    /**
+     * 用户当日二维码缓存
+     * 格式：qrcode:user:daily:{userId}:{date}
+     * 示例：qrcode:user:daily:1:2026-05-30
+     */
+    public static final String QRCODE_USER_DAILY = "qrcode:user:daily:";
+
+    // ==================== 微信模块 ====================
+
+    /**
+     * 微信 access_token 缓存
+     * 格式：wechat:access_token:{appType}
+     * appType: miniapp(小程序), mp(公众号)
+     */
+    public static final String WECHAT_ACCESS_TOKEN = "wechat:access_token:";
+}

gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/constants/UserType.java

@@ -0,0 +1,22 @@
+package cn.novalon.gym.manage.common.constants;
+
+/**
+ * 用户类型枚举
+ * 用于区分后台管理用户和前台会员用户
+ */
+public enum UserType {
+    ADMIN,
+    MEMBER;
+
+    public static UserType fromString(String value) {
+        if (value == null) {
+            throw new IllegalArgumentException("userType 不能为空");
+        }
+        for (UserType type : values()) {
+            if (type.name().equalsIgnoreCase(value)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("未知的用户类型: " + value);
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

gym-manage-api/manage-gateway/src/main/java/cn/novalon/gym/manage/gateway/filter/JwtAuthenticationFilter.java

@@ -42,6 +42,13 @@ public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory<JwtAut
                 return exchange.getResponse().setComplete();
             }
 
+            // 路径-userType 校验：防止越权访问
+            String userType = jwtUtil.getUserTypeFromToken(token);
+            if (!isUserTypeAllowedForPath(path, userType)) {
+                exchange.getResponse().setStatusCode(HttpStatus.FORBIDDEN);
+                return exchange.getResponse().setComplete();
+            }
+
             String username = jwtUtil.getUsernameFromToken(token);
             Long userId = jwtUtil.getUserIdFromToken(token);
 
@@ -49,18 +56,34 @@ public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory<JwtAut
                     .header("X-User-Id", String.valueOf(userId))
                     .header("X-Member-Id", String.valueOf(userId))
                     .header("X-Username", username)
+                    .header("X-User-Type", userType != null ? userType : "UNKNOWN")
                     .build();
 
             return chain.filter(exchange.mutate().request(modifiedRequest).build());
         };
     }
 
+    /**
+     * 校验路径与 userType 是否匹配
+     * - /api/admin/** 路径只允许 userType=ADMIN
+     * - /api/member/** 路径只允许 userType=MEMBER
+     * - 其他路径不做 userType 校验
+     */
+    private boolean isUserTypeAllowedForPath(String path, String userType) {
+        if (path.startsWith("/api/admin/")) {
+            return "ADMIN".equals(userType);
+        }
+        if (path.startsWith("/api/member/")) {
+            return "MEMBER".equals(userType);
+        }
+        // 非特定前缀路径不做 userType 校验
+        return true;
+    }
+
     private boolean isPublicPath(String path) {
-        return path.startsWith("/api/auth/") || 
+        return path.startsWith("/api/admin/auth/") || 
                path.equals("/actuator/health") ||
-               path.equals("/api/member/auth/miniapp/login") || 
-               path.equals("/api/member/auth/mp/callback") || 
-               path.equals("/api/auth/login") || 
+               path.startsWith("/api/member/auth/") || 
                path.startsWith("/actuator/info");
     }
 

gym-manage-api/manage-gateway/src/main/java/cn/novalon/gym/manage/gateway/filter/RbacAuthorizationFilter.java

@@ -63,7 +63,8 @@ public class RbacAuthorizationFilter extends AbstractGatewayFilterFactory<RbacAu
     private boolean isPublicPath(String path) {
         return path.startsWith("/api/auth/") ||
                path.equals("/actuator/health") ||
-               path.startsWith("/actuator/info");
+               path.startsWith("/actuator/info") ||
+               path.startsWith("/api/checkIn/");
     }
 
     public static class Config {

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

@@ -28,6 +28,10 @@ public class JwtUtil {
     }
 
     public String generateToken(String username, Long userId) {
+        return generateToken(username, userId, "ADMIN");
+    }
+
+    public String generateToken(String username, Long userId, String userType) {
         Date now = new Date();
         Date expiryDate = new Date(now.getTime() + expiration);
 
@@ -35,13 +39,14 @@ public class JwtUtil {
             String token = Jwts.builder()
                     .setSubject(username)
                     .claim("userId", userId)
+                    .claim("userType", userType)
                     .claim("keyVersion", jwtKeyService.getCurrentKeyVersion())
                     .setIssuedAt(now)
                     .setExpiration(expiryDate)
                     .signWith(getSigningKey())
                     .compact();
             
-            logger.debug("Generated JWT token for user: {}, userId: {}", username, userId);
+            logger.debug("Generated JWT token for user: {}, userId: {}, userType: {}", username, userId, userType);
             return token;
             
         } catch (Exception e) {
@@ -74,6 +79,11 @@ public class JwtUtil {
         return claims.get("userId", Long.class);
     }
 
+    public String getUserTypeFromToken(String token) {
+        Claims claims = parseToken(token);
+        return claims.get("userType", String.class);
+    }
+
     public boolean validateToken(String token) {
         try {
             parseToken(token);

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

@@ -64,7 +64,7 @@ signature:
   max-age-minutes: ${SIGNATURE_MAX_AGE_MINUTES:5}
   nonce-cache-size: ${SIGNATURE_NONCE_CACHE_SIZE:10000}
   whitelist:
-    paths: ${SIGNATURE_WHITELIST_PATHS:/actuator/health,/actuator/info,/api/auth/login,/api/auth/register,/api/member/auth/miniapp/login,/api/member/auth/mp/callback}
+    paths: ${SIGNATURE_WHITELIST_PATHS:/actuator/health,/actuator/info,/api/admin/auth/login,/api/admin/auth/register,/api/member/auth/miniapp/login,/api/member/auth/mp/callback}
 
 resilience:
   enabled: ${RESILIENCE_ENABLED:true}

gym-manage-api/manage-gateway/src/test/java/cn/novalon/gym/manage/gateway/filter/GatewayJwtAuthenticationFilterTest.java

@@ -39,7 +39,7 @@ class GatewayJwtAuthenticationFilterTest {
 
     @Test
     void testPublicPath_AllowAccess() {
-        MockServerHttpRequest request = MockServerHttpRequest.get("/api/auth/login").build();
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/admin/auth/login").build();
         exchange = MockServerWebExchange.from(request);
 
         when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
@@ -56,7 +56,7 @@ class GatewayJwtAuthenticationFilterTest {
 
     @Test
     void testPublicPath_Register() {
-        MockServerHttpRequest request = MockServerHttpRequest.post("/api/auth/register").build();
+        MockServerHttpRequest request = MockServerHttpRequest.post("/api/admin/auth/register").build();
         exchange = MockServerWebExchange.from(request);
 
         when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
@@ -105,6 +105,40 @@ class GatewayJwtAuthenticationFilterTest {
         verify(jwtUtil, never()).validateToken(anyString());
     }
 
+    @Test
+    void testPublicPath_MemberAuth() {
+        MockServerHttpRequest request = MockServerHttpRequest.post("/api/member/auth/miniapp/login").build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        verify(chain).filter(any(ServerWebExchange.class));
+        verify(jwtUtil, never()).validateToken(anyString());
+    }
+
+    @Test
+    void testPublicPath_AdminAuthPrefix() {
+        MockServerHttpRequest request = MockServerHttpRequest.post("/api/admin/auth/refresh").build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        verify(chain).filter(any(ServerWebExchange.class));
+        verify(jwtUtil, never()).validateToken(anyString());
+    }
+
     @Test
     void testProtectedPath_NoAuthHeader() {
         MockServerHttpRequest request = MockServerHttpRequest.get("/api/users").build();
@@ -152,6 +186,7 @@ class GatewayJwtAuthenticationFilterTest {
         when(jwtUtil.isTokenExpired(validToken)).thenReturn(false);
         when(jwtUtil.getUsernameFromToken(validToken)).thenReturn("testuser");
         when(jwtUtil.getUserIdFromToken(validToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(validToken)).thenReturn("ADMIN");
 
         Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
                 .filter(exchange, chain);
@@ -163,6 +198,7 @@ class GatewayJwtAuthenticationFilterTest {
         verify(jwtUtil).isTokenExpired(validToken);
         verify(jwtUtil).getUsernameFromToken(validToken);
         verify(jwtUtil).getUserIdFromToken(validToken);
+        verify(jwtUtil).getUserTypeFromToken(validToken);
         verify(chain).filter(any(ServerWebExchange.class));
     }
 
@@ -224,6 +260,7 @@ class GatewayJwtAuthenticationFilterTest {
         when(jwtUtil.isTokenExpired(validToken)).thenReturn(false);
         when(jwtUtil.getUsernameFromToken(validToken)).thenReturn("testuser");
         when(jwtUtil.getUserIdFromToken(validToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(validToken)).thenReturn("ADMIN");
 
         Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
                 .filter(exchange, chain);
@@ -235,6 +272,7 @@ class GatewayJwtAuthenticationFilterTest {
         verify(jwtUtil).isTokenExpired(validToken);
         verify(jwtUtil).getUsernameFromToken(validToken);
         verify(jwtUtil).getUserIdFromToken(validToken);
+        verify(jwtUtil).getUserTypeFromToken(validToken);
         verify(chain).filter(any(ServerWebExchange.class));
     }
 
@@ -251,6 +289,7 @@ class GatewayJwtAuthenticationFilterTest {
         when(jwtUtil.isTokenExpired(validToken)).thenReturn(false);
         when(jwtUtil.getUsernameFromToken(validToken)).thenReturn("testuser");
         when(jwtUtil.getUserIdFromToken(validToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(validToken)).thenReturn("ADMIN");
 
         Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
                 .filter(exchange, chain);
@@ -263,11 +302,12 @@ class GatewayJwtAuthenticationFilterTest {
         ServerHttpRequest modifiedRequest = exchangeCaptor.getValue().getRequest();
         assert modifiedRequest.getHeaders().getFirst("X-User-Id").equals("1");
         assert modifiedRequest.getHeaders().getFirst("X-Username").equals("testuser");
+        assert modifiedRequest.getHeaders().getFirst("X-User-Type").equals("ADMIN");
     }
 
     @Test
-    void testMixedPath_AuthPath() {
-        MockServerHttpRequest request = MockServerHttpRequest.get("/api/auth/logout").build();
+    void testMixedPath_AdminAuthPath() {
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/admin/auth/logout").build();
         exchange = MockServerWebExchange.from(request);
 
         when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
@@ -295,6 +335,7 @@ class GatewayJwtAuthenticationFilterTest {
         when(jwtUtil.isTokenExpired(validToken)).thenReturn(false);
         when(jwtUtil.getUsernameFromToken(validToken)).thenReturn("testuser");
         when(jwtUtil.getUserIdFromToken(validToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(validToken)).thenReturn("ADMIN");
 
         Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
                 .filter(exchange, chain);
@@ -308,4 +349,123 @@ class GatewayJwtAuthenticationFilterTest {
         verify(jwtUtil).getUserIdFromToken(validToken);
         verify(chain).filter(any(ServerWebExchange.class));
     }
+
+    // ========== userType 路径校验测试 ==========
+
+    @Test
+    void testAdminPath_WithAdminToken_ShouldPass() {
+        String adminToken = "admin.jwt.token";
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/admin/users")
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + adminToken)
+                .build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
+        when(jwtUtil.validateToken(adminToken)).thenReturn(true);
+        when(jwtUtil.isTokenExpired(adminToken)).thenReturn(false);
+        when(jwtUtil.getUsernameFromToken(adminToken)).thenReturn("admin");
+        when(jwtUtil.getUserIdFromToken(adminToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(adminToken)).thenReturn("ADMIN");
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        verify(chain).filter(any(ServerWebExchange.class));
+    }
+
+    @Test
+    void testAdminPath_WithMemberToken_ShouldBeForbidden() {
+        String memberToken = "member.jwt.token";
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/admin/users")
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + memberToken)
+                .build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(jwtUtil.validateToken(memberToken)).thenReturn(true);
+        when(jwtUtil.isTokenExpired(memberToken)).thenReturn(false);
+        when(jwtUtil.getUserTypeFromToken(memberToken)).thenReturn("MEMBER");
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        assert exchange.getResponse().getStatusCode() == HttpStatus.FORBIDDEN;
+        verify(chain, never()).filter(any(ServerWebExchange.class));
+    }
+
+    @Test
+    void testMemberPath_WithMemberToken_ShouldPass() {
+        String memberToken = "member.jwt.token";
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/member/info")
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + memberToken)
+                .build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
+        when(jwtUtil.validateToken(memberToken)).thenReturn(true);
+        when(jwtUtil.isTokenExpired(memberToken)).thenReturn(false);
+        when(jwtUtil.getUsernameFromToken(memberToken)).thenReturn("123");
+        when(jwtUtil.getUserIdFromToken(memberToken)).thenReturn(123L);
+        when(jwtUtil.getUserTypeFromToken(memberToken)).thenReturn("MEMBER");
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        verify(chain).filter(any(ServerWebExchange.class));
+    }
+
+    @Test
+    void testMemberPath_WithAdminToken_ShouldBeForbidden() {
+        String adminToken = "admin.jwt.token";
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/member/info")
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + adminToken)
+                .build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(jwtUtil.validateToken(adminToken)).thenReturn(true);
+        when(jwtUtil.isTokenExpired(adminToken)).thenReturn(false);
+        when(jwtUtil.getUserTypeFromToken(adminToken)).thenReturn("ADMIN");
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        assert exchange.getResponse().getStatusCode() == HttpStatus.FORBIDDEN;
+        verify(chain, never()).filter(any(ServerWebExchange.class));
+    }
+
+    @Test
+    void testNonPrefixedPath_NoUserTypeCheck() {
+        String adminToken = "admin.jwt.token";
+        // /api/users 不以 /api/admin/ 或 /api/member/ 开头，不做 userType 校验
+        MockServerHttpRequest request = MockServerHttpRequest.get("/api/users")
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + adminToken)
+                .build();
+        exchange = MockServerWebExchange.from(request);
+
+        when(chain.filter(any(ServerWebExchange.class))).thenReturn(Mono.empty());
+        when(jwtUtil.validateToken(adminToken)).thenReturn(true);
+        when(jwtUtil.isTokenExpired(adminToken)).thenReturn(false);
+        when(jwtUtil.getUsernameFromToken(adminToken)).thenReturn("admin");
+        when(jwtUtil.getUserIdFromToken(adminToken)).thenReturn(1L);
+        when(jwtUtil.getUserTypeFromToken(adminToken)).thenReturn("ADMIN");
+
+        Mono<Void> result = filter.apply(new JwtAuthenticationFilter.Config())
+                .filter(exchange, chain);
+
+        StepVerifier.create(result)
+                .verifyComplete();
+
+        verify(chain).filter(any(ServerWebExchange.class));
+    }
 }

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

@@ -47,17 +47,11 @@ public class SecurityConfig {
                 .addFilterBefore(jwtAuthenticationFilter, SecurityWebFiltersOrder.AUTHENTICATION)
                 .addFilterAfter(operationLogWebFilter, SecurityWebFiltersOrder.AUTHORIZATION)
                 .authorizeExchange(spec -> {
-                    spec.pathMatchers("/api/auth/**").permitAll()
+                    spec.pathMatchers("/api/admin/auth/**").permitAll()
+                            .pathMatchers("/api/member/auth/**").permitAll()
                             .pathMatchers("/api/public/**").permitAll()
                             .pathMatchers("/ws/**").permitAll()
-                            .pathMatchers("/actuator/**").permitAll()
-                            .pathMatchers("/api/groupCourse/**").permitAll()
-                            .pathMatchers("/api/member/**").permitAll()
-                            .pathMatchers("/api/admin/member/**").permitAll()
-                            .pathMatchers("/api/member-cards/**").permitAll()
-                            .pathMatchers("/api/member-card-records/**").permitAll()
-                            .pathMatchers("/api/member-card-transactions/**").permitAll();
-
+                            .pathMatchers("/actuator/**").permitAll();
 
                     if (isDevOrTest) {
                         spec.pathMatchers("/swagger-ui.html").permitAll()
@@ -66,7 +60,7 @@ public class SecurityConfig {
                                 .pathMatchers("/v3/api-docs/**").permitAll()
                                 .pathMatchers("/swagger-resources/**").permitAll()
                                 .pathMatchers("/webjars/**").permitAll()
-                                .pathMatchers("/api/diagnostic/**").permitAll();
+                                .pathMatchers("/api/admin/diagnostic/**").permitAll();
                         logger.info("SecurityConfig: Swagger路径和诊断端点已放行");
                     }
 

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

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

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/dto/response/AuthResponse.java

@@ -20,6 +20,9 @@ public class AuthResponse {
     @Schema(description = "用户名", example = "admin")
     private String username;
 
+    @Schema(description = "用户类型", example = "ADMIN")
+    private String userType;
+
     public AuthResponse() {
     }
 
@@ -27,6 +30,14 @@ public class AuthResponse {
         this.token = token;
         this.userId = userId;
         this.username = username;
+        this.userType = "ADMIN";
+    }
+
+    public AuthResponse(String token, Long userId, String username, String userType) {
+        this.token = token;
+        this.userId = userId;
+        this.username = username;
+        this.userType = userType;
     }
 
     public String getToken() {
@@ -52,4 +63,12 @@ public class AuthResponse {
     public void setUsername(String username) {
         this.username = username;
     }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
 }

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

@@ -133,8 +133,9 @@ public class SysAuthHandler {
                                                                                                         .generateToken(
                                                                                                                         user.getUsername(),
                                                                                                                         user.getId(),
-                                                                                                                        roleKeys);
-                                                                                        logger.info("用户登录成功: username={}, userId={}, roles={}",
+                                                                                                                        roleKeys,
+                                                                                                                        "ADMIN");
+                                                                                        logger.info("用户登录成功: username={}, userId={}, roles={}, userType=ADMIN",
                                                                                                         user.getUsername(),
                                                                                                         user.getId(),
                                                                                                         roleKeys);
@@ -146,7 +147,8 @@ public class SysAuthHandler {
                                                                                         AuthResponse response = new AuthResponse(
                                                                                                         token,
                                                                                                         user.getId(),
-                                                                                                        user.getUsername());
+                                                                                                        user.getUsername(),
+                                                                                                        "ADMIN");
                                                                                         return ServerResponse.ok()
                                                                                                         .bodyValue(response);
                                                                                 });

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/security/JwtAuthenticationFilter.java

@@ -37,6 +37,7 @@ public class JwtAuthenticationFilter implements WebFilter {
             String username = jwtTokenProvider.getUsernameFromToken(token);
             jwtTokenProvider.getUserIdFromToken(token);
             List<String> roles = jwtTokenProvider.getRolesFromToken(token);
+            String userType = jwtTokenProvider.getUserTypeFromToken(token);
             
             List<SimpleGrantedAuthority> authorities = roles.stream()
                     .map(role -> new SimpleGrantedAuthority("ROLE_" + role))
@@ -53,6 +54,9 @@ public class JwtAuthenticationFilter implements WebFilter {
                     authorities
                 );
             
+            // 将 userType 存入 authentication details，供后续 AuthUtil 使用
+            authentication.setDetails(userType);
+            
             return chain.filter(exchange)
                 .contextWrite(ReactiveSecurityContextHolder.withAuthentication(authentication));
         }

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/security/JwtTokenProvider.java

@@ -32,24 +32,19 @@ public class JwtTokenProvider {
     }
 
     public String generateToken(String username, Long userId) {
-        Map<String, Object> claims = new HashMap<>();
-        claims.put("userId", userId);
-        claims.put("username", username);
-        
-        return Jwts.builder()
-                .setClaims(claims)
-                .setSubject(username)
-                .setIssuedAt(new Date())
-                .setExpiration(new Date(System.currentTimeMillis() + jwtProperties.getExpiration()))
-                .signWith(getSigningKey())
-                .compact();
+        return generateToken(username, userId, java.util.Collections.emptyList(), "ADMIN");
     }
 
     public String generateToken(String username, Long userId, java.util.List<String> roles) {
+        return generateToken(username, userId, roles, "ADMIN");
+    }
+
+    public String generateToken(String username, Long userId, java.util.List<String> roles, String userType) {
         Map<String, Object> claims = new HashMap<>();
         claims.put("userId", userId);
         claims.put("username", username);
         claims.put("roles", roles);
+        claims.put("userType", userType);
         
         return Jwts.builder()
                 .setClaims(claims)
@@ -85,6 +80,10 @@ public class JwtTokenProvider {
         return java.util.Collections.emptyList();
     }
 
+    public String getUserTypeFromToken(String token) {
+        return getClaimsFromToken(token).get("userType", String.class);
+    }
+
     public boolean validateToken(String token) {
         try {
             getClaimsFromToken(token);

gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/util/AuthUtil.java

@@ -29,4 +29,38 @@ public class AuthUtil {
         if (jwtTokenProvider.getUserIdFromToken(token) <= 0L) throw new IllegalArgumentException("ID无效");
         return jwtTokenProvider.getUserIdFromToken(token);
     }
+
+    /**
+     * 获取当前 ADMIN 用户 ID，校验 userType 必须为 ADMIN
+     */
+    public Long getAdminUserIdOrThrow(ServerRequest request) {
+        String token = extractToken(request);
+        if (token == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "缺少 Token");
+        if (!jwtTokenProvider.validateToken(token)) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Token 无效或已过期");
+        String userType = jwtTokenProvider.getUserTypeFromToken(token);
+        if (!"ADMIN".equals(userType)) {
+            log.warn("非管理员用户尝试访问管理端接口, userType={}", userType);
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权访问管理端接口");
+        }
+        Long userId = jwtTokenProvider.getUserIdFromToken(token);
+        if (userId <= 0L) throw new IllegalArgumentException("ID无效");
+        return userId;
+    }
+
+    /**
+     * 获取当前 MEMBER 用户 ID，校验 userType 必须为 MEMBER
+     */
+    public Long getMemberUserIdOrThrow(ServerRequest request) {
+        String token = extractToken(request);
+        if (token == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "缺少 Token");
+        if (!jwtTokenProvider.validateToken(token)) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Token 无效或已过期");
+        String userType = jwtTokenProvider.getUserTypeFromToken(token);
+        if (!"MEMBER".equals(userType)) {
+            log.warn("非会员用户尝试访问会员接口, userType={}", userType);
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "无权访问会员接口");
+        }
+        Long userId = jwtTokenProvider.getUserIdFromToken(token);
+        if (userId <= 0L) throw new IllegalArgumentException("ID无效");
+        return userId;
+    }
 }

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

@@ -80,7 +80,7 @@ class SysAuthHandlerTest {
         // 配置密码编码器Mock来验证密码
         when(passwordEncoder.matches(rawPassword, realEncodedPassword)).thenReturn(true);
         
-        when(jwtTokenProvider.generateToken(eq("testuser"), eq(1L), anyList())).thenReturn("test_token");
+        when(jwtTokenProvider.generateToken(eq("testuser"), eq(1L), anyList(), eq("ADMIN"))).thenReturn("test_token");
         
         // 使用测试数据工厂创建角色
         SysRole mockRole = TestDataFactory.createUserRole();
@@ -103,7 +103,7 @@ class SysAuthHandlerTest {
                 .verifyComplete();
 
         verify(userService).findByUsername("testuser");
-        verify(jwtTokenProvider).generateToken(eq("testuser"), eq(1L), anyList());
+        verify(jwtTokenProvider).generateToken(eq("testuser"), eq(1L), anyList(), eq("ADMIN"));
     }
 
     @Test

gym-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/security/JwtTokenProviderTest.java

@@ -108,4 +108,52 @@ class JwtTokenProviderTest {
         
         assertThat(isValid).isFalse();
     }
+
+    @Test
+    void testGenerateTokenWithUserType() {
+        when(jwtProperties.getSecret()).thenReturn("test-secret-key-for-testing-purposes-only-1234567890");
+        when(jwtProperties.getExpiration()).thenReturn(3600000L);
+
+        String token = jwtTokenProvider.generateToken("testuser", 1L, java.util.List.of("admin"), "ADMIN");
+
+        assertThat(token).isNotNull();
+        assertThat(token).isNotEmpty();
+    }
+
+    @Test
+    void testGetUserTypeFromToken() {
+        when(jwtProperties.getSecret()).thenReturn("test-secret-key-for-testing-purposes-only-1234567890");
+        when(jwtProperties.getExpiration()).thenReturn(3600000L);
+
+        String token = jwtTokenProvider.generateToken("testuser", 1L, java.util.List.of("admin"), "ADMIN");
+
+        String userType = jwtTokenProvider.getUserTypeFromToken(token);
+
+        assertThat(userType).isEqualTo("ADMIN");
+    }
+
+    @Test
+    void testGetUserTypeFromToken_Member() {
+        when(jwtProperties.getSecret()).thenReturn("test-secret-key-for-testing-purposes-only-1234567890");
+        when(jwtProperties.getExpiration()).thenReturn(3600000L);
+
+        String token = jwtTokenProvider.generateToken("123", 123L, java.util.List.of(), "MEMBER");
+
+        String userType = jwtTokenProvider.getUserTypeFromToken(token);
+
+        assertThat(userType).isEqualTo("MEMBER");
+    }
+
+    @Test
+    void testGetUserTypeFromToken_DefaultIsAdmin() {
+        when(jwtProperties.getSecret()).thenReturn("test-secret-key-for-testing-purposes-only-1234567890");
+        when(jwtProperties.getExpiration()).thenReturn(3600000L);
+
+        // 使用旧的两参数方法生成的 token 默认 userType 为 ADMIN
+        String token = jwtTokenProvider.generateToken("testuser", 1L);
+
+        String userType = jwtTokenProvider.getUserTypeFromToken(token);
+
+        assertThat(userType).isEqualTo("ADMIN");
+    }
 }

gym-manage-api/pom.xml

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