增加Redis缓存功能

注：/api/groupCourse/cache/get接口为测试接口

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/admin/auth/login', {
+    const response = await request.post('http://localhost:8080/api/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/admin/auth/login', {
+      const response = await page.request.post('http://localhost:8080/api/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/admin/users/${userId}`, {
+      const response = await page.request.get(`http://localhost:8080/api/users/${userId}`, {
         headers: {
           'Authorization': `Bearer ${authToken}`
         }
@@ -98,10 +98,10 @@ test.describe('认证和授权测试', () => {
   test('权限验证测试', async ({ page }) => {
     await test.step('测试访问受保护的API', async () => {
       const protectedEndpoints = [
-        '/api/admin/users',
+        '/api/users',
-        '/api/admin/roles',
+        '/api/roles',
-        '/api/admin/menus',
+        '/api/menus',
-        '/api/admin/config'
+        '/api/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/admin/auth/login', {
+    const response = await request.post('http://localhost:8080/api/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/admin/auth/login', {
+    const response = await request.post('http://localhost:8080/api/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/admin/auth/login', {
+    const response = await fetch('http://localhost:8080/api/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/admin/auth/login', {
+            const loginTest = await fetch('http://localhost:8084/api/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/admin/auth/login', {
+            const loginTest = await fetch('http://localhost:8080/api/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/admin/auth/login', {
+    const loginResponse = await fetch('http://localhost:8080/api/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/admin/users/${user.id}`, {
+            await fetch(`http://localhost:8080/api/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/admin/roles/${role.id}`, {
+            await fetch(`http://localhost:8080/api/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/admin/roles') && resp.request().method() === 'POST',
+          resp.url().includes('/api/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/admin/users?page=0&size=10');
+      const response = await page.request.get('/api/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/admin/auth/login', {
+    const response = await request.post('http://localhost:8080/api/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/admin/auth/login`, {
+    const response = await this.request.post(`${this.baseURL}/api/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/admin/auth/logout`, {
+    await this.request.post(`${this.baseURL}/api/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/admin/users`, {
+    const response = await this.request.get(`${this.baseURL}/api/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/admin/users`, {
+    const response = await this.request.post(`${this.baseURL}/api/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/admin/users/${userId}`, {
+    const response = await this.request.put(`${this.baseURL}/api/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/admin/users/${userId}`, {
+    const response = await this.request.delete(`${this.baseURL}/api/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/admin/roles`, {
+    const response = await this.request.get(`${this.baseURL}/api/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/admin/roles`, {
+    const response = await this.request.post(`${this.baseURL}/api/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/admin/roles/${roleId}`, {
+    const response = await this.request.delete(`${this.baseURL}/api/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/admin/menus`, {
+    const response = await this.request.get(`${this.baseURL}/api/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/admin/users`, {
+    const response = await request.post(`${this.apiBaseUrl}/api/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/admin/roles`, {
+    const response = await request.post(`${this.apiBaseUrl}/api/roles`, {
       data: roleData,
     });
     
@@ -100,7 +100,7 @@ export class TestDataManager {
       return;
     }
     
-    const response = await request.delete(`${this.apiBaseUrl}/api/admin/users/${userData.id}`);
+    const response = await request.delete(`${this.apiBaseUrl}/api/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/admin/roles/${roleData.id}`);
+    const response = await request.delete(`${this.apiBaseUrl}/api/roles/${roleData.id}`);
     if (!response.ok()) {
       console.warn(`Failed to delete test role ${roleKey}: ${await response.text()}`);
     }

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

@@ -1,48 +0,0 @@
-# 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

@@ -1,242 +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 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

@@ -1,46 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,69 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,97 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,98 +0,0 @@
-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

@@ -1,10 +0,0 @@
-# 二维码配置
-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/resources/application-test.yml

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

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

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

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

@@ -0,0 +1,88 @@
+<?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

@@ -0,0 +1,53 @@
+
+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.entity.GroupCourseEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@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());
+    }
+}

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

@@ -0,0 +1,23 @@
+
+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

@@ -0,0 +1,142 @@
+
+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/entity/GroupCourseEntity.java

@@ -0,0 +1,144 @@
+
+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/handler/GroupCourseHandler.java

@@ -0,0 +1,128 @@
+
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.service.RedisService;
+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 RedisService redisService;
+    private final ObjectMapper objectMapper;
+    
+    public GroupCourseHandler(IGroupCourseService groupCourseService, 
+                              Validator validator,
+                              RedisService redisService,
+                              ObjectMapper objectMapper){
+        this.groupCourseService = groupCourseService;
+        this.validator = validator;
+        this.redisService = redisService;
+        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);
+                    }
+                    
+                    Object cachedValue = redisService.get(key);
+                    
+                    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 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/IGroupCourseRepository.java

@@ -0,0 +1,20 @@
+
+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/GroupCourseRepository.java

@@ -0,0 +1,131 @@
+
+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/IGroupCourseService.java

@@ -0,0 +1,16 @@
+
+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

@@ -0,0 +1,76 @@
+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/GroupCourseService.java

@@ -0,0 +1,138 @@
+
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.service.RedisService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.List;
+
+@Service
+public class GroupCourseService implements IGroupCourseService {
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class);
+    
+    private final IGroupCourseRepository groupCourseRepository;
+    private final RedisService redisService;
+    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, 
+                              RedisService redisService,
+                              ObjectMapper objectMapper){
+        this.groupCourseRepository = groupCourseRepository;
+        this.redisService = redisService;
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public Mono<GroupCourse> findById(Long id) {
+        String cacheKey = CACHE_KEY_ID_PREFIX + id;
+        
+        Object cachedData = redisService.get(cacheKey);
+        if (cachedData != null) {
+            try {
+                String json;
+                if (cachedData instanceof String) {
+                    json = (String) cachedData;
+                } else {
+                    json = objectMapper.writeValueAsString(cachedData);
+                }
+                
+                GroupCourse groupCourse = objectMapper.readValue(json, GroupCourse.class);
+                logger.info("缓存命中 - findById: id={}", id);
+                return Mono.just(groupCourse);
+            } catch (JsonProcessingException e) {
+                logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage());
+                redisService.delete(cacheKey);
+            }
+        }
+        
+        logger.debug("缓存未命中，查询数据库 - findById: id={}", id);
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
+                .doOnSuccess(groupCourse -> {
+                    if (groupCourse != null) {
+                        try {
+                            String jsonData = objectMapper.writeValueAsString(groupCourse);
+                            redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS);
+                            logger.debug("缓存已设置 - findById: id={}", id);
+                        } catch (JsonProcessingException e) {
+                            logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage());
+                        }
+                    }
+                });
+    }
+
+    @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 cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted;
+
+        Object cachedData = redisService.get(cacheKey);
+        if (cachedData != null) {
+            try {
+                String json;
+                if (cachedData instanceof String) {
+                    json = (String) cachedData;
+                } else {
+                    json = objectMapper.writeValueAsString(cachedData);
+                }
+                
+                PageResponse<GroupCourse> pageResponse = objectMapper.readValue(json, 
+                    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());
+                redisService.delete(cacheKey);
+            }
+        }
+        
+        logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey);
+        Mono<PageResponse<GroupCourse>> resultMono;
+        if (includeDeleted) {
+            resultMono = groupCourseRepository.findByPage(pageRequest);
+        } else {
+            resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest);
+        }
+        
+        return resultMono.doOnSuccess(pageResponse -> {
+            try {
+                String jsonData = objectMapper.writeValueAsString(pageResponse);
+                redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS);
+                logger.debug("缓存已设置 - findByPage: key={}", cacheKey);
+            } catch (JsonProcessingException e) {
+                logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage());
+            }
+        });
+    }
+}

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

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

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

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

gym-manage-api/gym-member/.gitignore

@@ -1,47 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Maven ###
-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
-
-### System Files ###
-.DS_Store
-Thumbs.db

gym-manage-api/gym-member/CARD_MERGE_REPORT.md

@@ -1,199 +0,0 @@
-# gym-member-card 模块合并到 gym-member 完成报告
-
-## 合并概述
-将 `gym-member-card` 模块的功能合并到 `gym-member` 模块的 `card` 子包中，保持功能不变，代码风格以 `gym-member` 为基准。
-
-## 已完成的工作
-
-### 1. 目录结构创建 ✅
-在 `gym-member/src/main/java/cn/novalon/gym/manage/member/card` 下创建了以下子目录：
-- `entity/` - 实体类
-- `dto/` - 数据传输对象
-- `vo/` - 视图对象
-- `repository/` - 数据访问层
-- `service/` - 服务接口
-- `service/impl/` - 服务实现
-- `handler/` - 业务处理器
-- `enums/` - 枚举类
-- `util/` - 工具类
-
-### 2. 实体类重构（Entity）✅
-按照 gym-member 的风格（使用 Lombok），创建了以下实体类：
-
-| 原文件 | 新文件 | 说明 |
-|--------|--------|------|
-| MemberCardEntity.java + MemberCard.java | card/entity/MemberCard.java | 会员卡类型实体 |
-| MemberCardRecordEntity.java + MemberCardRecord.java | card/entity/MemberCardRecord.java | 会员持卡记录实体 |
-| MemberCardTransactionsEntity.java | card/entity/MemberCardTransaction.java | 交易流水实体 |
-| RefundApplicationEntity.java | card/entity/RefundApplication.java | 退款申请实体 |
-
-**主要改进：**
-- 使用 `@Data`, `@Builder`, `@NoArgsConstructor`, `@AllArgsConstructor` Lombok 注解
-- 继承 `cn.novalon.gym.manage.member.entity.BaseEntity`
-- 移除手动编写的 getter/setter
-- 添加规范的 JavaDoc 注释
-
-### 3. 枚举类创建 ✅
-创建了以下枚举类：
-
-| 原文件 | 新文件 | 说明 |
-|--------|--------|------|
-| MemberCardType.java | card/enums/MemberCardType.java | 会员卡类型 |
-| MemberCardRecordStatus.java | card/enums/MemberCardRecordStatus.java | 卡片状态 |
-| MemberCardTransactionsAction.java | card/enums/TransactionType.java | 交易操作类型 |
-| MemberCardTransactionsType.java | card/enums/BizType.java | 关联业务类型 |
-| MemberCardEvent.java | card/enums/CardEvent.java | 状态机事件 |
-
-### 4. Repository 层合并 ✅
-将原有的 DAO 接口整合为 Repository 接口，直接继承 `R2dbcRepository`：
-
-| 原文件 | 新文件 | 说明 |
-|--------|--------|------|
-| MemberCardDao.java | card/repository/MemberCardRepository.java | 会员卡类型 Repository |
-| MemberCardRecordDao.java | card/repository/MemberCardRecordRepository.java | 持卡记录 Repository |
-| MemberCardTransactionsDao.java | card/repository/MemberCardTransactionRepository.java | 交易流水 Repository |
-| RefundApplicationDao.java | card/repository/RefundApplicationRepository.java | 退款申请 Repository |
-
-**主要改进：**
-- 统一命名规范（移除 Dao，使用 Repository）
-- 继承 `R2dbcRepository<Entity, Long>`
-- 保留所有自定义查询方法
-- 更新参数类型为新的实体类
-
-### 5. 数据库 Schema 迁移 ✅
-将会员卡相关的表结构添加到 `gym-member/src/main/resources/db/schema.sql`：
-
-新增表：
-- `member_card` - 会员卡类型表
-- `member_card_record` - 会员持卡记录表
-- `member_card_transactions` - 交易流水表
-- `refund_application` - 退款申请表
-
-包含完整的索引和注释。
-
-### 6. pom.xml 依赖更新 ✅
-在 `gym-member/pom.xml` 中添加了 Redis 响应式支持：
-```xml
-<dependency>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
-</dependency>
-```
-
-## 待完成的工作
-
-### 需要手动复制的文件（约30个）
-
-以下文件需要从 `gym-member-card` 复制到 `gym-member/card`，并修改包名：
-
-#### Handler 层（8个文件）
-源路径：`gym-member-card/src/main/java/cn/novalon/gym/manage/gymmembercard/handler/`
-目标路径：`gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/`
-
-- DistributedLockService.java
-- ExpirationReminderService.java
-- MemberCardHandler.java
-- MemberCardRecordHandler.java
-- MemberCardScheduledHandler.java
-- MemberCardStateMachine.java
-- MemberCardTransactionHandler.java
-- RefundSagaHandler.java
-
-#### Service 接口层（4个文件）
-源路径：`gym-member-card/src/main/java/cn/novalon/gym/manage/gymmembercard/sevice/`
-目标路径：`gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/`
-
-注意：目录名从 `sevice`（拼写错误）改为 `service`
-
-- IMemberCardService.java
-- IMemberCardRecordService.java
-- IMemberCardTransactionsService.java
-- IRefundApplicationService.java
-
-#### Service 实现层（4个文件）
-源路径：`gym-member-card/src/main/java/cn/novalon/gym/manage/gymmembercard/sevice/impl/`
-目标路径：`gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/`
-
-- MemberCardServiceImpl.java
-- MemberCardRecordServiceImpl.java
-- MemberCardTransactionsServiceImpl.java
-- RefundApplicationServiceImpl.java
-
-#### Util 工具类（1个文件）
-源路径：`gym-member-card/src/main/java/cn/novalon/gym/manage/gymmembercard/util/`
-目标路径：`gym-member/src/main/java/cn/novalon/gym/manage/member/card/util/`
-
-- BeanConvertUtil.java
-
-### 批量替换规则
-
-复制每个文件后，需要进行以下文本替换：
-
-1. **包名替换：**
-   ```
-   package cn.novalon.gym.manage.gymmembercard -> package cn.novalon.gym.manage.member.card
-   ```
-
-2. **导入语句替换：**
-   ```
-   import cn.novalon.gym.manage.gymmembercard -> import cn.novalon.gym.manage.member.card
-   ```
-
-3. **BaseEntity 导入替换：**
-   ```
-   import cn.novalon.gym.manage.db.entity.BaseEntity -> import cn.novalon.gym.manage.member.entity.BaseEntity
-   ```
-
-4. **BaseDomain 处理（如果存在）：**
-   ```
-   import cn.novalon.gym.manage.sys.core.domain.BaseDomain -> （注释掉或删除）
-   ```
-
-5. **Repository 引用更新（如果需要）：**
-   ```
-   IMemberCardRepository -> MemberCardRepository
-   IMemberCardRecordRepository -> MemberCardRecordRepository
-   IMemberCardTransactionsRepository -> MemberCardTransactionRepository
-   IRefundApplicationRepository -> RefundApplicationRepository
-   ```
-
-## 验证步骤
-
-完成文件复制后，执行以下验证：
-
-1. **编译验证：**
-   ```bash
-   cd gym-manage-api/gym-member
-   mvn clean compile
-   ```
-
-2. **检查是否有编译错误：**
-   - 修复任何缺失的导入
-   - 确认所有依赖类都已正确迁移
-   - 检查枚举引用是否正确
-
-3. **运行测试（如果有）：**
-   ```bash
-   mvn test
-   ```
-
-## 注意事项
-
-1. **包名一致性：** 确保所有文件中的包声明和导入语句都正确更新
-2. **依赖注入：** Spring 的 `@Autowired` 或构造函数注入应自动工作，因为使用了相同的注解
-3. **数据库兼容性：** schema.sql 已追加新表，不会影响现有表
-4. **Redis 配置：** 确保 application.yml 中有 Redis 配置（如果需要分布式锁功能）
-5. **定时任务：** MemberCardScheduledHandler 和 ExpirationReminderService 可能需要启用 `@EnableScheduling`
-
-## 自动化脚本
-
-项目根目录下提供了两个辅助脚本：
-- `gym-member-card/migrate_to_member.py` - Python 迁移脚本
-- `gym-member-card/migrate-to-member.ps1` - PowerShell 迁移脚本
-
-可以运行这些脚本来自动完成文件复制和包名替换。
-
----
-
-**生成时间：** 2026-05-27
-**合并状态：** 基础架构完成，待复制业务逻辑文件

gym-manage-api/gym-member/MEMBER_USER_TABLE_SIMPLE.sql

@@ -1,58 +0,0 @@
--- ============================================
--- member_user 表 - 简洁版建表语句
--- ============================================
--- 用途：直接复制执行，快速创建会员表
--- ============================================
-
-CREATE TABLE IF NOT EXISTS member_user (
-    -- 主键和基础字段
-    id BIGSERIAL PRIMARY KEY,
-    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),
-    gender INTEGER DEFAULT 0,
-    birthday TIMESTAMP,
-    address VARCHAR(500),
-    avatar VARCHAR(500),
-    subscribed BOOLEAN DEFAULT FALSE,
-    last_login_at TIMESTAMP,
-    
-    -- 微信相关字段
-    union_id VARCHAR(100),
-    miniapp_open_id VARCHAR(100),
-    official_open_id VARCHAR(100),
-    
-    -- 软删除字段
-    is_deleted BOOLEAN DEFAULT FALSE
-);
-
--- 创建索引
-CREATE UNIQUE INDEX IF NOT EXISTS idx_member_user_member_no ON member_user(member_no);
-CREATE INDEX IF NOT EXISTS idx_member_user_union_id ON member_user(union_id);
-CREATE INDEX IF NOT EXISTS idx_member_user_miniapp_openid ON member_user(miniapp_open_id);
-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);
-
--- 添加注释
-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 '会员编号（唯一）';
-COMMENT ON COLUMN member_user.nickname IS '昵称';
-COMMENT ON COLUMN member_user.phone IS '手机号（AES加密存储）';
-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 '是否关注服务号';
-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 '是否删除（软删除标记）';

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

@@ -1,250 +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 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-member</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Gym Member</name>
-    <description>Member Management Module - Frontend User Services</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-db</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-sys</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>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>
-        <!-- 微信SDK依赖 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-            <version>4.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-            <version>4.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.25</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
-        <!-- Redis响应式支持（会员卡模块需要） -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <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-member/src/main/java/cn/novalon/gym/manage/member/config/HttpClientConfig.java

@@ -1,22 +0,0 @@
-package cn.novalon.gym.manage.member.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.reactive.function.client.WebClient;
-
-/**
- * HTTP 客户端配置
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Configuration
-public class HttpClientConfig {
-
-    // WebClient Bean，用于调用微信 API
-    @Bean
-    public WebClient webClient() {
-        return WebClient.builder().build();
-    }
-}

gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/config/WechatProperties.java

@@ -1,63 +0,0 @@
-package cn.novalon.gym.manage.member.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 微信配置
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "wechat")
-public class WechatProperties {
-
-    // 小程序配置
-    private MiniApp miniapp = new MiniApp();
-
-    // 服务号配置
-    private Mp mp = new Mp();
-
-    // 手机号加密配置
-    private PhoneEncryption phoneEncryption = new PhoneEncryption();
-
-    @Data
-    public static class MiniApp {
-        // 小程序 AppID
-        private String appId;
-
-        // 小程序 AppSecret
-        private String appSecret;
-    }
-
-    @Data
-    public static class Mp {
-        // 服务号 AppID
-        private String appId;
-
-        // 服务号 AppSecret
-        private String appSecret;
-
-        // Token 验证信息
-        private String token;
-
-        // EncodingAESKey
-        private String aesKey;
-
-        // 回调地址（微信服务号事件推送 URL）
-        private String callbackUrl;
-    }
-
-    @Data
-    public static class PhoneEncryption {
-        // 手机号加密密钥
-        private String secretKey;
-
-        // 初始化向量 IV
-        private String iv;
-    }
-}

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

@@ -1,17 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-/**
- * 更新手机号Dto
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-public class AdminUpdatePhoneDto {
-    
-    // 手机号
-    private String phone;
-}

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

@@ -1,61 +0,0 @@
-package cn.novalon.gym.manage.member.dto
-;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-/**
- * 创建会员卡类型请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class CreateMemberCardRequest {
-
-    /**
-     * 会员卡名称
-     */
-    @NotBlank(message = "会员卡名称不能为空")
-    private String memberCardName;
-
-    /**
-     * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡
-     */
-    @NotBlank(message = "会员卡类型不能为空")
-    private String memberCardType;
-
-    /**
-     * 会员卡价格
-     */
-    @NotNull(message = "会员卡价格不能为空")
-    private BigDecimal memberCardPrice;
-
-    /**
-     * 有效天数（时长卡用）
-     */
-    private Integer memberCardValidityDays;
-
-    /**
-     * 总次数（次卡用）
-     */
-    private Integer memberCardTotalTimes;
-
-    /**
-     * 面额（储值卡用）
-     */
-    private BigDecimal memberCardAmount;
-
-    /**
-     * 状态：0-下架, 1-上架
-     */
-    private Integer memberCardStatus = 1;
-
-    /**
-     * 扩展配置（JSON格式）
-     */
-    private String extraConfig;
-}

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

@@ -1,32 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * 购买会员卡请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class PurchaseCardRequest {
-
-    /**
-     * 会员ID
-     */
-    @NotNull(message = "会员ID不能为空")
-    private Long memberId;
-
-    /**
-     * 会员卡类型ID
-     */
-    @NotNull(message = "会员卡类型ID不能为空")
-    private Long memberCardId;
-
-    /**
-     * 来源订单ID
-     */
-    private Long sourceOrderId;
-}

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

@@ -1,21 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotBlank;
-
-/**
- * 退款申请请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class RefundCardRequest {
-
-    /**
-     * 退款原因
-     */
-    @NotBlank(message = "退款原因不能为空")
-    private String reason;
-}

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

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * 续费会员卡请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class RenewCardRequest {
-
-    /**
-     * 增加的次数
-     */
-    private Integer addTimes;
-
-    /**
-     * 增加的金额
-     */
-    private Double addAmount;
-
-    /**
-     * 增加的天数
-     */
-    private Integer addDays;
-
-    /**
-     * 来源订单ID
-     */
-    private Long sourceOrderId;
-}

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

@@ -1,20 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SearchMemberDto {
-
-    // 搜索字段 - 包括 会员号、昵称、手机号
-    private String searchValue;
-
-    // 页码
-    private Integer pageNum = 1;
-
-    // 页大小
-    private Integer pageSize = 10;
-}

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

@@ -1,60 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-/**
- * 更新会员卡类型请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class UpdateMemberCardRequest {
-
-    /**
-     * 会员卡名称
-     */
-    @NotBlank(message = "会员卡名称不能为空")
-    private String memberCardName;
-
-    /**
-     * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡
-     */
-    @NotBlank(message = "会员卡类型不能为空")
-    private String memberCardType;
-
-    /**
-     * 会员卡价格
-     */
-    @NotNull(message = "会员卡价格不能为空")
-    private BigDecimal memberCardPrice;
-
-    /**
-     * 有效天数（时长卡用）
-     */
-    private Integer memberCardValidityDays;
-
-    /**
-     * 总次数（次卡用）
-     */
-    private Integer memberCardTotalTimes;
-
-    /**
-     * 面额（储值卡用）
-     */
-    private BigDecimal memberCardAmount;
-
-    /**
-     * 状态：0-下架, 1-上架
-     */
-    private Integer memberCardStatus;
-
-    /**
-     * 扩展配置（JSON格式）
-     */
-    private String extraConfig;
-}

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

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

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

@@ -1,23 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-/**
- * 使用会员卡请求 DTO
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-public class UseCardRequest {
-
-    /**
-     * 扣减的次数
-     */
-    private Integer deductTimes;
-
-    /**
-     * 扣减的金额
-     */
-    private Double deductAmount;
-}

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

@@ -1,29 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import jakarta.validation.constraints.NotBlank;
-
-/**
- * 微信小程序登录 DTO
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class WechatLoginDto {
-
-    // 微信小程序登录 code
-    @NotBlank(message = "登录code不能为空")
-    private String code;
-
-    // 手机号code
-    private String phoneCode;
-}

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

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.member.dto;
-
-import lombok.Data;
-
-/**
- * 微信服务号事件 DTO
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-public class WechatOfficialEventDto {
-
-    // 微信号
-    private String toUserName;
-
-    // 发送方帐号（一个 OpenID）
-    private String fromUserName;
-
-    // 消息创建时间（整型）
-    private Long createTime;
-
-    // 消息类型，event
-    private String msgType;
-
-    // 事件类型：subscribe（关注）/ unsubscribe（取消关注）
-    private String event;
-
-    // 事件 KEY
-    private String eventKey;
-
-    // 二维码 ticket（获取二维码图片）
-    private String ticket;
-}

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

@@ -1,44 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.domain.Persistable;
-import org.springframework.data.relational.core.mapping.Column;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员模块实体基类
- * 
- * @author 付嘉
- * @date 2026-05-08
- */
-@Data
-public abstract class BaseEntity implements Persistable<Long> {
-
-    // ID
-    @Id
-    private Long id;
-
-    // 创建时间
-    @CreatedDate
-    @Column("created_at")
-    private LocalDateTime createdAt;
-
-    // 更新时间
-    @LastModifiedDate
-    @Column("updated_at")
-    private LocalDateTime updatedAt;
-
-    @Column("deleted_at")
-    private LocalDateTime deletedAt;
-
-    // 判断当前实体是否是新建的
-    @Override
-    public boolean isNew() {
-        return createdAt == null;
-    }
-}

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

@@ -1,78 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.*;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 会员实体类 - 对应 member_user 表 
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("member_user")
-public class Member extends BaseEntity {
-
-    //会员号
-    @Column("member_no")
-    private String memberNo;
-
-    //昵称
-    @Column("nickname")
-    private String nickname;
-
-    //手机号（AES 加密存储
-    @Column("phone")
-    private String phone;
-
-    //性别
-    @Column("gender")
-    private Integer gender;
-
-    //生日
-    @Column("birthday")
-    private LocalDate birthday;
-
-    //地址
-    @Column("address")
-    private String address;
-
-    //是否关注服务号
-    @Column("subscribed")
-    private Boolean subscribed;
-
-    // 最后登录时间
-    @Column("last_login_at")
-    private LocalDateTime lastLoginAt;
-
-    // 头像
-    @Column("avatar")
-    private String avatar;
-
-    // 微信UnionID
-    @Column("union_id")
-    private String unionId;
-
-    // 微信OpenID小程序
-    @Column("miniapp_open_id")
-    private String miniappOpenId;
-
-    // 服务号openid
-    @Column("official_open_id")
-    private String officialOpenId;
-
-    // 软删除
-    @Column("is_deleted")
-    private Boolean isDeleted;
-
-}

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

@@ -1,63 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡类型实体 - 对应 member_card 表
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("member_card")
-public class MemberCard extends BaseEntity {
-
-    // 会员卡ID
-    @Column("member_card_id")
-    private Long memberCardId;
-
-    // 会员卡名称
-    @Column("member_card_name")
-    private String memberCardName;
-
-    // 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡
-    @Column("member_card_type")
-    private String memberCardType;
-
-    // 会员卡价格
-    @Column("member_card_price")
-    private Double memberCardPrice;
-
-    // 有效天数（时长卡用）
-    @Column("member_card_validity_days")
-    private Integer memberCardValidityDays;
-
-    // 总次数（次卡用）
-    @Column("member_card_total_times")
-    private Integer memberCardTotalTimes;
-
-    // 面额（储值卡用）
-    @Column("member_card_amount")
-    private Double memberCardAmount;
-
-    // 状态：0-下架, 1-上架
-    @Column("member_card_status")
-    private Integer memberCardStatus;
-
-    // 扩展配置（JSON格式）
-    @Column("extra_config")
-    private String extraConfig;
-
-}

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

@@ -1,72 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡记录实体（会员持有的卡）- 对应 member_card_record 表
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("member_card_record")
-public class MemberCardRecord extends BaseEntity {
-
-    // 会员持有卡ID
-    @Column("member_card_record_id")
-    private Long memberCardRecordId;
-
-    // 会员ID
-    @Column("member_id")
-    private Long memberId;
-
-    // 关联会员卡ID
-    @Column("member_card_id")
-    private Long memberCardId;
-
-    // 状态：ACTIVE-有效, USED_UP-用完, EXPIRED-过期, REFUNDED-已退款
-    @Column("status")
-    private MemberCardRecordStatus status;
-
-    // 剩余次数
-    @Column("remaining_times")
-    private Integer remainingTimes;
-
-    // 剩余金额
-    @Column("remaining_amount")
-    private Double remainingAmount;
-
-    // 到期时间
-    @Column("expire_time")
-    private LocalDateTime expireTime;
-
-    // 来源订单ID
-    @Column("source_order_id")
-    private Long sourceOrderId;
-
-    // 购买时间
-    @Column("purchase_time")
-    private LocalDateTime purchaseTime;
-
-    // 乐观锁版本号
-    @Column("version")
-    private Integer version;
-
-    // 卡片组成（JSON格式，用于组合卡）
-    @Column("card_composition")
-    private String cardComposition;
-
-}

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

@@ -1,77 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-/**
- * 会员卡交易流水实体 - 对应 member_card_transactions 表
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("member_card_transactions")
-public class MemberCardTransaction extends BaseEntity {
-
-    // 交易ID
-    @Column("member_card_record_id")
-    private Long memberCardRecordId;
-
-    // 会员ID
-    @Column("member_id")
-    private Long memberId;
-
-    // 会员卡ID
-    @Column("member_card_id")
-    private Long memberCardId;
-
-    // 操作类型：PURCHASE-购买, DEDUCT-扣次/扣费, RENEW-续费, REFUND-退款, EXPIRE-过期
-    @Column("operation_type")
-    private String operationType;
-
-    // 变动次数
-    @Column("change_amount")
-    private Integer changeAmount;
-
-    // 变动金额
-    @Column("change_balance")
-    private Double changeBalance;
-
-    // 变动后剩余次数
-    @Column("after_remaining_count")
-    private Integer afterRemainingCount;
-
-    // 变动后剩余金额
-    @Column("after_remaining_balance")
-    private Double afterRemainingBalance;
-
-    // 关联业务类型：GROUP_CLASS-团课, PT_CLASS-私教, CHECK_IN-签到
-    @Column("related_biz_type")
-    private String relatedBizType;
-
-    // 来源订单ID
-    @Column("source_order_id")
-    private Long sourceOrderId;
-
-    // 备注
-    @Column("remark")
-    private String remark;
-
-    // 是否已归档
-    @Column("is_archived")
-    private Boolean isArchived;
-
-    // 归档时间
-    @Column("archived_at")
-    private java.time.LocalDateTime archivedAt;
-
-}

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

@@ -1,65 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import cn.novalon.gym.manage.member.enums.RefundStatus;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 退款申请实体 - 对应 refund_application 表
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("refund_application")
-public class RefundApplication extends BaseEntity {
-
-    // 会员卡记录ID
-    @Column("record_id")
-    private Long recordId;
-
-    // 会员ID
-    @Column("member_id")
-    private Long memberId;
-
-    // 状态：PENDING-待审核, APPROVED-已批准, REJECTED-已拒绝, PROCESSING-处理中, SUCCESS-成功, FAILED-失败
-    @Column("status")
-    private RefundStatus status;
-
-    // 退款原因
-    @Column("reason")
-    private String reason;
-
-    // 申请时间
-    @Column("apply_time")
-    private LocalDateTime applyTime;
-
-    // 审核时间
-    @Column("audit_time")
-    private LocalDateTime auditTime;
-
-    // 审核人ID
-    @Column("auditor_id")
-    private Long auditorId;
-
-    // 审核备注
-    @Column("audit_remark")
-    private String auditRemark;
-
-    // 退款金额
-    @Column("refund_amount")
-    private BigDecimal refundAmount;
-
-}

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

@@ -1,55 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.time.LocalDateTime;
-
-/**
- * 微信用户信息
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Table("wechat_user")
-public class WechatUser extends BaseEntity {
-
-    // 会员 ID
-    @Column("member_id")
-    private Long memberId;
-
-    // 微信 UnionID
-    @Column("union_id")
-    private String unionId;
-
-    // 小程序 OpenID
-    @Column("miniapp_openid")
-    private String miniappOpenid;
-
-    // 服务号 OpenID
-    @Column("mp_openid")
-    private String mpOpenid;
-
-    // 是否关注服务号
-    @Column("is_subscribed")
-    private Boolean isSubscribed;
-
-    // 首次关注时间公众号的时间
-    @Column("subscribe_time")
-    private LocalDateTime subscribeTime;
-
-    // 最后一次取消关注的时间
-    @Column("unsubscribe_time")
-    private LocalDateTime unsubscribeTime;
-}

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

@@ -1,24 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 会员卡流水关联业务类型枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum BizType {
-    
-    GROUP_CLASS("团课"),
-    PT_CLASS("私教"),
-    CHECK_IN("签到");
-
-    private final String desc;
-
-    BizType(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

@@ -1,27 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 会员卡状态机事件枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum CardEvent {
-    
-    ACTIVATE("激活卡片"),
-    USE("使用卡片"),
-    RENEW("续费"),
-    EXPIRE("过期"),
-    REFUND("退款"),
-    DISABLE("禁用");
-
-    private final String desc;
-
-    CardEvent(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

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

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

@@ -1,25 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 会员卡记录状态枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum MemberCardRecordStatus {
-    
-    ACTIVE("有效"),
-    USED_UP("用完"),
-    EXPIRED("过期"),
-    REFUNDED("已退款");
-
-    private final String desc;
-
-    MemberCardRecordStatus(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

@@ -1,24 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 会员卡类型枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum MemberCardType {
-    
-    TIME_CARD("时长卡"),
-    COUNT_CARD("次卡"),
-    STORED_VALUE_CARD("储值卡");
-
-    private final String desc;
-
-    MemberCardType(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

@@ -1,27 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 退款申请状态枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum RefundStatus {
-    
-    PENDING("待审核"),
-    APPROVED("已批准"),
-    REJECTED("已拒绝"),
-    PROCESSING("处理中"),
-    SUCCESS("成功"),
-    FAILED("失败");
-
-    private final String desc;
-
-    RefundStatus(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

@@ -1,26 +0,0 @@
-package cn.novalon.gym.manage.member.enums;
-
-/**
- * 会员卡流水操作类型枚举
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public enum TransactionType {
-    
-    PURCHASE("购买"),
-    DEDUCT("扣次/扣费"),
-    RENEW("续费"),
-    REFUND("退款"),
-    EXPIRE("过期");
-
-    private final String desc;
-
-    TransactionType(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

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

@@ -1,41 +0,0 @@
-package cn.novalon.gym.manage.member.es.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-import java.time.LocalDateTime;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Document(indexName = "gym_members")
-public class MemberES {
-
-    @Id
-    private String id;
-
-    // 会员号 - 需要搜索（精确匹配）
-    @Field(type = FieldType.Keyword)
-    private String memberNo;
-
-    // 昵称 - 需要搜索（模糊搜索）
-    @Field(type = FieldType.Text)
-    private String nickname;
-
-    // 手机号 - 需要搜索（精确匹配）
-    @Field(type = FieldType.Keyword)
-    private String phone;
-
-    // 性别 - 用于筛选
-    @Field(type = FieldType.Integer)
-    private Integer gender;
-
-    // 头像 - 列表展示
-    @Field(type = FieldType.Keyword)
-    private String avatar;
-}

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

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

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

@@ -1,50 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 分布式锁服务（简化版，使用本地锁）
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Component
-public class DistributedLockService {
-
-    private final ConcurrentHashMap<String, ReentrantLock> locks = new ConcurrentHashMap<>();
-
-    /**
-     * 执行带锁的操作（业务操作）
-     */
-    public <T> Mono<T> executeWithLock(String userId, String cardType, Mono<T> operation) {
-        String lockKey = "lock:member:card:operation:" + userId + ":" + cardType;
-        ReentrantLock lock = locks.computeIfAbsent(lockKey, k -> new ReentrantLock());
-
-        lock.lock();
-        try {
-            return operation.doFinally(signalType -> lock.unlock());
-        } catch (Exception e) {
-            lock.unlock();
-            return Mono.error(e);
-        }
-    }
-
-    /**
-     * 执行带锁的操作（通用/定时任务）
-     */
-    public <T> Mono<T> executeWithLock(String lockKey, Mono<T> operation) {
-        ReentrantLock lock = locks.computeIfAbsent(lockKey, k -> new ReentrantLock());
-
-        lock.lock();
-        try {
-            return operation.doFinally(signalType -> lock.unlock());
-        } catch (Exception e) {
-            lock.unlock();
-            return Mono.error(e);
-        }
-    }
-}

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

@@ -1,157 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Range;
-import org.springframework.data.redis.connection.RedisZSetCommands;
-import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.UUID;
-
-/**
- * 会员卡到期提醒服务
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class ExpirationReminderService {
-
-    private final ReactiveStringRedisTemplate redisTemplate;
-    private final ObjectMapper objectMapper;
-
-    private static final String REMINDER_QUEUE = "queue:member_card_expiration";
-    private static final String DEAD_LETTER_QUEUE = "queue:member_card_expiration_dead_letter";
-    private static final int REMINDER_DAYS_BEFORE = 7;
-    private static final long MAX_DELAY_MILLIS = Duration.ofDays(365).toMillis();
-
-    /**
-     * 设置到期提醒（购卡/续费时调用）
-     */
-    public Mono<Void> scheduleExpirationReminder(MemberCardRecord record) {
-        if (record.getExpireTime() == null) {
-            return Mono.empty();
-        }
-
-        LocalDateTime now = LocalDateTime.now();
-
-        Flux<Void> reminderFlux = Flux.range(1, REMINDER_DAYS_BEFORE)
-            .flatMap(daysBefore -> {
-                LocalDateTime reminderTime = record.getExpireTime().minusDays(daysBefore);
-
-                if (reminderTime.isBefore(now)) {
-                    log.debug("会员卡记录ID={} 的{}天前提醒时间已过，跳过",
-                        record.getMemberCardRecordId(), daysBefore);
-                    return Mono.empty();
-                }
-
-                long delayMillis = Duration.between(now, reminderTime).toMillis();
-
-                if (delayMillis > MAX_DELAY_MILLIS) {
-                    log.warn("会员卡记录ID={} 的{}天后提醒时间超过1年，跳过",
-                        record.getMemberCardRecordId(), daysBefore);
-                    return Mono.empty();
-                }
-
-                try {
-                    String messageId = UUID.randomUUID().toString();
-                    String message = objectMapper.writeValueAsString(new ExpirationMessage(
-                            messageId,
-                            record.getMemberCardRecordId(),
-                            record.getMemberId(),
-                            record.getExpireTime(),
-                            daysBefore
-                    ));
-
-                    double executeTime = System.currentTimeMillis() + delayMillis;
-
-                    return redisTemplate.opsForZSet()
-                            .add(REMINDER_QUEUE, message, executeTime)
-                            .doOnSuccess(v -> log.info("设置会员卡到期提醒: recordId={}, daysBefore={}, expireTime={}, executeTime={}",
-                                    record.getMemberCardRecordId(), daysBefore, record.getExpireTime(), executeTime))
-                            .then();
-                } catch (Exception e) {
-                    log.error("设置会员卡到期提醒失败: recordId={}, daysBefore={}",
-                        record.getMemberCardRecordId(), daysBefore, e);
-                    return Mono.error(e);
-                }
-            });
-
-        return reminderFlux.then();
-    }
-
-    /**
-     * 定时任务：每分钟扫描到期的提醒并发送
-     */
-    @Scheduled(fixedRate = 60000)
-    public void processDueReminders() {
-        double now = System.currentTimeMillis();
-
-        redisTemplate.opsForZSet()
-                .rangeByScoreWithScores(
-                        REMINDER_QUEUE,
-                        Range.from(Range.Bound.inclusive(0.0))
-                                .to(Range.Bound.inclusive(now)),
-                        RedisZSetCommands.Limit.limit().count(100)
-                )
-                .flatMap(tuple -> {
-                    String message = tuple.getValue();
-                    if (message == null) {
-                        return Mono.empty();
-                    }
-
-                    return Mono.fromCallable(() -> objectMapper.readValue(message, ExpirationMessage.class))
-                        .flatMap(expirationMessage -> {
-                            log.info("处理到期提醒: messageId={}, memberId={}, expireTime={}, daysBefore={}",
-                                    expirationMessage.messageId(),
-                                    expirationMessage.memberId(),
-                                    expirationMessage.expireTime(),
-                                    expirationMessage.daysBefore());
-
-                            // TODO: 集成微信/短信通知服务
-                            sendNotification(expirationMessage);
-
-                            return redisTemplate.opsForZSet()
-                                .remove(REMINDER_QUEUE, message)
-                                .doOnSuccess(removed -> {
-                                    if (removed > 0) {
-                                        log.info("成功删除已处理的提醒消息");
-                                    }
-                                });
-                        })
-                        .onErrorResume(e -> {
-                            log.error("解析到期提醒消息失败，移至死信队列: message={}", message, e);
-                            return redisTemplate.opsForZSet()
-                                .add(DEAD_LETTER_QUEUE, message, System.currentTimeMillis())
-                                .then(Mono.empty());
-                        });
-                })
-                .then()
-                .subscribe();
-    }
-
-
-    private void sendNotification(ExpirationMessage reminder) {
-        // TODO: 实际项目中调用微信模板消息或短信API
-        log.info("[模拟发送] 会员卡到期提醒 - 会员ID: {}, 到期时间: {}, 提前天数: {}",
-            reminder.memberId(), reminder.expireTime(), reminder.daysBefore());
-    }
-
-    public record ExpirationMessage(
-            String messageId,
-            Long recordId,
-            Long memberId,
-            LocalDateTime expireTime,
-            int daysBefore
-    ) {}
-}

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

@@ -1,132 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.entity.MemberCard;
-import cn.novalon.gym.manage.member.service.IMemberCardService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-/**
- * 会员卡管理处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Component
-@Tag(name = "会员卡管理", description = "会员卡类型管理和会员持卡管理")
-public class MemberCardHandler {
-
-    private final IMemberCardService memberCardService;
-
-    public MemberCardHandler(IMemberCardService memberCardService) {
-        this.memberCardService = memberCardService;
-    }
-
-    @Operation(summary = "根据ID查询会员卡类型", description = "查询指定ID的会员卡类型详情")
-    public Mono<ServerResponse> getMemberCardById(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return memberCardService.findByMemberCardIdAndDeletedAtIsNull(id)
-                .flatMap(card -> ServerResponse.ok().bodyValue(card))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    @Operation(summary = "查询会员卡类型列表", description = "支持分页和条件查询")
-    public Mono<ServerResponse> listMemberCards(ServerRequest request) {
-        Integer status = request.queryParam("status").map(Integer::valueOf).orElse(null);
-        String name = request.queryParam("name").orElse(null);
-        String type = request.queryParam("type").orElse(null);
-        Double minPrice = request.queryParam("minPrice").map(Double::valueOf).orElse(null);
-        Double maxPrice = request.queryParam("maxPrice").map(Double::valueOf).orElse(null);
-        int page = request.queryParam("page").map(Integer::valueOf).orElse(0);
-        int size = request.queryParam("size").map(Integer::valueOf).orElse(10);
-
-        var pageable = PageRequest.of(page, size);
-        return ServerResponse.ok()
-                .body(memberCardService.findWithConditions(status, name, type, minPrice, maxPrice, pageable),
-                        MemberCard.class);
-    }
-
-    @Operation(summary = "创建会员卡类型", description = "创建新的会员卡类型（时长卡、次卡或储值卡）")
-    public Mono<ServerResponse> createMemberCard(ServerRequest request) {
-        return request.bodyToMono(MemberCard.class)
-                .flatMap(memberCardService::save)
-                .flatMap(card -> ServerResponse.status(HttpStatus.CREATED).bodyValue(card));
-    }
-
-    @Operation(summary = "更新会员卡类型", description = "更新会员卡类型信息")
-    public Mono<ServerResponse> updateMemberCard(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(MemberCard.class)
-                .flatMap(card -> {
-                    card.setMemberCardId(id);
-                    return memberCardService.save(card);
-                })
-                .flatMap(updated -> ServerResponse.ok().bodyValue(updated))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    @Operation(summary = "删除会员卡类型", description = "逻辑删除会员卡类型")
-    public Mono<ServerResponse> deleteMemberCard(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        return memberCardService.logicalDelete(id)
-                .flatMap(rows -> {
-                    if (rows > 0) {
-                        return ServerResponse.noContent().build();
-                    }
-                    return ServerResponse.notFound().build();
-                });
-    }
-
-    @Operation(summary = "购买会员卡", description = "会员购买会员卡，生成会员卡记录")
-    public Mono<ServerResponse> purchaseCard(ServerRequest request) {
-        Long memberId = Long.valueOf(request.queryParam("memberId").orElseThrow());
-        Long memberCardId = Long.valueOf(request.queryParam("memberCardId").orElseThrow());
-        Long sourceOrderId = request.queryParam("sourceOrderId").map(Long::valueOf).orElse(null);
-
-        return memberCardService.purchaseCard(memberId, memberCardId, sourceOrderId)
-                .flatMap(record -> ServerResponse.status(HttpStatus.CREATED).bodyValue(record));
-    }
-
-    @Operation(summary = "续费会员卡", description = "为已有会员卡续费")
-    public Mono<ServerResponse> renewCard(ServerRequest request) {
-        Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        Integer addTimes = request.queryParam("addTimes").map(Integer::valueOf).orElse(null);
-        Double addAmount = request.queryParam("addAmount").map(Double::valueOf).orElse(null);
-        Integer addDays = request.queryParam("addDays").map(Integer::valueOf).orElse(null);
-        Long sourceOrderId = request.queryParam("sourceOrderId").map(Long::valueOf).orElse(null);
-
-        return memberCardService.renewCard(recordId, addTimes, addAmount, addDays, sourceOrderId)
-                .flatMap(record -> ServerResponse.ok().bodyValue(record));
-    }
-
-    @Operation(summary = "使用会员卡", description = "扣减会员卡次数或余额")
-    public Mono<ServerResponse> useCard(ServerRequest request) {
-        Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        Integer deductTimes = request.queryParam("deductTimes").map(Integer::valueOf).orElse(null);
-        Double deductAmount = request.queryParam("deductAmount").map(Double::valueOf).orElse(null);
-
-        return memberCardService.useCard(recordId, deductTimes, deductAmount)
-                .flatMap(record -> ServerResponse.ok().bodyValue(record));
-    }
-
-    @Operation(summary = "退款会员卡", description = "申请会员卡退款")
-    public Mono<ServerResponse> refundCard(ServerRequest request) {
-        Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        return memberCardService.refundCard(recordId)
-                .then(ServerResponse.noContent().build());
-    }
-
-    @Operation(summary = "查询有效会员卡", description = "查询指定状态的会员卡类型")
-    public Mono<ServerResponse> getActiveCards(ServerRequest request) {
-        Integer status = request.queryParam("status").map(Integer::valueOf).orElse(1);
-        return ServerResponse.ok()
-                .body(memberCardService.findActiveCards(status), MemberCard.class);
-    }
-}

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

@@ -1,118 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
-import cn.novalon.gym.manage.member.service.IMemberCardService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.Data;
-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;
-
-/**
- * 会员卡记录管理处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Component
-@Tag(name = "会员卡记录管理", description = "会员卡购买、续费、使用、退款等核心业务")
-public class MemberCardRecordHandler {
-
-    private final IMemberCardService memberCardService;
-    private final IMemberCardRecordService memberCardRecordService;
-
-    public MemberCardRecordHandler(IMemberCardService memberCardService,
-                                   IMemberCardRecordService memberCardRecordService) {
-        this.memberCardService = memberCardService;
-        this.memberCardRecordService = memberCardRecordService;
-    }
-
-    @Operation(summary = "购买会员卡", description = "支持时长卡、次卡、储值卡，自动设置到期提醒")
-    public Mono<ServerResponse> purchaseCard(ServerRequest request) {
-        return request.bodyToMono(PurchaseRequest.class)
-                .flatMap(body -> memberCardService.purchaseCard(
-                        body.getMemberId(),
-                        body.getMemberCardId(),
-                        body.getSourceOrderId()))
-                .flatMap(record -> ServerResponse.ok().bodyValue(record))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue("购买失败: " + e.getMessage()));
-    }
-
-    @Operation(summary = "续费会员卡", description = "累加剩余次数/余额，顺延到期日期，权益立即生效")
-    public Mono<ServerResponse> renewCard(ServerRequest request) {
-        Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        return request.bodyToMono(RenewRequest.class)
-                .flatMap(body -> memberCardService.renewCard(recordId,
-                        body.getAddTimes(),
-                        body.getAddAmount(),
-                        body.getAddDays(),
-                        body.getSourceOrderId()))
-                .flatMap(record -> ServerResponse.ok().bodyValue(record))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue("续费失败: " + e.getMessage()));
-    }
-
-    @Operation(summary = "使用会员卡", description = "预约团课或私教成功后扣减次数或余额")
-    public Mono<ServerResponse> useCard(ServerRequest request) {
-        Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        return request.bodyToMono(UseCardRequest.class)
-                .flatMap(body -> memberCardService.useCard(recordId,
-                        body.getDeductTimes(),
-                        body.getDeductAmount()))
-                .flatMap(record -> ServerResponse.ok().bodyValue(record))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue("使用失败: " + e.getMessage()));
-    }
-
-    @Operation(summary = "退款会员卡", description = "使用Saga模式执行退款流程，保证事务一致性")
-    public Mono<ServerResponse> refundCard(ServerRequest request) {
-        Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        return memberCardService.refundCard(recordId)
-                .then(ServerResponse.ok().bodyValue("退款成功"))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue("退款失败: " + e.getMessage()));
-    }
-
-    @Operation(summary = "查询会员卡记录详情", description = "根据记录ID查询详细信息")
-    public Mono<ServerResponse> getMemberCardRecordById(ServerRequest request) {
-        Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        return memberCardRecordService.findById(recordId)
-                .flatMap(record -> ServerResponse.ok().bodyValue(record))
-                .switchIfEmpty(ServerResponse.notFound().build());
-    }
-
-    @Operation(summary = "会员我的卡包", description = "查询当前会员的所有有效卡")
-    public Mono<ServerResponse> getMyCards(ServerRequest request) {
-        Long memberId = Long.parseLong(request.pathVariable("memberId"));
-        return ServerResponse.ok().body(
-                memberCardRecordService.findActiveCardsByMemberId(memberId),
-                MemberCardRecord.class);
-    }
-
-    @Operation(summary = "处理过期会员卡", description = "定时任务调用，扫描并更新过期卡状态")
-    public Mono<ServerResponse> processExpiredCards(ServerRequest request) {
-        return memberCardService.processExpiredCards()
-                .flatMap(count -> ServerResponse.ok().bodyValue("处理完成，共处理" + count + "条"));
-    }
-
-    @Data
-    public static class PurchaseRequest {
-        private Long memberId;
-        private Long memberCardId;
-        private Long sourceOrderId;
-    }
-
-    @Data
-    public static class UseCardRequest {
-        private Integer deductTimes;
-        private Double deductAmount;
-    }
-
-    @Data
-    public static class RenewRequest {
-        private Integer addTimes;
-        private Double addAmount;
-        private Integer addDays;
-        private Long sourceOrderId;
-    }
-}

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

@@ -1,102 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.enums.CardEvent;
-import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡定时任务处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class MemberCardScheduledHandler {
-
-    private final MemberCardRecordRepository recordRepository;
-    private final ExpirationReminderService expirationReminderService;
-    private final MemberCardStateMachine stateMachine;
-    private final DistributedLockService distributedLockService;
-
-    /**
-     * 每日凌晨2点检查过期会员卡
-     */
-    @Scheduled(cron = "0 0 2 * * ?")
-    public void checkExpiredCards() {
-        String lockKey = "scheduled:check_expired_cards";
-
-        distributedLockService.executeWithLock("SYSTEM", "EXPIRE_CHECK",
-            Mono.fromRunnable(() -> {
-                log.info("开始执行会员卡过期检查任务");
-
-                LocalDateTime now = LocalDateTime.now();
-
-                recordRepository.findActiveRecords()
-                    .filter(record -> record.getExpireTime() != null && record.getExpireTime().isBefore(now))
-                    .flatMap(record ->
-                            stateMachine.transition(record.getStatus(), CardEvent.EXPIRE)
-                                    .flatMap(newState -> {
-                                        record.setStatus(newState);
-                                        return recordRepository.save(record);
-                                    })
-                                .doOnSuccess(r -> log.info("会员卡记录ID={} 已标记为过期", r.getMemberCardRecordId()))
-                                .onErrorResume(e -> {
-                                    log.error("处理会员卡过期失败: recordId={}", record.getMemberCardRecordId(), e);
-                                    return Mono.empty();
-                                })
-                        )
-                        .then()
-                        .subscribe();
-            })
-        ).subscribe();
-    }
-
-    /**
-     * 每日凌晨3点检查是否有遗漏的到期提醒（兜底机制）
-     */
-    @Scheduled(cron = "0 0 3 * * ?")
-    public void checkAndSendExpirationReminders() {
-        String lockKey = "scheduled:expiration_reminder";
-
-        distributedLockService.executeWithLock("SYSTEM", "REMINDER_CHECK",
-            Mono.fromRunnable(() -> {
-                log.info("开始执行到期提醒兜底检查任务");
-
-                LocalDateTime now = LocalDateTime.now();
-
-                // 查询所有活跃的会员卡
-                recordRepository.findActiveRecords()
-                    .filter(record -> record.getExpireTime() != null)
-                    .flatMap(record -> {
-                        try {
-                            // 计算距离到期还有几天
-                            long daysBetween = java.time.Duration.between(now, record.getExpireTime()).toDays();
-
-                            // 如果到期时间在1-7天范围内，记录日志供人工检查
-                            if (daysBetween >= 1 && daysBetween <= 7) {
-                                log.warn("发现到期前{}天的会员卡记录ID={}，请确认是否已发送提醒",
-                                    daysBetween, record.getMemberCardRecordId());
-                            }
-
-                            return Mono.empty();
-                        } catch (Exception e) {
-                            log.error("检查到期提醒失败: recordId={}", record.getMemberCardRecordId(), e);
-                            return Mono.empty();
-                        }
-                    })
-                    .then()
-                    .subscribe();
-            })
-        ).subscribe();
-
-        log.info("到期提醒兜底检查任务完成");
-    }
-}

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

@@ -1,91 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import cn.novalon.gym.manage.member.enums.CardEvent;
-import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 会员卡状态机处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Component
-public class MemberCardStateMachine {
-
-    private final Map<MemberCardRecordStatus, Map<CardEvent, MemberCardRecordStatus>> stateTransitionMap;
-
-    public MemberCardStateMachine() {
-        this.stateTransitionMap = buildStateTransitionMap();
-    }
-
-    private Map<MemberCardRecordStatus, Map<CardEvent, MemberCardRecordStatus>> buildStateTransitionMap() {
-        Map<MemberCardRecordStatus, Map<CardEvent, MemberCardRecordStatus>> map = new HashMap<>();
-
-        // ACTIVE 状态可以转换的事件
-        Map<CardEvent, MemberCardRecordStatus> activeTransitions = new HashMap<>();
-        activeTransitions.put(CardEvent.USE, MemberCardRecordStatus.ACTIVE);
-        activeTransitions.put(CardEvent.RENEW, MemberCardRecordStatus.ACTIVE);
-        activeTransitions.put(CardEvent.EXPIRE, MemberCardRecordStatus.EXPIRED);
-        activeTransitions.put(CardEvent.REFUND, MemberCardRecordStatus.REFUNDED);
-        map.put(MemberCardRecordStatus.ACTIVE, activeTransitions);
-
-        // USED_UP 状态可以转换的事件
-        Map<CardEvent, MemberCardRecordStatus> usedUpTransitions = new HashMap<>();
-        usedUpTransitions.put(CardEvent.RENEW, MemberCardRecordStatus.ACTIVE);
-        usedUpTransitions.put(CardEvent.REFUND, MemberCardRecordStatus.REFUNDED);
-        map.put(MemberCardRecordStatus.USED_UP, usedUpTransitions);
-
-        // EXPIRED 状态可以转换的事件
-        Map<CardEvent, MemberCardRecordStatus> expiredTransitions = new HashMap<>();
-        expiredTransitions.put(CardEvent.RENEW, MemberCardRecordStatus.ACTIVE);
-        map.put(MemberCardRecordStatus.EXPIRED, expiredTransitions);
-
-        // REFUNDED 状态是终态，不允许任何转换
-
-        return map;
-    }
-
-    public Mono<Boolean> canTransition(MemberCardRecordStatus currentState, CardEvent event) {
-        return Mono.fromSupplier(() -> {
-            Map<CardEvent, MemberCardRecordStatus> transitions = stateTransitionMap.get(currentState);
-            if (transitions == null) {
-                return false;
-            }
-            return transitions.containsKey(event);
-        });
-    }
-
-    public Mono<MemberCardRecordStatus> transition(MemberCardRecordStatus currentState, CardEvent event) {
-        return Mono.fromSupplier(() -> {
-            Map<CardEvent, MemberCardRecordStatus> transitions = stateTransitionMap.get(currentState);
-            if (transitions == null || !transitions.containsKey(event)) {
-                log.error("Invalid state transition: currentState={}, event={}", currentState, event);
-                throw new IllegalStateException(
-                        String.format("不允许的状态转换: 当前状态=%s, 事件=%s", currentState, event));
-            }
-            MemberCardRecordStatus newState = transitions.get(event);
-            log.info("State transition: {} --({})--> {}", currentState, event, newState);
-            return newState;
-        });
-    }
-
-    public Mono<Void> validateTransition(MemberCardRecord card, CardEvent event) {
-        return canTransition(card.getStatus(), event)
-                .flatMap(canTransition -> {
-                    if (!canTransition) {
-                        return Mono.error(new IllegalStateException(
-                                String.format("会员卡记录ID=%d 不允许的状态转换: 当前状态=%s, 事件=%s",
-                                        card.getMemberCardRecordId(), card.getStatus(), event)));
-                    }
-                    return Mono.empty();
-                });
-    }
-}

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

@@ -1,152 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.hutool.db.PageResult;
-import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
-import cn.novalon.gym.manage.member.enums.TransactionType;
-import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Validator;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-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.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 会员卡流水管理处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Component
-@Tag(name = "会员卡流水管理", description = "会员卡流水相关操作")
-public class MemberCardTransactionHandler {
-
-    private final IMemberCardTransactionService memberCardTransactionService;
-    private final Validator validator;
-
-    public MemberCardTransactionHandler(IMemberCardTransactionService memberCardTransactionService,
-                                        Validator validator) {
-        this.memberCardTransactionService = memberCardTransactionService;
-        this.validator = validator;
-    }
-
-    /**
-     * 记录每一次变动
-     */
-    @Operation(summary = "插入流水记录", description = "购卡、扣次、续费、退款、过期时插入流水")
-    public Mono<ServerResponse> insertTransaction(ServerRequest request) {
-        return request.bodyToMono(MemberCardTransaction.class)
-                .flatMap(memberCardTransactionService::insertTransaction)
-                .flatMap(record -> ServerResponse.ok().bodyValue(record));
-    }
-
-    /**
-     * 会员端"使用记录"
-     */
-    @Operation(summary = "会员查询使用记录", description = "按会员ID和时间范围查询流水，支持分页")
-    public Mono<ServerResponse> getMemberTransactions(ServerRequest request) {
-        Long memberId = Long.parseLong(request.pathVariable("memberId"));
-        LocalDateTime startTime = request.queryParam("startTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now().minusMonths(1));
-        LocalDateTime endTime = request.queryParam("endTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now());
-        int page = request.queryParam("page").map(Integer::parseInt).orElse(0);
-        int size = request.queryParam("size").map(Integer::parseInt).orElse(10);
-        Pageable pageable = PageRequest.of(page, size, Sort.by("created_at").descending());
-
-        return ServerResponse.ok()
-                .body(memberCardTransactionService.findByMemberIdAndTimeRange(
-                        memberId, startTime, endTime, pageable), MemberCardTransaction.class);
-    }
-
-    /**
-     * 后台"使用记录查询"（条件分页）
-     */
-    @Operation(summary = "管理端流水查询", description = "按会员、卡号、操作类型、时间等条件分页查询流水")
-    public Mono<ServerResponse> getTransactionsWithConditions(ServerRequest request) {
-        Long memberId = request.queryParam("memberId").map(Long::parseLong).orElse(null);
-        Long memberCardId = request.queryParam("memberCardId").map(Long::parseLong).orElse(null);
-        TransactionType operationType = request.queryParam("operationType")
-                .map(s -> TransactionType.valueOf(s.toUpperCase())).orElse(null);
-        LocalDateTime startTime = request.queryParam("startTime").map(LocalDateTime::parse).orElse(null);
-        LocalDateTime endTime = request.queryParam("endTime").map(LocalDateTime::parse).orElse(null);
-        int page = request.queryParam("page").map(Integer::parseInt).orElse(0);
-        int size = request.queryParam("size").map(Integer::parseInt).orElse(10);
-        Pageable pageable = PageRequest.of(page, size, Sort.by("created_at").descending());
-
-        Mono<Long> countMono = memberCardTransactionService.countWithConditions(
-                memberId, memberCardId, operationType, startTime, endTime);
-        Flux<MemberCardTransaction> flux = memberCardTransactionService.findWithConditions(
-                memberId, memberCardId, operationType, startTime, endTime, pageable);
-
-        return Mono.zip(countMono, flux.collectList())
-                .flatMap(tuple -> {
-                    Long total = tuple.getT1();
-                    List<MemberCardTransaction> list = tuple.getT2();
-                    // 构造 PageResult，内部自动计算总页数
-                    PageResult<MemberCardTransaction> result = new PageResult<>(page, size, total.intValue());
-                    result.addAll(list);
-                    return ServerResponse.ok().bodyValue(result);
-                });
-    }
-
-    /**
-     * 按卡ID查询流水
-     */
-    @Operation(summary = "按卡ID查询流水", description = "查看某张卡的所有流水记录")
-    public Mono<ServerResponse> getTransactionsByCardId(ServerRequest request) {
-        Long memberCardId = Long.parseLong(request.pathVariable("cardId"));
-        return ServerResponse.ok()
-                .body(memberCardTransactionService.findByMemberCardId(memberCardId),
-                        MemberCardTransaction.class);
-    }
-
-    /**
-     * 统计某卡种的总扣次数
-     */
-    @Operation(summary = "统计卡种总扣次数", description = "按卡种ID和时间范围统计扣次总数")
-    public Mono<ServerResponse> getDeductCountByCardId(ServerRequest request) {
-        Long memberCardId = Long.parseLong(request.pathVariable("cardId"));
-        LocalDateTime startTime = request.queryParam("startTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now().minusMonths(1));
-        LocalDateTime endTime = request.queryParam("endTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now());
-        return memberCardTransactionService.sumDeductCountByCardId(memberCardId, startTime, endTime)
-                .flatMap(count -> ServerResponse.ok().bodyValue(count));
-    }
-
-    /**
-     * 统计某时间段的续费总金额
-     */
-    @Operation(summary = "统计续费总金额", description = "按时间段统计续费总金额")
-    public Mono<ServerResponse> getRenewAmountByTimeRange(ServerRequest request) {
-        LocalDateTime startTime = request.queryParam("startTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now().minusMonths(1));
-        LocalDateTime endTime = request.queryParam("endTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now());
-        return memberCardTransactionService.sumRenewAmountByTimeRange(startTime, endTime)
-                .flatMap(amount -> ServerResponse.ok().bodyValue(amount));
-    }
-
-    /**
-     * 统计某会员的购卡总金额
-     */
-    @Operation(summary = "统计会员购卡总金额", description = "按会员ID和时间段统计购卡总金额")
-    public Mono<ServerResponse> getPurchaseAmountByMember(ServerRequest request) {
-        Long memberId = Long.parseLong(request.pathVariable("memberId"));
-        LocalDateTime startTime = request.queryParam("startTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now().minusMonths(1));
-        LocalDateTime endTime = request.queryParam("endTime")
-                .map(LocalDateTime::parse).orElse(LocalDateTime.now());
-        return memberCardTransactionService.sumPurchaseAmountByMemberId(memberId, startTime, endTime)
-                .flatMap(amount -> ServerResponse.ok().bodyValue(amount));
-    }
-}

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

@@ -1,241 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.config.WechatProperties;
-import cn.novalon.gym.manage.member.dto.AdminUpdatePhoneDto;
-import cn.novalon.gym.manage.member.dto.SearchMemberDto;
-import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
-import cn.novalon.gym.manage.member.service.MemberService;
-import cn.novalon.gym.manage.member.service.WechatAuthService;
-import cn.novalon.gym.manage.member.service.WechatOfficialService;
-import cn.novalon.gym.manage.member.util.AesUtil;
-import cn.novalon.gym.manage.member.util.WechatPhoneUtil;
-import cn.novalon.gym.manage.sys.util.AuthUtil;
-import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.math.NumberUtils;
-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;
-
-/**
- * 会员信息处理器
- *
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-@Tag(name = "会员管理", description = "会员信息管理、微信绑定、服务号关注等")
-public class MemberHandler {
-
-    private final MemberService memberService;
-    private final WechatAuthService wechatAuthService;
-    private final WechatOfficialService wechatOfficialService;
-    private final AuthUtil authUtil;
-
-    @Operation(summary = "获取会员信息", description = "根据当前登录用户获取会员基本信息")
-    public Mono<ServerResponse> getMemberInfo(ServerRequest request) {
-
-        Long memberId = authUtil.getMemberUserIdOrThrow(request);
-
-        log.info("获取会员信息, memberId: {}", memberId);
-
-        return memberService.getMemberInfo(memberId)
-                .flatMap(info -> ServerResponse.ok()
-                            .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(info));
-    }
-
-    @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息")
-    public Mono<ServerResponse> updateMemberInfo(ServerRequest request) {
-
-        Long memberId = authUtil.getMemberUserIdOrThrow(request);
-
-        log.info("更新会员信息, memberId: {}", memberId);
-
-        return request.bodyToMono(UpdateMemberInfoDto.class)
-                .flatMap(updateDto -> memberService.updateMemberInfo(memberId, updateDto))
-                .flatMap(info -> ServerResponse.ok()
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .bodyValue(info));
-    }
-
-    @Operation(summary = "绑定手机号", description = "通过微信小程序手机号code绑定会员手机号")
-    public Mono<ServerResponse> bindPhone(ServerRequest request) {
-
-        Long memberId = authUtil.getMemberUserIdOrThrow(request);
-
-        String phoneCode = request.queryParam("phoneCode").orElse("");
-
-        if (phoneCode.trim().isEmpty()) throw new IllegalArgumentException("手机号code不能为空");
-
-        log.info("收到绑定手机号请求, memberId: {}, phoneCode: {}", memberId, phoneCode);
-
-        return wechatAuthService.bindPhone(memberId, phoneCode)
-                .flatMap(success -> ServerResponse.ok()
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .bodyValue(success));
-    }
-
-    @Operation(summary = "查询服务号关注状态", description = "查询会员是否关注微信服务号")
-    public Mono<ServerResponse> checkSubscribeStatus(ServerRequest request) {
-
-        Long memberId = authUtil.getMemberUserIdOrThrow(request);
-
-        log.info("查询服务号关注状态, memberId: {}", memberId);
-
-        return wechatOfficialService.checkSubscribeStatus(memberId)
-                .flatMap(subscribed -> {
-                    return ServerResponse.ok()
-                            .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(subscribed);
-                });
-    }
-
-    @Operation(summary = "管理员更新手机号", description = "后台管理员为会员更新手机号")
-    public Mono<ServerResponse> adminUpdatePhone(ServerRequest request) {
-
-        Long adminId = authUtil.getAdminUserIdOrThrow(request);
-
-        String memberIdStr = request.pathVariable("id");
-        long memberId = NumberUtils.toLong(memberIdStr, 0L);
-
-        if (memberId <= 0) throw new IllegalArgumentException("更新手机号失败: memberId 无效");
-
-        log.info("收到更新手机号请求, memberId: {}", memberId);
-
-        return request.bodyToMono(AdminUpdatePhoneDto.class)
-                .flatMap(body -> {
-                    String phone = body.getPhone();
-
-                    if (phone == null || phone.isEmpty()) return Mono.error(new IllegalArgumentException("手机号不能为空"));
-
-                    if (!phone.matches("^1[3-9]\\d{9}$")) return Mono.error(new IllegalArgumentException("手机号格式不正确"));
-
-                    log.info("开始更新手机号, memberId: {}, phone: {}", memberId, phone);
-
-                    return memberService.adminUpdatePhone(memberId, phone);
-                })
-                .flatMap(success -> {
-                    log.info("手机号更新成功, memberId: {}", memberId);
-                    return ServerResponse.ok()
-                            .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(success);
-                });
-    }
-
-    @Operation(summary = "管理员查看会员详情", description = "后台管理员查看指定会员的详细信息")
-    public Mono<ServerResponse> adminGetMemberInfo(ServerRequest request) {
-
-        Long adminId = authUtil.getAdminUserIdOrThrow(request);
-
-        String memberIdStr = request.pathVariable("id");
-        long memberId = NumberUtils.toLong(memberIdStr, 0L);
-        if(memberId <= 0) throw new IllegalArgumentException("会员ID格式错误");
-
-        log.info("前台查看会员信息, adminId: {}, memberId: {}", adminId, memberId);
-
-        return memberService.getMemberDetail(memberId)
-                .flatMap(detail -> {
-                    if (detail.getPhone() != null && !detail.getPhone().isEmpty()) {
-                        try {
-                            String decryptedPhone = AesUtil.decrypt(detail.getPhone());
-                            detail.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
-                        } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", detail.getId(), e);
-                            detail.setPhone(null);
-                        }
-                    }
-                    return ServerResponse.ok()
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .bodyValue(detail);
-                });
-    }
-
-    @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息")
-    public Mono<ServerResponse> adminUpdateMemberInfo(ServerRequest request) {
-
-        Long adminId = authUtil.getAdminUserIdOrThrow(request);
-
-        String memberIdStr = request.pathVariable("id");
-        long memberId = NumberUtils.toLong(memberIdStr, 0L);
-        if(memberId <= 0L) throw new IllegalArgumentException("会员ID格式错误");
-
-        // TODO: 补充签到记录
-        log.info("前台编辑会员信息, adminId: {}, memberId: {}", adminId, memberId);
-
-        return request.bodyToMono(UpdateMemberInfoDto.class)
-                .flatMap(updateDto -> memberService.adminUpdateMemberInfo(memberId, updateDto))
-                .flatMap(detail -> ServerResponse.ok()
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .bodyValue(detail));
-    }
-
-    @Operation(summary = "搜索会员列表", description = "后台管理员按关键词搜索会员，支持性别筛选和分页")
-    public Mono<ServerResponse> searchMembers(ServerRequest request) {
-
-        Long adminId = authUtil.getAdminUserIdOrThrow(request);
-
-        String keyword = request.queryParam("searchValue").orElse(null);
-        Integer pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
-        Integer pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);
-
-        log.info("前台搜索会员列表, adminId: {}, keyword: {},pageNum: {}, pageSize: {}",
-                adminId, keyword, pageNum, pageSize);
-
-        return memberService.searchMember(new SearchMemberDto(keyword, pageNum, pageSize))
-                .map(member -> {
-                    // 解密手机号
-                    if (member.getPhone() != null && !member.getPhone().isEmpty()) {
-                        try {
-                            String decryptedPhone = AesUtil.decrypt(member.getPhone());
-                            member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
-                        } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", member.getId(), e);
-                            member.setPhone(null);
-                        }
-                    }
-                    return member;
-                })
-                .collectList()
-                .flatMap(list -> ServerResponse.ok().bodyValue(list));
-    }
-
-
-    @Operation(summary = "查看会员列表", description = "后台管理员分页查看所有会员列表")
-    public Mono<ServerResponse> getAllMembers(ServerRequest 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);
-
-        log.info("前台查看会员列表, adminId: {}, pageNum: {}, pageSize: {}", adminId, pageNum, pageSize);
-        // TODO: 补充签到记录
-
-        return memberService.findAll(pageNum, pageSize)
-                .map(member -> {
-                    // 解密手机号
-                    if (member.getPhone() != null && !member.getPhone().isEmpty()) {
-                        try {
-                            String decryptedPhone = AesUtil.decrypt(member.getPhone());
-                            member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
-                        } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", member.getId(), e);
-                            member.setPhone(null);
-                        }
-                    }
-                    return member;
-                })
-                .collectList()
-                .flatMap(list -> ServerResponse.ok().bodyValue(list));
-    }
-
-}

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

@@ -1,134 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
-import cn.novalon.gym.manage.member.enums.CardEvent;
-import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus;
-import cn.novalon.gym.manage.member.enums.TransactionType;
-import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
-import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 退款 Saga 处理器
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class RefundSagaHandler {
-
-    private final MemberCardRecordRepository recordRepository;
-    private final IMemberCardTransactionService transactionService;
-    private final MemberCardStateMachine stateMachine;
-
-    public Mono<Void> executeRefund(Long recordId) {
-        return recordRepository.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> stateMachine.validateTransition(record, CardEvent.REFUND)
-                        .then(Mono.defer(() -> doExecuteRefund(recordId, record))));
-    }
-
-    private Mono<Void> doExecuteRefund(Long recordId, MemberCardRecord record) {
-        List<SagaStep> steps = new ArrayList<>();
-        List<SagaStep> rollbackSteps = new ArrayList<>();
-
-        SagaStep step1 = new SagaStep(
-                "更新会员卡状态为已退款",
-                updateCardStatus(recordId, MemberCardRecordStatus.REFUNDED),
-                Mono.defer(() -> updateCardStatus(recordId, record.getStatus()))
-        );
-        steps.add(step1);
-        rollbackSteps.add(0, step1);
-
-        SagaStep step2 = new SagaStep(
-                "记录退款流水",
-                createRefundTransaction(record),
-                createReversalTransaction(record)
-        );
-        steps.add(step2);
-        rollbackSteps.add(0, step2);
-
-        return executeSaga(steps, rollbackSteps);
-    }
-
-    private Mono<Void> updateCardStatus(Long recordId, MemberCardRecordStatus status) {
-        return recordRepository.updateStatus(recordId, status.name())
-                .flatMap(rows -> {
-                    if (rows == 0) {
-                        return Mono.error(new RuntimeException("更新会员卡状态失败"));
-                    }
-                    return Mono.empty();
-                });
-    }
-
-    private Mono<Void> createRefundTransaction(MemberCardRecord record) {
-        MemberCardTransaction transaction = MemberCardTransaction.builder()
-                .memberId(record.getMemberId())
-                .memberCardId(record.getMemberCardId())
-                .operationType(TransactionType.REFUND.name())
-                .changeAmount(-record.getRemainingTimes())
-                .changeBalance(-record.getRemainingAmount())
-                .afterRemainingCount(0)
-                .afterRemainingBalance(0.0)
-                .remark("会员卡退款")
-                .build();
-
-        return transactionService.createTransaction(transaction);
-    }
-
-    private Mono<Void> createReversalTransaction(MemberCardRecord record) {
-        MemberCardTransaction reversal = MemberCardTransaction.builder()
-                .memberId(record.getMemberId())
-                .memberCardId(record.getMemberCardId())
-                .operationType(TransactionType.REFUND.name())
-                .changeAmount(record.getRemainingTimes())
-                .changeBalance(record.getRemainingAmount())
-                .remark("退款冲正")
-                .build();
-
-        return transactionService.createTransaction(reversal);
-    }
-
-    private Mono<Void> executeSaga(List<SagaStep> steps, List<SagaStep> rollbackSteps) {
-        return executeStep(steps, 0, rollbackSteps);
-    }
-
-    private Mono<Void> executeStep(List<SagaStep> steps, int index, List<SagaStep> rollbackSteps) {
-        if (index >= steps.size()) {
-            return Mono.empty();
-        }
-
-        SagaStep currentStep = steps.get(index);
-
-        return currentStep.operation()
-                .then(Mono.defer(() -> executeStep(steps, index + 1, rollbackSteps)))
-                .onErrorResume(error -> {
-                    log.error("Saga步骤执行失败: step={}, error={}", currentStep.description(), error.getMessage());
-                    return rollback(rollbackSteps, 0).then(Mono.error(error));
-                });
-    }
-
-    private Mono<Void> rollback(List<SagaStep> rollbackSteps, int index) {
-        if (index >= rollbackSteps.size()) {
-            return Mono.empty();
-        }
-
-        SagaStep currentStep = rollbackSteps.get(index);
-
-        return currentStep.rollbackOperation()
-                .then(Mono.defer(() -> rollback(rollbackSteps, index + 1)))
-                .doOnError(error -> log.error("Saga回滚失败: step={}, error={}", currentStep.description(), error.getMessage()))
-                .onErrorResume(e -> Mono.empty());
-    }
-
-    private record SagaStep(String description, Mono<Void> operation, Mono<Void> rollbackOperation) {}
-}

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

@@ -1,57 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.dto.WechatLoginDto;
-import cn.novalon.gym.manage.member.service.WechatAuthService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-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;
-
-/**
- * 微信认证
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-@Tag(name = "微信认证", description = "微信小程序登录、公众号回调等")
-public class WechatAuthHandler {
-
-    private final WechatAuthService wechatAuthService;
-    private final WechatOfficialEventHandler wechatOfficialEventHandler;
-
-    @Operation(summary = "微信小程序登录", description = "通过微信小程序code获取session_key，完成会员登录或注册")
-    public Mono<ServerResponse> miniappLogin(ServerRequest request) {
-        log.info("收到小程序登录请求");
-        
-        return request.bodyToMono(WechatLoginDto.class)
-                .flatMap(loginRequest -> {
-                    log.info("开始微信AuthService, code: {}", loginRequest.getCode());
-                    return wechatAuthService.miniappLogin(loginRequest);
-                })
-                .flatMap(response -> {
-                    log.info("更新成功, memberId: {}", response.getMemberId());
-                    return ServerResponse.ok()
-                            .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(response);
-                });
-    }
-
-    @Operation(summary = "微信公众号回调", description = "处理微信公众号事件（关注、取消关注等）")
-    public Mono<ServerResponse> mpCallback(ServerRequest request) {
-        return wechatOfficialEventHandler.handleEvent(request);
-    }
-
-    @Operation(summary = "验证微信公众号签名", description = "微信公众号服务器验证，返回echostr")
-    public Mono<ServerResponse> verifyMpSignature(ServerRequest request) {
-        return wechatOfficialEventHandler.verifySignature(request);
-    }
-}

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

@@ -1,215 +0,0 @@
-package cn.novalon.gym.manage.member.handler;
-
-import cn.novalon.gym.manage.member.config.WechatProperties;
-import cn.novalon.gym.manage.member.service.WechatOfficialService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.util.Arrays;
-
-/**
- * 微信公众号事件处理器
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class WechatOfficialEventHandler {
-
-    private final WechatOfficialService wechatOfficialService;
-    private final WechatProperties wechatProperties;
-
-    /**
-     * 处理微信公众号事件
-     * 
-     * 请求格式:XML
-     * 响应格式:success 或 回复消息内容
-     */
-    public Mono<ServerResponse> handleEvent(ServerRequest request) {
-        return request.bodyToMono(String.class)
-                .flatMap(xmlBody -> {
-                    log.info("收到微信公众号事件 {}", xmlBody);
-                    
-                    String openId = extractOpenId(xmlBody);
-                    String event = extractEvent(xmlBody);
-
-                    if (openId == null || event == null) {
-                        log.error("无法解析微信公众号事件");
-                        return ServerResponse.badRequest().bodyValue("error");
-                    }
-
-                    log.info("处理事件 openId={}, event={}", openId, event);
-
-                    // 根据事件类型处理
-                    if ("subscribe".equals(event)) {
-                        return wechatOfficialService.handleSubscribeEvent(openId)
-                                .then(ServerResponse.ok()
-                                        .contentType(MediaType.TEXT_PLAIN)
-                                        .bodyValue("success"));
-                    } else if ("unsubscribe".equals(event)) {
-                        return wechatOfficialService.handleUnsubscribeEvent(openId)
-                                .then(ServerResponse.ok()
-                                        .contentType(MediaType.TEXT_PLAIN)
-                                        .bodyValue("success"));
-                    } else {
-                        log.warn("未知事件类型: {}", event);
-                        return ServerResponse.ok()
-                                .contentType(MediaType.TEXT_PLAIN)
-                                .bodyValue("success");
-                    }
-                })
-                .onErrorResume(e -> {
-                    log.error("处理微信公众号事件失败", e);
-                    return ServerResponse.ok()
-                            .contentType(MediaType.TEXT_PLAIN)
-                            .bodyValue("success"); // 即使处理失败也返回success避免微信重试
-                });
-    }
-
-    /**
-     * 验证微信公众号签名
-     * 
-     * GET请求用于验证服务器地址
-     */
-    public Mono<ServerResponse> verifySignature(ServerRequest request) {
-        String signature = request.queryParam("signature").orElse("");
-        String timestamp = request.queryParam("timestamp").orElse("");
-        String nonce = request.queryParam("nonce").orElse("");
-        String echostr = request.queryParam("echostr").orElse("");
-
-        log.info("========== 微信公众号签名验证 ==========");
-        log.info("收到的参数:");
-        log.info("  signature: {}", signature);
-        log.info("  timestamp: {}", timestamp);
-        log.info("  nonce: {}", nonce);
-        log.info("  echostr: {}", echostr);
-
-        // 获取配置的Token
-        String token = wechatProperties.getMp().getToken();
-        log.info("配置的Token: {}", token);
-
-        // 验证签名
-        if (checkSignature(signature, timestamp, nonce, token)) {
-            log.info("签名验证成功，返回echostr: {}", echostr);
-            log.info("========== 微信公众号签名验证结束 ==========");
-            return ServerResponse.ok()
-                    .contentType(MediaType.TEXT_PLAIN)
-                    .bodyValue(echostr);
-        } else {
-            log.warn("签名验证失败");
-            log.info("========== 微信公众号签名验证结束 ==========");
-            return ServerResponse.badRequest()
-                    .contentType(MediaType.TEXT_PLAIN)
-                    .bodyValue("error");
-        }
-    }
-
-    /**
-     * 验证签名
-     * 
-     * @param signature 微信加密签名
-     * @param timestamp 时间戳
-     * @param nonce     随机数
-     * @param token     Token
-     * @return 是否验证通过
-     */
-    private boolean checkSignature(String signature, String timestamp, String nonce, String token) {
-        // 1. 将token、timestamp、nonce三个参数进行字典序排序
-        String[] arr = new String[]{token, timestamp, nonce};
-        Arrays.sort(arr);
-
-        // 2. 将三个参数字符串拼接成一个字符串
-        StringBuilder sb = new StringBuilder();
-        for (String str : arr) {
-            sb.append(str);
-        }
-
-        // 3. 将拼接后的字符串进行sha1加密
-        String encrypted = sha1(sb.toString());
-        log.debug("计算的签名 {}", encrypted);
-
-        // 4. 将加密后的字符串与signature对比
-        return encrypted != null && encrypted.equalsIgnoreCase(signature);
-    }
-
-    /**
-     * SHA1加密
-     * 
-     * @param str 待加密字符串
-     * @return 加密后字符串
-     */
-    private String sha1(String str) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-1");
-            byte[] digest = md.digest(str.getBytes(StandardCharsets.UTF_8));
-            StringBuilder hexString = new StringBuilder();
-            for (byte b : digest) {
-                String hex = Integer.toHexString(0xff & b);
-                if (hex.length() == 1) {
-                    hexString.append('0');
-                }
-                hexString.append(hex);
-            }
-            return hexString.toString();
-        } catch (Exception e) {
-            log.error("SHA1加密失败", e);
-            return null;
-        }
-    }
-
-    /**
-     * 从XML中提取OpenID
-     */
-    private String extractOpenId(String xml) {
-        int start = xml.indexOf("<FromUserName>");
-        int end = xml.indexOf("</FromUserName>");
-        if (start != -1 && end != -1) {
-            String value = xml.substring(start + 14, end);
-            // 去除 CDATA 标记
-            return cleanCdata(value);
-        }
-        return null;
-    }
-    
-    /**
-     * 从XML中获取事件类型
-     */
-    private String extractEvent(String xml) {
-        int start = xml.indexOf("<Event>");
-        int end = xml.indexOf("</Event>");
-        if (start != -1 && end != -1) {
-            String value = xml.substring(start + 7, end);
-            // 去除 CDATA 标记
-            return cleanCdata(value);
-        }
-        return null;
-    }
-    
-    /**
-     * 清理 CDATA 标记
-     * 例如: <![CDATA[subscribe]]> -> subscribe
-     */
-    private String cleanCdata(String value) {
-        if (value == null) {
-            return null;
-        }
-        // 去除前后空白
-        value = value.trim();
-        // 提取 CDATA 中间内容
-        // 格式: <![CDATA[xxx]]>
-        if (value.startsWith("<![CDATA[") && value.endsWith("]]>")) {
-            return value.substring(9, value.length() - 3);
-        }
-        return value;
-    }
-}

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

@@ -1,75 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.Member;
-import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- *  会员Repository
- *  @author 付嘉
- *  @date 2026-05-01
- */
-
-@Repository
-public interface IMemberRepository extends R2dbcRepository<Member, Long> {
-
-    // UnionID查询会员
-    Mono<Member> findByUnionId(String unionId);
-
-    // 小程序OpenID查询会员
-    Mono<Member> findByMiniappOpenId(String miniappOpenId);
-
-    // 服务号OpenID查询会员
-    Mono<Member> findByOfficialOpenId(String officialOpenId);
-
-    // 手机号查询
-    Mono<Member> findByPhone(String phone);
-
-    /**
-     * 分页查询所有会员
-     */
-    Flux<Member> findAllBy(Pageable pageable);
-
-    /**
-     * 查询会员的所有卡片
-     */
-    @Query("SELECT " +
-            "   r.id, " +
-            "   r.member_card_record_id, " +
-            "   r.member_id, " +
-            "   r.member_card_id, " +
-            "   r.status, " +
-            "   r.remaining_times, " +
-            "   r.remaining_amount, " +
-            "   r.expire_time, " +
-            "   r.purchase_time, " +
-            "   r.source_order_id, " +
-            "   r.created_at, " +
-            "   r.updated_at, " +
-            "   r.version, " +
-            "   r.card_composition, " +
-            "   c.id AS card_id, " +
-            "   c.member_card_id, " +
-            "   c.member_card_name, " +
-            "   c.member_card_type, " +
-            "   c.member_card_price, " +
-            "   c.member_card_validity_days, " +
-            "   c.member_card_total_times, " +
-            "   c.member_card_amount, " +
-            "   c.member_card_status, " +
-            "   c.extra_config, " +
-            "   c.created_at AS card_created_at, " +
-            "   c.updated_at AS card_updated_at " +
-            "FROM member_card_record r " +
-            "LEFT JOIN member_card c ON r.member_card_id = c.id " +
-            "WHERE r.member_id = :memberId " +
-            "AND r.deleted_at IS NULL " +
-            "AND c.deleted_at IS NULL " +
-            "ORDER BY r.created_at DESC")
-    Flux<MemberCardInfoVO> findCardRecordsWithCardInfoByMemberId(Long memberId);
-}

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

@@ -1,109 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.r2dbc.repository.Modifying;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡记录 Repository（会员持有的卡）
- *
- * @author 付嘉
- * @date 2026-05-27
- */
-@Repository
-public interface MemberCardRecordRepository extends R2dbcRepository<MemberCardRecord, Long> {
-
-    /**
-     * 插入新的激活卡记录
-     */
-    @Modifying
-    @Query("INSERT INTO member_card_record (member_id, member_card_id, status, expire_time, remaining_times, remaining_amount, source_order_id, purchase_time, created_at, updated_at) " +
-            "VALUES (:memberId, :memberCardId, 'ACTIVE', :expireTime, :remainingTimes, :remainingAmount, :sourceOrderId, NOW(), NOW(), NOW()) " +
-            "RETURNING *")
-    Mono<MemberCardRecord> insertActiveRecord(Long memberId, Long memberCardId,
-                                              LocalDateTime expireTime, Integer remainingTimes,
-                                              Double remainingAmount, Long sourceOrderId);
-
-    /**
-     * 扣减使用次数/金额
-     */
-    @Modifying
-    @Query("UPDATE member_card_record SET " +
-            "remaining_times = remaining_times - :deductTimes, " +
-            "remaining_amount = remaining_amount - :deductAmount, " +
-            "updated_at = NOW() " +
-            "WHERE member_card_record_id = :recordId " +
-            "AND deleted_at IS NULL " +
-            "AND remaining_times >= :deductTimes " +
-            "AND remaining_amount >= :deductAmount")
-    Mono<Integer> deductUsage(Long recordId, Integer deductTimes, Double deductAmount);
-
-    /**
-     * 续费卡片
-     */
-    @Modifying
-    @Query("UPDATE member_card_record SET remaining_times = remaining_times + :addTimes, " +
-            "remaining_amount = remaining_amount + :addAmount, expire_time = :newExpireTime, updated_at = NOW() " +
-            "WHERE member_card_record_id = :recordId AND deleted_at IS NULL")
-    Mono<Integer> renewCard(Long recordId, Integer addTimes, Double addAmount, LocalDateTime newExpireTime);
-
-    /**
-     * 更新卡片状态
-     */
-    @Modifying
-    @Query("UPDATE member_card_record SET status = :status, updated_at = NOW() " +
-            "WHERE member_card_record_id = :recordId AND deleted_at IS NULL")
-    Mono<Integer> updateStatus(Long recordId, String status);
-
-    /**
-     * 查询会员的有效卡片
-     */
-    @Query("SELECT * FROM member_card_record WHERE member_id = :memberId AND status = 'ACTIVE' AND deleted_at IS NULL ORDER BY expire_time ASC")
-    Flux<MemberCardRecord> findActiveCardsByMemberId(Long memberId);
-
-    /**
-     * 查询会员的所有卡片（分页）
-     */
-    @Query("SELECT mcr.* FROM member_card_record mcr " +
-            "INNER JOIN member_user m ON mcr.member_id = m.id " +
-            "WHERE mcr.member_id = :memberId AND mcr.deleted_at IS NULL " +
-            "ORDER BY mcr.purchase_time DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
-    Flux<MemberCardRecord> findByMemberId(Long memberId, Pageable pageable);
-
-    /**
-     * 验证次卡是否有足够次数
-     */
-    @Query("SELECT * FROM member_card_record WHERE member_card_record_id = :recordId " +
-            "AND status = 'ACTIVE' AND deleted_at IS NULL " +
-            "AND expire_time > NOW() " +
-            "AND remaining_times >= :requiredTimes")
-    Mono<MemberCardRecord> validateCountCard(Long recordId, Integer requiredTimes);
-
-    /**
-     * 验证储值卡是否有足够余额
-     */
-    @Query("SELECT * FROM member_card_record WHERE member_card_record_id = :recordId " +
-            "AND status = 'ACTIVE' AND deleted_at IS NULL " +
-            "AND expire_time > NOW() " +
-            "AND remaining_amount >= :requiredAmount")
-    Mono<MemberCardRecord> validateStoredCard(Long recordId, Double requiredAmount);
-
-    /**
-     * 查询已过期的卡片
-     */
-    @Query("SELECT * FROM member_card_record WHERE status = 'ACTIVE' AND expire_time < NOW() AND deleted_at IS NULL LIMIT 500")
-    Flux<MemberCardRecord> findExpiredCards();
-
-    /**
-     * 查询所有有效记录
-     */
-    @Query("SELECT * FROM member_card_record WHERE status = 'ACTIVE' AND deleted_at IS NULL")
-    Flux<MemberCardRecord> findActiveRecords();
-}

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

@@ -1,91 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.MemberCard;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.r2dbc.repository.Modifying;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 会员卡类型 Repository
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Repository
-public interface MemberCardRepository extends R2dbcRepository<MemberCard, Long> {
-
-    /**
-     * 根据会员卡ID查询（未删除的）
-     */
-    Mono<MemberCard> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId);
-
-    /**
-     * 条件查询会员卡列表
-     */
-    @Query("SELECT * FROM member_card WHERE deleted_at IS NULL " +
-            "AND (:status IS NULL OR member_card_status = :status) " +
-            "AND (:name IS NULL OR member_card_name LIKE CONCAT('%', :name, '%')) " +
-            "AND (:type IS NULL OR member_card_type = :type) " +
-            "AND (:minPrice IS NULL OR member_card_price >= :minPrice) " +
-            "AND (:maxPrice IS NULL OR member_card_price <= :maxPrice) " +
-            "ORDER BY created_at DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
-    Flux<MemberCard> findWithConditions(Integer status, String name, String type,
-                                        Double minPrice, Double maxPrice, Pageable pageable);
-
-    /**
-     * 统计符合条件的会员卡总数
-     */
-    @Query("SELECT COUNT(*) FROM member_card WHERE deleted_at IS NULL " +
-            "AND (:status IS NULL OR member_card_status = :status) " +
-            "AND (:name IS NULL OR member_card_name LIKE CONCAT('%', :name, '%')) " +
-            "AND (:type IS NULL OR member_card_type = :type) " +
-            "AND (:minPrice IS NULL OR member_card_price >= :minPrice) " +
-            "AND (:maxPrice IS NULL OR member_card_price <= :maxPrice)")
-    Mono<Long> countWithConditions(Integer status, String name, String type,
-                                   Double minPrice, Double maxPrice);
-
-    /**
-     * 按状态查询会员卡列表
-     */
-    Flux<MemberCard> findByMemberCardStatusAndDeletedAtIsNull(Integer status, Pageable pageable);
-
-    /**
-     * 检查会员卡是否已被购买
-     */
-    @Query("SELECT EXISTS(SELECT 1 FROM member_card_record WHERE member_card_id = :memberCardId AND deleted_at IS NULL LIMIT 1)")
-    Mono<Boolean> existsPurchasedRecord(Long memberCardId);
-
-    /**
-     * 逻辑删除会员卡
-     */
-    @Modifying
-    @Query("UPDATE member_card SET deleted_at = NOW() WHERE member_card_id = :memberCardId AND deleted_at IS NULL")
-    Mono<Integer> logicalDelete(Long memberCardId);
-
-    /**
-     * 安全更新会员卡信息
-     */
-    @Modifying
-    @Query("UPDATE member_card SET " +
-            "member_card_name = COALESCE(:name, member_card_name), " +
-            "member_card_price = COALESCE(:price, member_card_price), " +
-            "member_card_validity_days = COALESCE(:durationDays, member_card_validity_days), " +
-            "member_card_total_times = COALESCE(:totalCount, member_card_total_times), " +
-            "member_card_amount = COALESCE(:denomination, member_card_amount), " +
-            "member_card_status = COALESCE(:status, member_card_status), " +
-            "updated_at = NOW() " +
-            "WHERE member_card_id = :memberCardId AND deleted_at IS NULL")
-    Mono<Integer> updateSafe(Long memberCardId, String name, Double price,
-                             Integer durationDays, Integer totalCount,
-                             Double denomination, Integer status);
-
-    /**
-     * 批量查询上架的会员卡
-     */
-    @Query("SELECT * FROM member_card WHERE deleted_at IS NULL AND member_card_status = :status ORDER BY member_card_price ASC")
-    Flux<MemberCard> findActiveCards(Integer status);
-}

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

@@ -1,121 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.r2dbc.repository.Modifying;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡交易流水 Repository
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Repository
-public interface MemberCardTransactionRepository extends R2dbcRepository<MemberCardTransaction, Long> {
-
-    /**
-     * 插入交易流水记录
-     */
-    @Modifying
-    @Query("INSERT INTO member_card_transactions (member_card_record_id, member_card_id, member_id, operation_type, change_amount, " +
-            "change_balance, after_remaining_count, after_remaining_balance, related_biz_type, source_order_id, remark, created_at) " +
-            "VALUES (:memberCardRecordId, :memberCardId, :memberId, :operationType, :changeAmount, :changeBalance, " +
-            ":afterRemainingCount, :afterRemainingBalance, :relatedBizType, :sourceOrderId, :remark, NOW()) " +
-            "RETURNING *")
-    Mono<MemberCardTransaction> insertTransaction(Long memberCardRecordId, Long memberCardId, Long memberId,
-                                                   String operationType, Integer changeAmount,
-                                                   Double changeBalance, Integer afterRemainingCount,
-                                                   Double afterRemainingBalance, String relatedBizType,
-                                                   Long sourceOrderId, String remark);
-
-    /**
-     * 查询会员的使用记录（按时间范围）
-     */
-    @Query("SELECT * FROM member_card_transactions WHERE member_id = :memberId " +
-            "AND created_at BETWEEN :startTime AND :endTime " +
-            "ORDER BY created_at DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
-    Flux<MemberCardTransaction> findByMemberIdAndTimeRange(Long memberId,
-                                                           LocalDateTime startTime,
-                                                           LocalDateTime endTime,
-                                                           Pageable pageable);
-
-    /**
-     * 条件查询流水记录
-     */
-    @Query("SELECT * FROM member_card_transactions " +
-            "AND (:memberId IS NULL OR member_id = :memberId) " +
-            "AND (:memberCardId IS NULL OR member_card_id = :memberCardId) " +
-            "AND (:operationType IS NULL OR operation_type = :operationType) " +
-            "AND (:startTime IS NULL OR created_at >= :startTime) " +
-            "AND (:endTime IS NULL OR created_at <= :endTime) " +
-            "ORDER BY created_at DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
-    Flux<MemberCardTransaction> findWithConditions(Long memberId, Long memberCardId,
-                                                   String operationType,
-                                                   LocalDateTime startTime,
-                                                   LocalDateTime endTime,
-                                                   Pageable pageable);
-
-    /**
-     * 统计符合条件的流水总数
-     */
-    @Query("SELECT COUNT(*) FROM member_card_transactions " +
-            "AND (:memberId IS NULL OR member_id = :memberId) " +
-            "AND (:memberCardId IS NULL OR member_card_id = :memberCardId) " +
-            "AND (:operationType IS NULL OR operation_type = :operationType) " +
-            "AND (:startTime IS NULL OR created_at >= :startTime) " +
-            "AND (:endTime IS NULL OR created_at <= :endTime)")
-    Mono<Long> countWithConditions(Long memberId, Long memberCardId,
-                                   String operationType,
-                                   LocalDateTime startTime,
-                                   LocalDateTime endTime);
-
-    /**
-     * 按会员卡ID查询所有流水
-     */
-    @Query("SELECT * FROM member_card_transactions WHERE member_card_id = :memberCardId ORDER BY created_at DESC")
-    Flux<MemberCardTransaction> findByMemberCardId(Long memberCardId);
-
-    /**
-     * 按会员ID查询所有流水
-     */
-    @Query("SELECT * FROM member_card_transactions WHERE member_id = :memberId ORDER BY created_at DESC")
-    Flux<MemberCardTransaction> findByMemberId(Long memberId);
-
-    /**
-     * 按会员卡记录ID查询所有流水
-     */
-    @Query("SELECT * FROM member_card_transactions WHERE member_card_record_id = :recordId ORDER BY created_at DESC")
-    Flux<MemberCardTransaction> findByRecordId(Long recordId);
-
-    /**
-     * 统计某卡种的总扣次数
-     */
-    @Query("SELECT COALESCE(SUM(change_amount), 0) FROM member_card_transactions " +
-            "WHERE member_card_id = :memberCardId AND operation_type = 'DEDUCT' " +
-            "AND created_at BETWEEN :startTime AND :endTime")
-    Mono<Long> sumDeductCountByCardId(Long memberCardId,
-                                      LocalDateTime startTime,
-                                      LocalDateTime endTime);
-
-    /**
-     * 统计某时间段的续费总金额
-     */
-    @Query("SELECT COALESCE(SUM(change_balance), 0) FROM member_card_transactions " +
-            "WHERE operation_type = 'RENEW' AND created_at BETWEEN :startTime AND :endTime")
-    Mono<Double> sumRenewAmountByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
-
-    /**
-     * 统计某会员的购卡总金额
-     */
-    @Query("SELECT COALESCE(SUM(change_balance), 0) FROM member_card_transactions " +
-            "WHERE member_id = :memberId AND operation_type = 'PURCHASE' " +
-            "AND created_at BETWEEN :startTime AND :endTime")
-    Mono<Double> sumPurchaseAmountByMemberId(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
-}

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

@@ -1,48 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.RefundApplication;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 退款申请 Repository
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Repository
-public interface RefundApplicationRepository extends R2dbcRepository<RefundApplication, Long> {
-
-    /**
-     * 根据会员卡记录ID查询退款申请
-     */
-    @Query("SELECT * FROM refund_application WHERE record_id = :recordId AND deleted_at IS NULL LIMIT 1")
-    Mono<RefundApplication> findByRecordId(Long recordId);
-
-    /**
-     * 根据会员ID查询退款申请列表
-     */
-    @Query("SELECT * FROM refund_application WHERE member_id = :memberId AND deleted_at IS NULL ORDER BY created_at DESC")
-    Flux<RefundApplication> findByMemberId(Long memberId);
-
-    /**
-     * 根据状态查询退款申请列表
-     */
-    @Query("SELECT * FROM refund_application WHERE status = :status AND deleted_at IS NULL ORDER BY created_at DESC")
-    Flux<RefundApplication> findByStatus(String status);
-
-    /**
-     * 审核退款申请
-     */
-    @Query("UPDATE refund_application SET status = :status, auditor_id = :auditorId, audit_time = NOW(), audit_remark = :auditRemark, updated_at = NOW() WHERE id = :id")
-    Mono<Integer> approve(Long id, String status, Long auditorId, String auditRemark);
-
-    /**
-     * 逻辑删除退款申请
-     */
-    @Query("UPDATE refund_application SET deleted_at = NOW() WHERE id = :id")
-    Mono<Integer> logicalDelete(Long id);
-}

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

@@ -1,29 +0,0 @@
-package cn.novalon.gym.manage.member.repository;
-
-import cn.novalon.gym.manage.member.entity.WechatUser;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
-import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Mono;
-
-/**
- * 微信用户Repository
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-
-@Repository
-public interface WechatUserRepository extends R2dbcRepository<WechatUser, Long> {
-
-    // 通过UnionID查询微信用户
-    Mono<WechatUser> findByUnionId(String unionId);
-
-    // 通过小程序OpenID查询微信用户
-    Mono<WechatUser> findByMiniappOpenid(String miniappOpenid);
-
-    // 通过服务号OpenID查询微信用户
-    Mono<WechatUser> findByMpOpenid(String mpOpenid);
-
-    // 通过会员ID查询微信用户
-    Mono<WechatUser> findByMemberId(Long memberId);
-}

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

@@ -1,35 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import org.springframework.data.domain.Pageable;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 会员卡记录服务接口
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public interface IMemberCardRecordService {
-    
-    Mono<MemberCardRecord> findById(Long id);
-    
-    Flux<MemberCardRecord> findByMemberId(Long memberId, Pageable pageable);
-    
-    Flux<MemberCardRecord> findActiveCardsByMemberId(Long memberId);
-    
-    Mono<MemberCardRecord> insertActiveRecord(MemberCardRecord record);
-    
-    Mono<Integer> deductUsage(Long recordId, Integer deductTimes, Double deductAmount);
-    
-    Mono<Integer> renewCard(Long recordId, Integer addTimes, Double addAmount, java.time.LocalDateTime newExpireTime);
-    
-    Mono<Integer> updateStatus(Long recordId, String status);
-    
-    Mono<MemberCardRecord> validateCountCard(Long recordId, Integer requiredTimes);
-    
-    Mono<MemberCardRecord> validateStoredCard(Long recordId, Double requiredAmount);
-    
-    Flux<MemberCardRecord> findExpiredCards();
-}

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

@@ -1,44 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.entity.MemberCard;
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import org.springframework.data.domain.Pageable;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 会员卡服务接口
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public interface IMemberCardService {
-    
-    Mono<MemberCard> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId);
-    
-    Flux<MemberCard> findWithConditions(Integer status, String name, String type,
-                                        Double minPrice, Double maxPrice, Pageable pageable);
-    
-    Mono<Long> countWithConditions(Integer status, String name, String type,
-                                   Double minPrice, Double maxPrice);
-    
-    Flux<MemberCard> findByMemberCardStatusAndDeletedAtIsNull(Integer status, Pageable pageable);
-    
-    Mono<Boolean> existsPurchasedRecord(Long memberCardId);
-    
-    Mono<Integer> logicalDelete(Long memberCardId);
-    
-    Flux<MemberCard> findActiveCards(Integer status);
-    
-    Mono<MemberCard> save(MemberCard entity);
-    
-    Mono<MemberCardRecord> purchaseCard(Long memberId, Long memberCardId, Long sourceOrderId);
-    
-    Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, Integer addDays, Long sourceOrderId);
-    
-    Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount);
-    
-    Mono<Void> refundCard(Long recordId);
-    
-    Mono<Integer> processExpiredCards();
-}

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

@@ -1,93 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
-import cn.novalon.gym.manage.member.enums.TransactionType;
-import org.springframework.data.domain.Pageable;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡交易流水服务接口
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public interface IMemberCardTransactionService {
-
-    /**
-     * 记录每一次变动
-     * @param transaction 流水记录
-     * @return 插入的流水记录
-     */
-    Mono<MemberCardTransaction> insertTransaction(MemberCardTransaction transaction);
-
-    /**
-     * 会员端"使用记录"
-     * @param memberId 会员ID
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param pageable 分页参数
-     * @return 流水记录列表
-     */
-    Flux<MemberCardTransaction> findByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime,
-                                                           LocalDateTime endTime, Pageable pageable);
-
-    /**
-     * 后台"使用记录查询"
-     * @param memberId 会员ID
-     * @param memberCardId 会员卡ID
-     * @param operationType 操作类型
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param pageable 分页参数
-     * @return 流水记录列表
-     */
-    Flux<MemberCardTransaction> findWithConditions(Long memberId, Long memberCardId,
-                                                   TransactionType operationType,
-                                                   LocalDateTime startTime, LocalDateTime endTime,
-                                                   Pageable pageable);
-
-    /**
-     * 统计符合条件的流水总数
-     */
-    Mono<Long> countWithConditions(Long memberId, Long memberCardId,
-                                   TransactionType operationType,
-                                   LocalDateTime startTime, LocalDateTime endTime);
-
-    /**
-     * 按会员卡ID查询所有流水记录
-     */
-    Flux<MemberCardTransaction> findByMemberCardId(Long memberCardId);
-
-    /**
-     * 数据统计 - 统计某卡种的总扣次数
-     */
-    Mono<Long> sumDeductCountByCardId(Long memberCardId, LocalDateTime startTime, LocalDateTime endTime);
-
-    /**
-     * 数据统计 - 统计某时间段的续费总金额
-     */
-    Mono<Double> sumRenewAmountByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
-
-    /**
-     * 数据统计 - 统计某会员的购卡总金额
-     */
-    Mono<Double> sumPurchaseAmountByMemberId(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
-
-    /**
-     * 创建交易记录
-     */
-    Mono<Void> createTransaction(MemberCardTransaction transaction);
-
-    /**
-     * 查询会员的交易记录
-     */
-    Flux<MemberCardTransaction> findByMemberId(Long memberId);
-
-    /**
-     * 查询会员卡记录的交易历史
-     */
-    Flux<MemberCardTransaction> findByRecordId(Long recordId);
-}

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

@@ -1,33 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.entity.RefundApplication;
-import reactor.core.publisher.Mono;
-
-/**
- * 退款申请服务接口
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-public interface IRefundApplicationService {
-
-    /**
-     * 创建退款申请
-     */
-    Mono<RefundApplication> create(Long recordId, String reason);
-
-    /**
-     * 审核退款申请
-     */
-    Mono<RefundApplication> approve(Long applicationId, Long auditorId, String remark);
-
-    /**
-     * 拒绝退款申请
-     */
-    Mono<RefundApplication> reject(Long applicationId, Long auditorId, String remark);
-
-    /**
-     * 根据记录ID查询申请
-     */
-    Mono<RefundApplication> findByRecordId(Long recordId);
-}

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

@@ -1,79 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.dto.SearchMemberDto;
-import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
-import cn.novalon.gym.manage.member.entity.Member;
-import cn.novalon.gym.manage.member.es.entity.MemberES;
-import cn.novalon.gym.manage.member.vo.MemberDetailVO;
-import cn.novalon.gym.manage.member.vo.MemberInfoVO;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * 会员服务接口
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-public interface MemberService {
-
-    /**
-     * 获取会员信息
-     *
-     * @param memberId 会员ID
-     * @return 会员信息
-     */
-    Mono<MemberInfoVO> getMemberInfo(Long memberId);
-
-    /**
-     * 会员更新个人信息
-     * 
-     * @param memberId 会员ID
-     * @param updateDto 更新信息DTO
-     * @return 更新后的会员信息
-     */
-    Mono<MemberInfoVO> updateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto);
-
-    /**
-     * 管理端更新会员手机号
-     * 
-     * @param memberId 会员ID
-     * @param phone 明文手机号
-     * @return 是否成功
-     */
-    Mono<Boolean> adminUpdatePhone(Long memberId, String phone);
-
-    /**
-     * 管理端查询会员（es查询）
-     *
-     * @param searchMemberDto 会员信息dto
-     * @return 会员信息
-     */
-    Flux<MemberES> searchMember(SearchMemberDto searchMemberDto);
-
-    /**
-     * 管理端查询所有会员
-     *
-     * @param pageNum 页码
-     * @param pageSize 页大小
-     * @return 所有会员信息
-     */
-    Flux<Member> findAll(Integer pageNum, Integer pageSize);
-
-    /**
-     * 前台管理端获取会员详情（含会员卡信息）
-     *
-     * @param memberId 会员ID
-     * @return 会员详情
-     */
-    Mono<MemberDetailVO> getMemberDetail(Long memberId);
-
-    /**
-     * 前台管理端编辑会员信息
-     *
-     * @param memberId 会员ID
-     * @param updateDto 更新信息DTO
-     * @return 更新后的会员详情
-     */
-    Mono<Boolean> adminUpdateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto);
-}

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

@@ -1,48 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-
-/**
- * 微信API服务接口
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-public interface WechatApiService {
-
-    /**
-     * 小程序- 通过code获取session_key/openid
-     * 
-     * @param code 小程序登录的code
-     * @return Mono<Map<String, String>> session_keyopenidunionid
-     */
-    Mono<Map<String, String>> jsCode2Session(String code);
-
-    /**
-     * 获取手机号- 通过code获取手机号
-     * 
-     * @param code 小程序登录的code
-     * @return Mono<String> ܺ手机号
-     */
-    Mono<String> getPhoneNumber(String code);
-
-    /**
-     * 获取Access Token
-     * 
-     * @param appType 应用类型miniapp-小程序mp
-     * @return Mono<String> access_token
-     */
-    Mono<String> getAccessToken(String appType);
-
-    /**
-     * 验证签名
-     * 
-     * @param signature 微信签名
-     * @param timestamp 创建时间
-     * @param nonce 随机字符串
-     * @return boolean 签名是否有效
-     */
-    boolean checkSignature(String signature, String timestamp, String nonce);
-}

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

@@ -1,31 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.dto.WechatLoginDto;
-import cn.novalon.gym.manage.member.vo.WechatLoginVO;
-import reactor.core.publisher.Mono;
-
-/**
- * 微信授权服务接口
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-public interface WechatAuthService {
-
-    /**
-     * 小程序
-     *
-     * @param request 小程序登录请求
-     * @return 小程序登录响应
-     */
-    Mono<WechatLoginVO> miniappLogin(WechatLoginDto request);
-
-    /**
-     * 手机号
-     *
-     * @param memberId 会员ID
-     * @param code     微信手机号code
-     * @return 是否绑定成功
-     */
-    Mono<Boolean> bindPhone(Long memberId, String code);
-}

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

@@ -1,54 +0,0 @@
-package cn.novalon.gym.manage.member.service;
-
-import cn.novalon.gym.manage.member.vo.WechatUserInfoVO;
-import reactor.core.publisher.Mono;
-
-/**
- * 微信公众号服务接口
- * 
- * @author 付嘉
- * @date 2026-05-01
- */
-public interface WechatOfficialService {
-
-    /**
-     * 处理订阅事件
-     * 
-     * @param openId OpenID
-     * @return Mono<Void>
-     */
-    Mono<Void> handleSubscribeEvent(String openId);
-
-    /**
-     * 处理取消订阅事件
-     * 
-     * @param openId OpenID
-     * @return Mono<Void>
-     */
-    Mono<Void> handleUnsubscribeEvent(String openId);
-
-    /**
-     * 获取微信用户信息
-     * 
-     * @param openId OpenID
-     * @return Mono<WechatUserInfoVO> 用户信息
-     */
-    Mono<WechatUserInfoVO> getUserInfo(String openId);
-
-    /**
-     * 通过 UnionID 关联小程序用户
-     * 
-     * @param unionId 微信 UnionID
-     * @param officialOpenId OpenID
-     * @return Mono<Boolean> 是否关联成功
-     */
-    Mono<Boolean> linkByUnionId(String unionId, String officialOpenId);
-
-    /**
-      * 查询会员订阅状态
-     * 
-     * @param memberId 会员ID
-     * @return Mono<Boolean> true=已订阅false=未订阅
-     */
-    Mono<Boolean> checkSubscribeStatus(Long memberId);
-}

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

@@ -1,124 +0,0 @@
-package cn.novalon.gym.manage.member.service.impl;
-
-import cn.novalon.gym.manage.member.entity.MemberCardRecord;
-import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
-import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
-import cn.novalon.gym.manage.common.util.RedisUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡记录服务实现
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Service
-public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
-    private final MemberCardRecordRepository memberCardRecordRepository;
-    private final RedisUtil redisUtil;
-
-    private static final String MEMBER_CARD_RECORD_CACHE_PREFIX = "member:card:record:";
-    private static final long CACHE_EXPIRE_SECONDS = 300;
-
-    public MemberCardRecordServiceImpl(MemberCardRecordRepository memberCardRecordRepository, RedisUtil redisUtil) {
-        this.memberCardRecordRepository = memberCardRecordRepository;
-        this.redisUtil = redisUtil;
-    }
-
-    @Override
-    public Mono<MemberCardRecord> findById(Long recordId) {
-        String cacheKey = MEMBER_CARD_RECORD_CACHE_PREFIX + recordId;
-        Object cached = redisUtil.get(cacheKey);
-        if (cached != null && cached instanceof MemberCardRecord) {
-            log.debug("从缓存获取会员卡记录, recordId: {}", recordId);
-            return Mono.just((MemberCardRecord) cached);
-        }
-
-        return memberCardRecordRepository.findById(recordId)
-                .doOnSuccess(record -> {
-                    if (record != null) {
-                        redisUtil.setWithExpire(cacheKey, record, CACHE_EXPIRE_SECONDS);
-                    }
-                });
-    }
-
-    @Override
-    public Flux<MemberCardRecord> findByMemberId(Long memberId, Pageable pageable) {
-        return memberCardRecordRepository.findByMemberId(memberId, pageable);
-    }
-
-    @Override
-    public Flux<MemberCardRecord> findActiveCardsByMemberId(Long memberId) {
-        return memberCardRecordRepository.findActiveCardsByMemberId(memberId);
-    }
-
-    @Override
-    public Mono<MemberCardRecord> insertActiveRecord(MemberCardRecord record) {
-        return memberCardRecordRepository.insertActiveRecord(
-                record.getMemberId(),
-                record.getMemberCardId(),
-                record.getExpireTime(),
-                record.getRemainingTimes(),
-                record.getRemainingAmount(),
-                record.getSourceOrderId()
-        );
-    }
-
-    @Override
-    public Mono<Integer> deductUsage(Long recordId, Integer deductTimes, Double deductAmount) {
-        return memberCardRecordRepository.deductUsage(recordId, deductTimes, deductAmount)
-                .doOnSuccess(updated -> {
-                    if (updated > 0) {
-                        clearRecordCache(recordId);
-                    }
-                });
-    }
-
-    @Override
-    public Mono<Integer> renewCard(Long recordId, Integer addTimes, Double addAmount, LocalDateTime newExpireTime) {
-        return memberCardRecordRepository.renewCard(recordId, addTimes, addAmount, newExpireTime)
-                .doOnSuccess(updated -> {
-                    if (updated > 0) {
-                        clearRecordCache(recordId);
-                    }
-                });
-    }
-
-    @Override
-    public Mono<Integer> updateStatus(Long recordId, String status) {
-        return memberCardRecordRepository.updateStatus(recordId, status)
-                .doOnSuccess(updated -> {
-                    if (updated > 0) {
-                        clearRecordCache(recordId);
-                    }
-                });
-    }
-
-    @Override
-    public Mono<MemberCardRecord> validateCountCard(Long recordId, Integer requiredTimes) {
-        return memberCardRecordRepository.validateCountCard(recordId, requiredTimes);
-    }
-
-    @Override
-    public Mono<MemberCardRecord> validateStoredCard(Long recordId, Double requiredAmount) {
-        return memberCardRecordRepository.validateStoredCard(recordId, requiredAmount);
-    }
-
-    @Override
-    public Flux<MemberCardRecord> findExpiredCards() {
-        return memberCardRecordRepository.findExpiredCards();
-    }
-
-    private void clearRecordCache(Long recordId) {
-        String cacheKey = MEMBER_CARD_RECORD_CACHE_PREFIX + recordId;
-        redisUtil.delete(cacheKey);
-        log.debug("清除会员卡记录缓存, recordId: {}", recordId);
-    }
-}

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

@@ -1,363 +0,0 @@
-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;
-import cn.novalon.gym.manage.member.enums.CardEvent;
-import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus;
-import cn.novalon.gym.manage.member.enums.MemberCardType;
-import cn.novalon.gym.manage.member.enums.TransactionType;
-import cn.novalon.gym.manage.member.handler.DistributedLockService;
-import cn.novalon.gym.manage.member.handler.ExpirationReminderService;
-import cn.novalon.gym.manage.member.handler.MemberCardStateMachine;
-import cn.novalon.gym.manage.member.handler.RefundSagaHandler;
-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 lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡服务实现
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Service
-public class MemberCardServiceImpl implements IMemberCardService {
-    private final MemberCardRepository memberCardRepository;
-    private final MemberCardRecordRepository recordRepository;
-    private final IMemberCardTransactionService transactionService;
-    private final MemberCardStateMachine stateMachine;
-    private final DistributedLockService distributedLockService;
-    private final ExpirationReminderService expirationReminderService;
-    private final RefundSagaHandler refundSagaHandler;
-    private final RedisUtil redisUtil;
-
-    private static final String MEMBER_CARD_CACHE_PREFIX = "member:card:";
-    private static final long CACHE_EXPIRE_SECONDS = 300;
-
-    public MemberCardServiceImpl(MemberCardRepository memberCardRepository,
-                                 MemberCardRecordRepository recordRepository,
-                                 IMemberCardTransactionService transactionService,
-                                 MemberCardStateMachine stateMachine,
-                                 DistributedLockService distributedLockService,
-                                 ExpirationReminderService expirationReminderService,
-                                 RefundSagaHandler refundSagaHandler,
-                                 RedisUtil redisUtil) {
-        this.memberCardRepository = memberCardRepository;
-        this.recordRepository = recordRepository;
-        this.transactionService = transactionService;
-        this.stateMachine = stateMachine;
-        this.distributedLockService = distributedLockService;
-        this.expirationReminderService = expirationReminderService;
-        this.refundSagaHandler = refundSagaHandler;
-        this.redisUtil = redisUtil;
-    }
-
-    @Override
-    public Mono<MemberCard> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId) {
-        String cacheKey = MEMBER_CARD_CACHE_PREFIX + memberCardId;
-        Object cached = redisUtil.get(cacheKey);
-        if (cached != null && cached instanceof MemberCard) {
-            log.debug("从缓存获取会员卡信息, memberCardId: {}", memberCardId);
-            return Mono.just((MemberCard) cached);
-        }
-
-        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
-                .doOnSuccess(card -> {
-                    if (card != null) {
-                        redisUtil.setWithExpire(cacheKey, card, CACHE_EXPIRE_SECONDS);
-                    }
-                });
-    }
-
-    @Override
-    public Flux<MemberCard> findWithConditions(Integer status, String name, String type,
-                                               Double minPrice, Double maxPrice, Pageable pageable) {
-        return memberCardRepository.findWithConditions(status, name, type, minPrice, maxPrice, pageable);
-    }
-
-    @Override
-    public Mono<Long> countWithConditions(Integer status, String name, String type,
-                                          Double minPrice, Double maxPrice) {
-        return memberCardRepository.countWithConditions(status, name, type, minPrice, maxPrice);
-    }
-
-    @Override
-    public Flux<MemberCard> findByMemberCardStatusAndDeletedAtIsNull(Integer status, Pageable pageable) {
-        return memberCardRepository.findByMemberCardStatusAndDeletedAtIsNull(status, pageable);
-    }
-
-    @Override
-    public Mono<Boolean> existsPurchasedRecord(Long memberCardId) {
-        return memberCardRepository.existsPurchasedRecord(memberCardId);
-    }
-
-    @Override
-    public Mono<Integer> logicalDelete(Long memberCardId) {
-        return memberCardRepository.logicalDelete(memberCardId);
-    }
-
-    @Override
-    public Flux<MemberCard> findActiveCards(Integer status) {
-        return memberCardRepository.findActiveCards(status);
-    }
-
-    @Override
-    public Mono<MemberCard> save(MemberCard entity) {
-        return memberCardRepository.save(entity)
-                .doOnSuccess(saved -> {
-                    if (saved.getMemberCardId() != null) {
-                        clearCardCache(saved.getMemberCardId());
-                    }
-                });
-    }
-
-    @Override
-    public Mono<MemberCardRecord> purchaseCard(Long memberId, Long memberCardId, Long sourceOrderId) {
-        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                .flatMap(card -> {
-                    if (card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1) {
-                        return Mono.error(new RuntimeException("该会员卡已禁用"));
-                    }
-
-                    MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-
-                    return distributedLockService.executeWithLock(
-                            memberId.toString(),
-                            cardType.name(),
-                            Mono.defer(() -> createCardRecord(memberId, memberCardId, sourceOrderId, card))
-                    );
-                })
-                .flatMap(record -> createTransaction(record, TransactionType.PURCHASE, "购买会员卡")
-                        .thenReturn(record))
-                .flatMap(record -> expirationReminderService.scheduleExpirationReminder(record)
-                        .then(Mono.just(record)));
-    }
-
-    private Mono<MemberCardRecord> createCardRecord(Long memberId, Long memberCardId, 
-                                                      Long sourceOrderId, MemberCard card) {
-        return Mono.defer(() -> {
-            MemberCardRecord record = MemberCardRecord.builder()
-                    .memberId(memberId)
-                    .memberCardId(memberCardId)
-                    .sourceOrderId(sourceOrderId)
-                    .purchaseTime(LocalDateTime.now())
-                    .status(MemberCardRecordStatus.ACTIVE)
-                    .build();
-
-            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-            LocalDateTime now = LocalDateTime.now();
-
-            switch (cardType) {
-                case TIME_CARD:
-                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                    record.setRemainingTimes(0);
-                    record.setRemainingAmount(0.0);
-                    break;
-                case COUNT_CARD:
-                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                    record.setRemainingTimes(card.getMemberCardTotalTimes());
-                    record.setRemainingAmount(0.0);
-                    break;
-                case STORED_VALUE_CARD:
-                    record.setExpireTime(now.plusYears(1));
-                    record.setRemainingTimes(0);
-                    record.setRemainingAmount(card.getMemberCardAmount());
-                    break;
-                default:
-                    return Mono.error(new RuntimeException("不支持的会员卡类型"));
-            }
-
-            return recordRepository.insertActiveRecord(
-                    record.getMemberId(),
-                    record.getMemberCardId(),
-                    record.getExpireTime(),
-                    record.getRemainingTimes(),
-                    record.getRemainingAmount(),
-                    record.getSourceOrderId()
-            );
-        });
-    }
-
-    @Override
-    public Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, 
-                                             Integer addDays, Long sourceOrderId) {
-        return recordRepository.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(originalRecord -> stateMachine.validateTransition(originalRecord, CardEvent.RENEW)
-                        .then(Mono.just(originalRecord)))
-                .flatMap(originalRecord -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(originalRecord.getMemberCardId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                        .flatMap(card -> {
-                            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-
-                            return distributedLockService.executeWithLock(
-                                    originalRecord.getMemberId().toString(),
-                                    cardType.name(),
-                                    Mono.defer(() -> doRenewCard(originalRecord, card, addTimes, addAmount, addDays))
-                            );
-                        }));
-    }
-
-     private Mono<MemberCardRecord> doRenewCard(MemberCardRecord record, MemberCard card, 
-                                                Integer addTimes, Double addAmount, Integer addDays) {
-        LocalDateTime now = LocalDateTime.now();
-        MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-
-        switch (cardType) {
-            case TIME_CARD:
-                LocalDateTime currentExpire = record.getExpireTime();
-                LocalDateTime baseTime = (currentExpire != null && currentExpire.isAfter(now)) ? currentExpire : now;
-                int daysToAdd = addDays != null ? addDays : card.getMemberCardValidityDays();
-                record.setExpireTime(baseTime.plusDays(daysToAdd));
-                break;
-            case COUNT_CARD:
-                int currentTimes = record.getRemainingTimes() != null ? record.getRemainingTimes() : 0;
-                int timesToAdd = addTimes != null ? addTimes : card.getMemberCardTotalTimes();
-                record.setRemainingTimes(currentTimes + timesToAdd);
-                if (MemberCardRecordStatus.USED_UP.equals(record.getStatus())) {
-                    record.setStatus(MemberCardRecordStatus.ACTIVE);
-                }
-                break;
-            case STORED_VALUE_CARD:
-                double currentAmount = record.getRemainingAmount() != null ? record.getRemainingAmount() : 0.0;
-                double amountToAdd = addAmount != null ? addAmount : card.getMemberCardAmount();
-                record.setRemainingAmount(currentAmount + amountToAdd);
-                if (MemberCardRecordStatus.USED_UP.equals(record.getStatus())) {
-                    record.setStatus(MemberCardRecordStatus.ACTIVE);
-                }
-                break;
-            default:
-                return Mono.error(new RuntimeException("不支持的会员卡类型"));
-        }
-
-        return recordRepository.save(record)
-                .flatMap(updatedRecord -> createTransaction(updatedRecord, TransactionType.RENEW, "续费会员卡")
-                        .then(expirationReminderService.scheduleExpirationReminder(updatedRecord))
-                        .thenReturn(updatedRecord));
-    }
-
-    @Override
-    public Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount) {
-        return recordRepository.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> stateMachine.validateTransition(record, CardEvent.USE)
-                        .then(Mono.just(record)))
-                .flatMap(record -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                        .flatMap(card -> {
-                            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-
-                            return distributedLockService.executeWithLock(
-                                record.getMemberId().toString(),
-                                cardType.name(),
-                                Mono.defer(() -> doUseCard(record, card, deductTimes, deductAmount))
-                            );
-                        }));
-    }
-
-    private Mono<MemberCardRecord> doUseCard(MemberCardRecord record, MemberCard card, 
-                                              Integer deductTimes, Double deductAmount) {
-        if (!MemberCardRecordStatus.ACTIVE.name().equals(record.getStatus())) {
-            return Mono.error(new RuntimeException("会员卡状态不正确"));
-        }
-
-        MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-        LocalDateTime now = LocalDateTime.now();
-
-        switch (cardType) {
-            case TIME_CARD:
-                if (record.getExpireTime() != null && record.getExpireTime().isBefore(now)) {
-                    return Mono.error(new RuntimeException("会员卡已过期"));
-                }
-                break;
-            case COUNT_CARD:
-                int currentTimes = record.getRemainingTimes() != null ? record.getRemainingTimes() : 0;
-                int timesToDeduct = deductTimes != null ? deductTimes : 1;
-                if (currentTimes < timesToDeduct) {
-                    return Mono.error(new RuntimeException("剩余次数不足"));
-                }
-                record.setRemainingTimes(currentTimes - timesToDeduct);
-                if (record.getRemainingTimes() == 0) {
-                    record.setStatus(MemberCardRecordStatus.USED_UP);
-                }
-                break;
-            case STORED_VALUE_CARD:
-                double currentAmount = record.getRemainingAmount() != null ? record.getRemainingAmount() : 0.0;
-                double amountToDeduct = deductAmount != null ? deductAmount : 0.0;
-                if (currentAmount < amountToDeduct) {
-                    return Mono.error(new RuntimeException("余额不足"));
-                }
-                record.setRemainingAmount(currentAmount - amountToDeduct);
-                if (record.getRemainingAmount() == 0) {
-                    record.setStatus(MemberCardRecordStatus.USED_UP);
-                }
-                break;
-            default:
-                return Mono.error(new RuntimeException("不支持的会员卡类型"));
-        }
-
-        return recordRepository.save(record)
-                .flatMap(updatedRecord -> createTransaction(updatedRecord, TransactionType.DEDUCT, "使用会员卡")
-                        .thenReturn(updatedRecord));
-    }
-
-    @Override
-    public Mono<Void> refundCard(Long recordId) {
-        return recordRepository.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                        .flatMap(card -> {
-                            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-                            return distributedLockService.executeWithLock(
-                                record.getMemberId().toString(),
-                                cardType.name(),
-                                refundSagaHandler.executeRefund(recordId)
-                            );
-                        }));
-    }
-
-    @Override
-    public Mono<Integer> processExpiredCards() {
-        return recordRepository.findExpiredCards()
-            .flatMap(record -> stateMachine.transition(record.getStatus(), CardEvent.EXPIRE)
-                .flatMap(newState -> recordRepository.updateStatus(
-                    record.getMemberCardRecordId(), newState.name())))
-            .reduce(0, (count, result) -> count + 1)
-            .doOnSuccess(count -> log.info("处理过期会员卡完成，共处理{}条", count));
-    }
-
-    private Mono<Void> createTransaction(MemberCardRecord record, TransactionType action, String remark) {
-        MemberCardTransaction transaction = MemberCardTransaction.builder()
-                .memberId(record.getMemberId())
-                .memberCardId(record.getMemberCardId())
-                .operationType(action.name())
-                .changeAmount(record.getRemainingTimes())
-                .changeBalance(record.getRemainingAmount())
-                .afterRemainingCount(record.getRemainingTimes())
-                .afterRemainingBalance(record.getRemainingAmount())
-                .remark(remark)
-                .build();
-
-        return transactionService.createTransaction(transaction);
-    }
-
-    private void clearCardCache(Long memberCardId) {
-        String cacheKey = MEMBER_CARD_CACHE_PREFIX + memberCardId;
-        redisUtil.delete(cacheKey);
-        log.debug("清除会员卡缓存, memberCardId: {}", memberCardId);
-    }
-}

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

@@ -1,109 +0,0 @@
-package cn.novalon.gym.manage.member.service.impl;
-
-import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
-import cn.novalon.gym.manage.member.enums.TransactionType;
-import cn.novalon.gym.manage.member.repository.MemberCardTransactionRepository;
-import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-/**
- * 会员卡交易流水服务实现
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
-@Slf4j
-@Service
-public class MemberCardTransactionServiceImpl implements IMemberCardTransactionService {
-    private final MemberCardTransactionRepository transactionRepository;
-
-    public MemberCardTransactionServiceImpl(MemberCardTransactionRepository transactionRepository) {
-        this.transactionRepository = transactionRepository;
-    }
-
-    @Override
-    public Mono<MemberCardTransaction> insertTransaction(MemberCardTransaction transaction) {
-        return transactionRepository.insertTransaction(
-                transaction.getMemberCardRecordId(),
-                transaction.getMemberCardId(),
-                transaction.getMemberId(),
-                transaction.getOperationType(),
-                transaction.getChangeAmount(),
-                transaction.getChangeBalance(),
-                transaction.getAfterRemainingCount(),
-                transaction.getAfterRemainingBalance(),
-                transaction.getRelatedBizType(),
-                transaction.getSourceOrderId(),
-                transaction.getRemark()
-        );
-    }
-
-    @Override
-    public Flux<MemberCardTransaction> findByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime,
-                                                                   LocalDateTime endTime, Pageable pageable) {
-        return transactionRepository.findByMemberIdAndTimeRange(memberId, startTime, endTime, pageable);
-    }
-
-    @Override
-    public Flux<MemberCardTransaction> findWithConditions(Long memberId, Long memberCardId,
-                                                          TransactionType operationType,
-                                                          LocalDateTime startTime, LocalDateTime endTime,
-                                                          Pageable pageable) {
-        return transactionRepository.findWithConditions(memberId, memberCardId, 
-                operationType != null ? operationType.name() : null,
-                startTime, endTime, pageable);
-    }
-
-    @Override
-    public Mono<Long> countWithConditions(Long memberId, Long memberCardId,
-                                          TransactionType operationType,
-                                          LocalDateTime startTime, LocalDateTime endTime) {
-        return transactionRepository.countWithConditions(memberId, memberCardId,
-                operationType != null ? operationType.name() : null,
-                startTime, endTime);
-    }
-
-    @Override
-    public Flux<MemberCardTransaction> findByMemberCardId(Long memberCardId) {
-        return transactionRepository.findByMemberCardId(memberCardId);
-    }
-
-    @Override
-    public Mono<Long> sumDeductCountByCardId(Long memberCardId, LocalDateTime startTime, LocalDateTime endTime) {
-        return transactionRepository.sumDeductCountByCardId(memberCardId, startTime, endTime);
-    }
-
-    @Override
-    public Mono<Double> sumRenewAmountByTimeRange(LocalDateTime startTime, LocalDateTime endTime) {
-        return transactionRepository.sumRenewAmountByTimeRange(startTime, endTime);
-    }
-
-    @Override
-    public Mono<Double> sumPurchaseAmountByMemberId(Long memberId, LocalDateTime startTime, LocalDateTime endTime) {
-        return transactionRepository.sumPurchaseAmountByMemberId(memberId, startTime, endTime);
-    }
-
-    @Override
-    public Mono<Void> createTransaction(MemberCardTransaction transaction) {
-        return transactionRepository.save(transaction)
-                .then()
-                .doOnSuccess(v -> log.info("创建会员卡交易记录: memberId={}, cardId={}, type={}",
-                        transaction.getMemberId(), transaction.getMemberCardId(), transaction.getOperationType()));
-    }
-
-    @Override
-    public Flux<MemberCardTransaction> findByMemberId(Long memberId) {
-        return transactionRepository.findByMemberId(memberId);
-    }
-
-    @Override
-    public Flux<MemberCardTransaction> findByRecordId(Long recordId) {
-        return transactionRepository.findByRecordId(recordId);
-    }
-}

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

@@ -1,349 +0,0 @@
-package cn.novalon.gym.manage.member.service.impl;
-
-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.dto.SearchMemberDto;
-import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
-import cn.novalon.gym.manage.member.entity.Member;
-import cn.novalon.gym.manage.member.enums.GenderEnum;
-import cn.novalon.gym.manage.member.enums.MemberCardType;
-import cn.novalon.gym.manage.member.es.entity.MemberES;
-import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
-import cn.novalon.gym.manage.member.repository.IMemberRepository;
-import cn.novalon.gym.manage.member.service.MemberService;
-import cn.novalon.gym.manage.member.util.AesUtil;
-import cn.novalon.gym.manage.member.util.BeanConvertUtil;
-import cn.novalon.gym.manage.member.util.EsSyncUtils;
-import cn.novalon.gym.manage.common.util.RedisUtil;
-import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
-import cn.novalon.gym.manage.member.vo.MemberDetailVO;
-import cn.novalon.gym.manage.member.vo.MemberInfoVO;
-import 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;
-
-/**
- * 会员服务实现
- *
- * @author 付嘉
- * @date 2026-05-01
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class MemberServiceImpl implements MemberService {
-
-    private final IMemberRepository memberRepository;
-    private final MemberESRepository memberESRepository;
-    private final EsSyncUtils esSyncUtils;
-    private final RedisUtil redisUtil;
-
-    private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
-
-    private static final String MEMBER_INFO_CACHE_PREFIX = "member:info:";
-    private static final String MEMBER_DETAIL_CACHE_PREFIX = "member:detail:";
-    private static final long CACHE_EXPIRE_SECONDS = 300;
-
-    @PostConstruct
-    public void init() {
-        this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
-    }
-
-    @Override
-    public Mono<MemberInfoVO> getMemberInfo(Long memberId) {
-        String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
-
-        return redisUtil.get(cacheKey, MemberInfoVO.class)
-                .flatMap(cached -> {
-                    if (cached != null) {
-                        log.debug("从缓存获取会员信息, memberId: {}", memberId);
-                        return Mono.just(cached);
-                    }
-                    return memberRepository.findById(memberId)
-                            .map(this::buildMemberInfoResponse)
-                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
-                                    .then(Mono.just(vo)))
-                            .switchIfEmpty(Mono.error(() -> {
-                                log.error("会员不存在: memberId={}", memberId);
-                                throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
-                            }));
-                });
-    }
-
-    @Override
-    public Mono<MemberInfoVO> updateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto) {
-        log.info("会员更新个人信息, memberId: {}", memberId);
-
-        return memberRepository.findById(memberId)
-                .flatMap(member -> {
-                    if (updateDto.getNickname() != null) {
-                        member.setNickname(HtmlEscapeUtil.escape(updateDto.getNickname()));
-                    }
-                    if (updateDto.getGender() != null) {
-                        member.setGender(updateDto.getGender().getCode());
-                    }
-                    if (updateDto.getBirthday() != null) {
-                        member.setBirthday(updateDto.getBirthday());
-                    }
-                    if (updateDto.getAvatar() != null) {
-                        member.setAvatar(updateDto.getAvatar());
-                    }
-                    if (updateDto.getAddress() != null) {
-                        member.setAddress(HtmlEscapeUtil.escape(updateDto.getAddress()));
-                    }
-
-                    return memberRepository.save(member);
-                })
-                .flatMap(savedMember -> {
-                    memberSyncer.sync(savedMember);
-                    return clearMemberCache(memberId)
-                            .then(Mono.just(savedMember));
-                })
-                .map(savedMember -> {
-                    log.info("会员信息更新成功, memberId: {}", savedMember.getId());
-                    return buildMemberInfoResponse(savedMember);
-                })
-                .switchIfEmpty(Mono.error(() -> {
-                    log.error("会员不存在: memberId={}", memberId);
-                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
-                }));
-    }
-
-    private MemberInfoVO buildMemberInfoResponse(Member member) {
-        String phone = member.getPhone();
-        String maskedPhone = phone != null ? phone.replace(phone.substring(3, 7), "****") : null;
-
-        GenderEnum genderEnum = GenderEnum.fromCode(member.getGender());
-
-        return MemberInfoVO.builder()
-                .id(member.getId())
-                .nickname(member.getNickname())
-                .phone(maskedPhone)
-                .gender(genderEnum)
-                .genderDesc(genderEnum.getDesc())
-                .birthday(member.getBirthday())
-                .avatar(member.getAvatar())
-                .hasPhone(phone != null)
-                .isSubscribed(member.getSubscribed() != null && member.getSubscribed())
-                .build();
-    }
-
-    @Override
-    public Mono<Boolean> adminUpdatePhone(Long memberId, String phone) {
-        log.info("管理端录入手机号, memberId: {}, phone: {}", memberId, phone);
-
-        String encryptedPhone;
-        try {
-            encryptedPhone = AesUtil.encrypt(phone);
-            log.info("手机号加密成功");
-        } catch (Exception e) {
-            log.error("手机号加密失败", e);
-            throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败: " + e.getMessage());
-        }
-
-        return memberRepository.findByPhone(encryptedPhone)
-                .<Boolean>flatMap(existingMember -> {
-                    if (existingMember.getId().equals(memberId)) {
-                        log.warn("手机号已是当前用户的: memberId={}", memberId);
-                        throw new ConflictException(ErrorCode.CONFLICT_DUPLICATE_USER, "重复绑定");
-                    } else {
-                        log.warn("手机号已被其他用户绑定: memberId={}, existingMemberId={}",
-                                memberId, existingMember.getId());
-                        throw new ConflictException(ErrorCode.CONFLICT_DUPLICATE_USER, "该手机号已被其他会员绑定");
-                    }
-                })
-                .switchIfEmpty(Mono.defer(() -> {
-                    log.info("手机号未被占用，可以绑定");
-                    return updateMemberPhone(memberId, encryptedPhone);
-                }));
-    }
-
-    @Override
-    public Flux<MemberES> searchMember(SearchMemberDto searchMemberDto) {
-        log.info("搜索会员, searchValue: {}, pageNum: {}, pageSize: {}",
-                searchMemberDto.getSearchValue(),
-                searchMemberDto.getPageNum(),
-                searchMemberDto.getPageSize());
-
-        String searchValue = searchMemberDto.getSearchValue();
-
-        if (searchValue != null && searchValue.matches("^1[3-9]\\d{9}$")) {
-            log.debug("搜索值为手机号格式，进行加密处理");
-            searchValue = AesUtil.encrypt(searchValue);
-        }
-
-        Pageable pageable = PageRequest.of(
-                searchMemberDto.getPageNum() - 1,
-                searchMemberDto.getPageSize()
-        );
-
-        if (searchValue == null) {
-            log.warn("搜索值为空，返回空结果");
-            return Flux.empty();
-        }
-
-        return memberESRepository.findByMemberNoOrPhoneOrNicknameContaining(
-                searchValue,
-                searchValue,
-                searchValue,
-                pageable
-        );
-    }
-
-    @Override
-    public Flux<Member> findAll(Integer pageNum, Integer pageSize) {
-        log.info("查询所有会员列表, pageNum: {}, pageSize: {}", pageNum, pageSize);
-
-        Pageable pageable = PageRequest.of(
-                pageNum - 1,
-                pageSize
-        );
-
-        return memberRepository.findAllBy(pageable);
-    }
-
-    @Override
-    public Mono<MemberDetailVO> getMemberDetail(Long memberId) {
-        log.info("查询会员详情, memberId: {}", memberId);
-
-        String cacheKey = MEMBER_DETAIL_CACHE_PREFIX + memberId;
-
-        return redisUtil.get(cacheKey, MemberDetailVO.class)
-                .flatMap(cached -> {
-                    if (cached != null) {
-                        log.debug("从缓存获取会员详情, memberId: {}", memberId);
-                        return Mono.just(cached);
-                    }
-                    return memberRepository.findById(memberId)
-                            .zipWith(
-                                    memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
-                                            .collectList(),
-                                    (baseInfo, cardList) -> {
-                                        MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
-
-                                        GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
-                                        memberDetailVO.setGenderDesc(genderEnum.getDesc());
-
-                                        List<MemberCardInfoVO> enrichedCards = cardList.stream()
-                                                .peek(vo -> {
-                                                    if (vo.getMemberCardType() != null) {
-                                                        try {
-                                                            MemberCardType cardType = MemberCardType.valueOf(vo.getMemberCardType());
-                                                            vo.setMemberCardTypeDesc(cardType.getDesc());
-                                                        } catch (IllegalArgumentException e) {
-                                                            vo.setMemberCardTypeDesc(vo.getMemberCardType());
-                                                        }
-                                                    }
-                                                    if (vo.getMemberCardStatus() != null) {
-                                                        vo.setMemberCardStatusDesc(vo.getMemberCardStatus() == 1 ? "上架" : "下架");
-                                                    }
-                                                })
-                                                .collect(Collectors.toList());
-                                        memberDetailVO.setMemberCards(enrichedCards);
-
-                                        long activeCount = enrichedCards.stream()
-                                                .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
-                                                .count();
-                                        memberDetailVO.setActiveCardCount((int) activeCount);
-                                        memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
-
-                                        return memberDetailVO;
-                                    }
-                            )
-                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
-                                    .then(Mono.just(vo)));
-                });
-    }
-
-
-    @Override
-    public Mono<Boolean> adminUpdateMemberInfo(Long memberId, UpdateMemberInfoDto updateDto) {
-        log.info("前台管理端编辑会员信息, memberId: {}", memberId);
-
-        return memberRepository.findById(memberId)
-                .switchIfEmpty(Mono.error(() -> {
-                    log.error("会员不存在: memberId={}", memberId);
-                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
-                }))
-                .flatMap(member -> {
-                    if (updateDto.getNickname() != null) {
-                        member.setNickname(HtmlEscapeUtil.escape(updateDto.getNickname()));
-                    }
-                    if (updateDto.getGender() != null) {
-                        member.setGender(updateDto.getGender().getCode());
-                    }
-                    if (updateDto.getBirthday() != null) {
-                        member.setBirthday(updateDto.getBirthday());
-                    }
-                    if (updateDto.getAvatar() != null) {
-                        member.setAvatar(updateDto.getAvatar());
-                    }
-                    if (updateDto.getAddress() != null) {
-                        member.setAddress(HtmlEscapeUtil.escape(updateDto.getAddress()));
-                    }
-
-                    return memberRepository.save(member);
-                })
-                .flatMap(savedMember -> {
-                    memberSyncer.sync(savedMember);
-                    return clearMemberCache(memberId)
-                            .then(Mono.just(true));
-                })
-                .onErrorResume(e -> {
-                    log.error("编辑会员信息失败, memberId: {}, error: {}", memberId, e.getMessage(), e);
-                    return Mono.just(false);
-                });
-    }
-
-    private Mono<Boolean> updateMemberPhone(Long memberId, String encryptedPhone) {
-        return memberRepository.findById(memberId)
-                .flatMap(member -> {
-                    member.setPhone(encryptedPhone);
-                    member.setLastLoginAt(LocalDateTime.now());
-
-                    return memberRepository.save(member)
-                            .flatMap(savedMember -> {
-                                memberSyncer.sync(savedMember);
-                                return clearMemberCache(memberId)
-                                        .then(Mono.just(savedMember));
-                            })
-                            .map(savedMember -> {
-                                log.info("手机号录入成功, memberId: {}", savedMember.getId());
-                                return true;
-                            });
-                })
-                .switchIfEmpty(Mono.error(() -> {
-                    log.error("会员不存在: memberId={}", memberId);
-                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
-                }));
-    }
-
-    private Mono<Long> clearMemberCache(Long memberId) {
-        String infoCacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;
-        String detailCacheKey = MEMBER_DETAIL_CACHE_PREFIX + memberId;
-        return redisUtil.delete(infoCacheKey)
-                .then(redisUtil.delete(detailCacheKey))
-                .doOnSuccess(result -> log.debug("清除会员缓存, memberId: {}", memberId));
-    }
-}