Merge branch 'feature/member-register' of https://git.f.novalon.cn/novalon/gym-manage into feature/member-register

登录
新增功能：团课签到前验证是否到店签到
2026-06-23 22:48:21 +08:00 · 2026-06-23 22:47:35 +08:00 · 2026-06-18 10:48:23 +08:00 · 2026-06-18 10:11:47 +08:00 · 2026-06-15 16:43:12 +08:00 · 2026-06-15 14:09:19 +08:00
292 changed files with 5125 additions and 41869 deletions
@@ -0,0 +1,202 @@
+import java.util.Base64;
+import java.math.BigInteger;
+import java.io.ByteArrayInputStream;
+
+public class KeyAnalyzer {
+    public static void main(String[] args) {
+        String privateKeyBase64 = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
+        
+        System.out.println("========== 密钥分析开始 ==========");
+        System.out.println("密钥长度: " + privateKeyBase64.length());
+        
+        byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
+        System.out.println("解码后长度: " + keyBytes.length + " bytes");
+        
+        // 打印前30字节
+        System.out.print("前30字节(hex): ");
+        for (int i = 0; i < 30 && i < keyBytes.length; i++) {
+            System.out.printf("%02X ", keyBytes[i]);
+        }
+        System.out.println();
+        
+        // 解析ASN.1结构
+        try {
+            parseASN1(keyBytes);
+        } catch (Exception e) {
+            System.out.println("解析失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    
+    static void parseASN1(byte[] keyBytes) throws Exception {
+        ByteArrayInputStream bis = new ByteArrayInputStream(keyBytes);
+        
+        // 读取SEQUENCE
+        int tag = bis.read();
+        System.out.println("第一个tag: 0x" + Integer.toHexString(tag));
+        
+        if (tag == 0x30) {
+            System.out.println("这是SEQUENCE");
+            
+            // 读取长度
+            int len = readASN1Length(bis);
+            System.out.println("SEQUENCE长度: " + len);
+            
+            // 检查下一个tag
+            int nextTag = bis.read();
+            System.out.println("下一个tag: 0x" + Integer.toHexString(nextTag));
+            
+            if (nextTag == 0x02) {
+                // INTEGER
+                int intLen = readASN1Length(bis);
+                byte[] versionBytes = new byte[intLen];
+                bis.read(versionBytes);
+                int version = new BigInteger(versionBytes).intValue();
+                System.out.println("版本INTEGER值: " + version);
+                
+                // 检查这是PKCS#8还是PKCS#1
+                // PKCS#8: version=0后是SEQUENCE(算法标识符)
+                // PKCS#1: version=0后是INTEGER(modulus)
+                int afterVersionTag = bis.read();
+                System.out.println("版本后的tag: 0x" + Integer.toHexString(afterVersionTag));
+                
+                if (afterVersionTag == 0x30) {
+                    System.out.println(">>> 这是PKCS#8格式 (version后是SEQUENCE)");
+                    
+                    // 解析PKCS#8
+                    // AlgorithmIdentifier: SEQUENCE { OID, NULL }
+                    int algLen = readASN1Length(bis);
+                    System.out.println("AlgorithmIdentifier长度: " + algLen);
+                    
+                    // 跳过AlgorithmIdentifier内容
+                    byte[] algBytes = new byte[algLen];
+                    bis.read(algBytes);
+                    
+                    // 打印OID
+                    System.out.print("OID bytes: ");
+                    for (int i = 0; i < algBytes.length; i++) {
+                        System.out.printf("%02X ", algBytes[i]);
+                    }
+                    System.out.println();
+                    
+                    // 下一个应该是OCTET STRING (包含私钥)
+                    int octetTag = bis.read();
+                    System.out.println("下一个tag: 0x" + Integer.toHexString(octetTag));
+                    
+                    if (octetTag == 0x04) {
+                        System.out.println("这是OCTET STRING (包含私钥数据)");
+                        int octetLen = readASN1Length(bis);
+                        System.out.println("OCTET STRING长度: " + octetLen);
+                        
+                        // OCTET STRING内容是PKCS#1私钥
+                        byte[] pkcs1Bytes = new byte[octetLen];
+                        bis.read(pkcs1Bytes);
+                        
+                        System.out.print("PKCS#1私钥前20字节: ");
+                        for (int i = 0; i < 20; i++) {
+                            System.out.printf("%02X ", pkcs1Bytes[i]);
+                        }
+                        System.out.println();
+                        
+                        // 解析PKCS#1私钥
+                        ByteArrayInputStream pkcs1Stream = new ByteArrayInputStream(pkcs1Bytes);
+                        int pkcs1Tag = pkcs1Stream.read();
+                        System.out.println("PKCS#1第一个tag: 0x" + Integer.toHexString(pkcs1Tag));
+                        
+                        if (pkcs1Tag == 0x30) {
+                            int pkcs1Len = readASN1Length(pkcs1Stream);
+                            System.out.println("PKCS#1 SEQUENCE长度: " + pkcs1Len);
+                            
+                            // version
+                            int vTag = pkcs1Stream.read();
+                            int vLen = readASN1Length(pkcs1Stream);
+                            byte[] vBytes = new byte[vLen];
+                            pkcs1Stream.read(vBytes);
+                            System.out.println("PKCS#1版本: " + new BigInteger(vBytes));
+                            
+                            // 解析私钥参数
+                            parsePKCS1(pkcs1Stream);
+                        }
+                    }
+                } else if (afterVersionTag == 0x02) {
+                    System.out.println(">>> 这是PKCS#1格式 (version后是INTEGER)");
+                    
+                    // 继续解析PKCS#1
+                    parsePKCS1(bis);
+                } else {
+                    System.out.println(">>> 未知格式 (tag: 0x" + Integer.toHexString(afterVersionTag) + ")");
+                }
+            }
+        }
+    }
+    
+    static void parsePKCS1(ByteArrayInputStream bis) throws Exception {
+        System.out.println("\n========== 解析PKCS#1私钥参数 ==========");
+        
+        // modulus
+        BigInteger modulus = readASN1Integer(bis);
+        System.out.println("modulus长度: " + modulus.bitLength() + " bits");
+        
+        // publicExponent
+        BigInteger publicExponent = readASN1Integer(bis);
+        System.out.println("publicExponent: " + publicExponent);
+        
+        // privateExponent
+        BigInteger privateExponent = readASN1Integer(bis);
+        System.out.println("privateExponent长度: " + privateExponent.bitLength() + " bits");
+        
+        // prime1
+        BigInteger prime1 = readASN1Integer(bis);
+        System.out.println("prime1长度: " + prime1.bitLength() + " bits");
+        
+        // prime2
+        BigInteger prime2 = readASN1Integer(bis);
+        System.out.println("prime2长度: " + prime2.bitLength() + " bits");
+        
+        // 验证 prime1 * prime2 == modulus
+        BigInteger calculatedModulus = prime1.multiply(prime2);
+        boolean valid = calculatedModulus.equals(modulus);
+        System.out.println("\n验证 prime1 * prime2 == modulus: " + valid);
+        
+        if (!valid) {
+            System.out.println(">>> 密钥数学关系不正确！这是无效的RSA私钥");
+            System.out.println("计算得到的modulus长度: " + calculatedModulus.bitLength() + " bits");
+        }
+        
+        // exponent1
+        BigInteger exponent1 = readASN1Integer(bis);
+        System.out.println("exponent1长度: " + exponent1.bitLength() + " bits");
+        
+        // exponent2
+        BigInteger exponent2 = readASN1Integer(bis);
+        System.out.println("exponent2长度: " + exponent2.bitLength() + " bits");
+        
+        // coefficient
+        BigInteger coefficient = readASN1Integer(bis);
+        System.out.println("coefficient长度: " + coefficient.bitLength() + " bits");
+        
+        System.out.println("\n========== 解析完成 ==========");
+    }
+    
+    static int readASN1Length(ByteArrayInputStream bis) throws Exception {
+        int firstByte = bis.read();
+        if ((firstByte & 0x80) == 0) {
+            return firstByte;
+        }
+        int numBytes = firstByte & 0x7F;
+        int length = 0;
+        for (int i = 0; i < numBytes; i++) {
+            length = (length << 8) | (bis.read() & 0xFF);
+        }
+        return length;
+    }
+    
+    static BigInteger readASN1Integer(ByteArrayInputStream bis) throws Exception {
+        int tag = bis.read();
+        if (tag != 0x02) throw new Exception("期望INTEGER tag: 0x02, 实际: 0x" + Integer.toHexString(tag));
+        int len = readASN1Length(bis);
+        byte[] data = new byte[len];
+        bis.read(data);
+        return new BigInteger(1, data);
+    }
+}
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Created-By: Maven JAR Plugin 3.4.2
+Build-Jdk-Spec: 21
+Implementation-Title: Gym Payment
+Implementation-Version: 1.0.0
+
@@ -0,0 +1,3 @@
+artifactId=gym-payment
+groupId=cn.novalon.gym.manage
+version=1.0.0
@@ -0,0 +1,85 @@
+
+<?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-payment</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Payment</name>
+    <description>Payment Module - Integrates Huifu Payment Gateway</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1 @@
+cn.novalon.gym.manage.payment.config.HuifuPayConfig
@@ -14,6 +14,7 @@
 3. [团课管理接口](#团课管理接口)
   - [获取所有团课](#获取所有团课)
   - [分页获取团课](#分页获取团课)
+   - [多条件查询团课](#多条件查询团课)
   - [根据ID获取团课详情](#根据ID获取团课详情)
   - [创建团课](#创建团课)
   - [更新团课](#更新团课)
@@ -154,6 +155,149 @@

 ---

+### 多条件查询团课
+
+| 属性 | 值 |
+|------|-----|
+| **HTTP方法** | POST |
+| **接口路径** | `/api/groupCourse/search` |
+| **所属文件** | `GroupCourseHandler.java` |
+
+**功能说明**: 支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询，默认不查询不可预约的团课（已取消或已结束）。
+
+**请求体**:
+
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+|--------|------|------|--------|------|
+| courseName | String | 否 | - | 课程名称（模糊查询，不区分大小写） |
+| courseType | Long | 否 | - | 课程类型ID |
+| startDate | LocalDateTime | 否 | - | 查询开始日期 |
+| endDate | LocalDateTime | 否 | - | 查询结束日期 |
+| timePeriod | String | 否 | - | 时间段：`morning`(6:00-12:00)、`afternoon`(12:00-18:00)、`evening`(18:00-24:00) |
+| priceSort | String | 否 | - | 价格排序：`asc`(从低到高)、`desc`(从高到低) |
+| remainingMost | Boolean | 否 | false | 是否按剩余名额最多排序 |
+| page | Integer | 否 | 0 | 页码，从0开始 |
+| size | Integer | 否 | 10 | 每页数量，最大100 |
+
+**查询条件优先级说明**:
+
+| 优先级 | 条件类型 | 说明 |
+|--------|----------|------|
+| 1 | 默认过滤 | 自动过滤已删除和不可预约的团课（status != 0） |
+| 2 | 基础筛选 | courseName、courseType、startDate、endDate、timePeriod |
+| 3 | 排序规则 | remainingMost优先，其次priceSort，默认按startTime升序 |
+
+**成功响应** (200 OK):
+
+```json
+{
+  "success": true,
+  "message": "查询成功",
+  "data": {
+    "content": [
+      {
+        "id": 1,
+        "courseName": "瑜伽入门",
+        "coachId": 1,
+        "courseType": 1,
+        "startTime": "2026-06-15T09:00:00",
+        "endTime": "2026-06-15T10:00:00",
+        "maxMembers": 20,
+        "currentMembers": 5,
+        "status": 0,
+        "location": "健身房A区",
+        "coverImage": "https://example.com/yoga.jpg",
+        "description": "适合初学者的瑜伽课程",
+        "pointCardAmount": 1,
+        "storedValueAmount": 50.00,
+        "createdAt": "2026-06-01T10:00:00",
+        "updatedAt": "2026-06-01T10:00:00"
+      }
+    ],
+    "totalPages": 3,
+    "totalElements": 25,
+    "currentPage": 0,
+    "pageSize": 10,
+    "first": true,
+    "last": false
+  }
+}
+```
+
+**失败响应** (400 Bad Request):
+
+```json
+{
+  "success": false,
+  "message": "查询失败的原因"
+}
+```
+
+**使用示例**:
+
+1. **查询瑜伽课程**
+```json
+{
+  "courseName": "瑜伽"
+}
+```
+
+2. **查询特定类型的早晨课程**
+```json
+{
+  "courseType": 1,
+  "timePeriod": "morning"
+}
+```
+
+3. **查询下周的课程，按价格从低到高排序**
+```json
+{
+  "startDate": "2026-06-16T00:00:00",
+  "endDate": "2026-06-22T23:59:59",
+  "priceSort": "asc"
+}
+```
+
+4. **查询剩余名额最多的晚间课程**
+```json
+{
+  "timePeriod": "evening",
+  "remainingMost": true
+}
+```
+
+5. **多条件组合查询**
+```json
+{
+  "courseName": "瑜伽",
+  "courseType": 1,
+  "startDate": "2026-06-01T00:00:00",
+  "endDate": "2026-06-30T23:59:59",
+  "timePeriod": "morning",
+  "priceSort": "asc",
+  "remainingMost": true,
+  "page": 0,
+  "size": 10
+}
+```
+
+---
+
 ### 根据ID获取团课详情

 | 属性 | 值 |
@@ -460,26 +604,26 @@
 | 属性 | 值 |
 |------|-----|
 | **HTTP方法** | POST |
-| **接口路径** | `/api/groupCourse/{courseId}/signin` |
+| **接口路径** | `/api/groupCourse/signin/{memberId}` |
 | **所属文件** | `GroupCourseHandler.java` |

 **路径参数**:

 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| courseId | Long | 是 | 团课ID |
+| memberId | Long | 是 | 会员ID |

 **请求体**:

 ```json
 {
-  "memberId": 1001
+  "courseId": 1
 }
 ```

 | 参数名 | 类型 | 必填 | 说明 |
 |--------|------|------|------|
-| memberId | Long | **是** | 会员ID |
+| courseId | Long | **是** | 团课ID |

 **成功响应** (200 OK):

@@ -494,16 +638,39 @@
 }
 ```

-**失败响应** (400 Bad Request):
+**失败响应** (400 Bad Request) —— 校验规则及对应错误信息:
+
+| 序号 | 校验规则 | 错误信息 |
+|------|----------|----------|
+| 1 | 团课不存在或已被删除 | `团课不存在或已删除` |
+| 2 | 团课状态为"已取消" | `团课已取消，无法签到` |
+| 3 | 团课状态为"已结束" | `团课已结束，无法签到` |
+| 4 | 当前时间早于开课前2小时 | `未到签到时间，请在开课前2小时内签到` |
+| 5 | 当前时间晚于团课结束时间 | `团课已结束，无法签到` |
+| 6 | 课程当前人数已达上限 | `课程已满员，无法签到` |
+| 7 | 用户今日无到店签到记录 | `请先完成到店签到` |
+| 8 | 到店签到状态非SUCCESS | `到店签到未成功，请重新签到` |
+| 9 | 用户未预约此课程 | `您未预约此课程，无法签到` |
+| - | 请求体为空 | `请求体不能为空` |
+| - | 请求体缺少courseId | `courseId不能为空` |
+
+> **说明**: 校验按上表顺序依次执行，命中第一个失败条件即返回对应错误信息。
+
+**失败响应示例**:

 ```json
 {
  "success": false,
-  "message": "课程已满员"
+  "message": "未到签到时间，请在开课前2小时内签到"
 }
 ```

---
+```json
+{
+  "success": false,
+  "message": "您未预约此课程，无法签到"
+}
+```

 ### 删除团课

@@ -1493,7 +1660,14 @@
 ### 团课管理
 1. **创建团课**：课程名称为必填项
 2. **取消团课**：需提前24小时通知，否则拒绝操作
-3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制
+3. **团课签到**：严格按以下顺序校验，任一不通过即拒绝签到：
+   - 团课是否存在且未被删除
+   - 团课状态不为"已取消"
+   - 团课状态不为"已结束"（含已过结束时间）
+   - 当前时间在开课前2小时内（签到时间窗口）
+   - 课程当前人数未达到最大人数上限
+   - 用户今日已成功到店签到（查询 sign_in_record 表当日 SUCCESS 记录）
+   - 用户已预约该课程（有效预约）
 4. **删除团课**：采用软删除机制，数据保留可恢复

 ### 团课预约
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>gym-auth</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Auth</name>
+    <description>Phone Authentication Module - Phone Number Login Services</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-sys</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <!-- 阿里云一键登录服务 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dypnsapi</artifactId>
+            <version>1.2.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,7 @@
+package cn.novalon.gym.manage.auth.config;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+}
@@ -0,0 +1,47 @@
+package cn.novalon.gym.manage.auth.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 阿里云短信配置属性类
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "alibaba.cloud.sms")
+public class SmsProperties {
+
+    /**
+     * 访问密钥ID
+     */
+    private String accessKeyId;
+
+    /**
+     * 访问密钥密钥
+     */
+    private String accessKeySecret;
+
+    /**
+     * 短信签名名称
+     */
+    private String signName;
+
+    /**
+     * 短信模板CODE
+     */
+    private String templateCode;
+
+    /**
+     * 短信验证码长度（默认6位）
+     */
+    private int codeLength = 6;
+
+    /**
+     * 短信验证码有效期（秒，默认300秒=5分钟）
+     */
+    private long codeExpireSeconds = 300;
+}
@@ -0,0 +1,26 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneCodeLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    @Pattern(regexp = "^\\d{4,6}$", message = "验证码格式不正确")
+    private String code;
+}
@@ -0,0 +1,27 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号一键登录请求DTO
+ * uniapp官方一键登录流程：前端通过云函数获取手机号，直接传给后端
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    private String nickname;
+
+    private String avatar;
+}
@@ -0,0 +1,22 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 发送短信验证码请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendCodeRequest {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+}
@@ -0,0 +1,25 @@
+package cn.novalon.gym.manage.auth.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 短信验证码登录请求DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsLoginDto {
+
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+}
@@ -0,0 +1,58 @@
+package cn.novalon.gym.manage.auth.handler;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Tag(name = "手机号认证", description = "手机号一键登录与验证码登录")
+public class PhoneAuthHandler {
+
+    private final PhoneAuthService phoneAuthService;
+
+    @Operation(summary = "手机号一键登录", description = "使用uniapp官方运营商认证，直接手机号登录或注册")
+    public Mono<ServerResponse> oneClickLogin(ServerRequest request) {
+        log.info("收到手机号一键登录请求");
+
+        return request.bodyToMono(PhoneLoginDto.class)
+                .flatMap(phoneAuthService::oneClickLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+
+    @Operation(summary = "发送短信验证码", description = "使用阿里云发送短信验证码")
+    public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
+        log.info("收到发送短信验证码请求");
+
+        return request.bodyToMono(PhoneLoginDto.class)
+                .flatMap(dto -> phoneAuthService.sendSmsCode(dto.getPhone()))
+                .flatMap(success -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));
+    }
+
+    @Operation(summary = "手机号验证码登录", description = "使用阿里云短信验证码登录或注册")
+    public Mono<ServerResponse> codeLogin(ServerRequest request) {
+        log.info("收到手机号验证码登录请求");
+
+        return request.bodyToMono(PhoneCodeLoginDto.class)
+                .flatMap(phoneAuthService::codeLogin)
+                .flatMap(response -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(response));
+    }
+}
@@ -0,0 +1,37 @@
+package cn.novalon.gym.manage.auth.service;
+
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import reactor.core.publisher.Mono;
+
+/**
+ * 手机号认证服务接口
+ */
+public interface PhoneAuthService {
+
+    /**
+     * 手机号一键登录（uniapp官方运营商认证）
+     * 已注册则直接登录，未注册则自动注册后登录
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
+
+    /**
+     * 发送短信验证码（阿里云）
+     *
+     * @param phone 手机号
+     * @return 是否发送成功
+     */
+    Mono<Boolean> sendSmsCode(String phone);
+
+    /**
+     * 手机号验证码登录（阿里云）
+     *
+     * @param request 登录请求
+     * @return 登录响应
+     */
+    Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request);
+}
@@ -0,0 +1,35 @@
+package cn.novalon.gym.manage.auth.service;
+
+/**
+ * 短信服务接口
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+public interface SmsService {
+
+    /**
+     * 发送短信验证码
+     *
+     * @param phone 手机号
+     * @return 发送结果
+     */
+    boolean sendVerificationCode(String phone);
+
+    /**
+     * 验证短信验证码
+     *
+     * @param phone 手机号
+     * @param code  验证码
+     * @return 验证结果
+     */
+    boolean verifyCode(String phone, String code);
+
+    /**
+     * 获取验证码（用于测试或特殊场景）
+     *
+     * @param phone 手机号
+     * @return 验证码
+     */
+    String getVerificationCode(String phone);
+}
@@ -0,0 +1,177 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
+import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.service.PhoneAuthService;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
+import cn.novalon.gym.manage.common.exception.ErrorCode;
+import cn.novalon.gym.manage.common.exception.SystemException;
+import cn.novalon.gym.manage.member.entity.Member;
+import cn.novalon.gym.manage.member.es.entity.MemberES;
+import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
+import cn.novalon.gym.manage.member.repository.IMemberRepository;
+import cn.novalon.gym.manage.member.util.AesUtil;
+import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.member.util.MemberNoGenerator;
+import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PhoneAuthServiceImpl implements PhoneAuthService {
+
+    private final IMemberRepository memberRepository;
+    private final MemberESRepository memberESRepository;
+    private final EsSyncUtils esSyncUtils;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final SmsService smsService;
+
+    private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
+
+    @PostConstruct
+    public void init() {
+        this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
+        log.info("手机号一键登录, phone: {}", request.getPhone());
+
+        String encryptedPhone = encryptPhone(request.getPhone());
+
+        return memberRepository.findByPhone(encryptedPhone)
+                .flatMap(existingMember -> {
+                    log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                    return doLogin(existingMember, false, request);
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.info("手机号未注册，创建新会员");
+                    return createNewMemberAndLogin(request, encryptedPhone);
+                }));
+    }
+
+    @Override
+    public Mono<Boolean> sendSmsCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+        return Mono.fromCallable(() -> smsService.sendVerificationCode(phone));
+    }
+
+    @Override
+    public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
+        log.info("手机号验证码登录, phone: {}", request.getPhone());
+
+        return Mono.fromCallable(() -> smsService.verifyCode(request.getPhone(), request.getCode()))
+                .flatMap(verified -> {
+                    if (!verified) {
+                        log.warn("验证码验证失败, phone: {}", request.getPhone());
+                        return Mono.error(new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "验证码错误或已过期"));
+                    }
+
+                    String encryptedPhone = encryptPhone(request.getPhone());
+
+                    return memberRepository.findByPhone(encryptedPhone)
+                            .flatMap(existingMember -> {
+                                log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                                return doLogin(existingMember, false, null);
+                            })
+                            .switchIfEmpty(Mono.defer(() -> {
+                                log.info("手机号未注册，创建新会员");
+                                PhoneLoginDto registerRequest = new PhoneLoginDto();
+                                registerRequest.setPhone(request.getPhone());
+                                return createNewMemberAndLogin(registerRequest, encryptedPhone);
+                            }));
+                });
+    }
+
+    private Mono<PhoneLoginVO> createNewMemberAndLogin(PhoneLoginDto request, String encryptedPhone) {
+        String memberNo = MemberNoGenerator.generate();
+        log.info("生成会员号: {}", memberNo);
+
+        Member member = new Member();
+        member.setMemberNo(memberNo);
+        member.setPhone(encryptedPhone);
+        member.setNickname(request != null ? request.getNickname() : null);
+        member.setAvatar(request != null ? request.getAvatar() : null);
+        member.setLastLoginAt(LocalDateTime.now());
+        member.setIsDeleted(false);
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .flatMap(savedMember -> {
+                    log.info("新会员创建成功, memberId: {}, memberNo: {}", savedMember.getId(), savedMember.getMemberNo());
+                    return doLogin(savedMember, true, request);
+                });
+    }
+
+    private Mono<PhoneLoginVO> doLogin(Member member, boolean isNewUser, PhoneLoginDto request) {
+        log.info("登录成功, memberId: {}", member.getId());
+
+        member.setLastLoginAt(LocalDateTime.now());
+
+        if (isNewUser && request != null) {
+            if ((member.getNickname() == null || member.getNickname().isEmpty())
+                    && request.getNickname() != null && !request.getNickname().isEmpty()) {
+                member.setNickname(request.getNickname());
+            }
+            if ((member.getAvatar() == null || member.getAvatar().isEmpty())
+                    && request.getAvatar() != null && !request.getAvatar().isEmpty()) {
+                member.setAvatar(request.getAvatar());
+            }
+        }
+
+        return memberRepository.save(member)
+                .doOnSuccess(memberSyncer::sync)
+                .map(this::buildLoginResponse);
+    }
+
+    private PhoneLoginVO buildLoginResponse(Member member) {
+        boolean needCompleteInfo = member.getNickname() == null || member.getNickname().isEmpty();
+
+        List<String> roles = new ArrayList<>();
+        String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
+
+        log.info("JWT Token 生成成功, memberId: {}", member.getId());
+
+        PhoneLoginVO vo = new PhoneLoginVO();
+        vo.setMemberId(member.getId());
+        vo.setMemberNo(member.getMemberNo());
+        vo.setAccessToken(accessToken);
+        vo.setRefreshToken(accessToken);
+        vo.setExpiresIn(86400);
+        vo.setIsNewUser(member.getCreatedAt() == null ? false :
+                member.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(1)));
+        vo.setNeedCompleteInfo(needCompleteInfo);
+        vo.setNickname(member.getNickname());
+        vo.setAvatar(member.getAvatar());
+        vo.setPhone(decryptPhone(member.getPhone()));
+        return vo;
+    }
+
+    private String encryptPhone(String phoneNumber) {
+        try {
+            return AesUtil.encrypt(phoneNumber);
+        } catch (Exception e) {
+            log.error("手机号加密失败", e);
+            throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败");
+        }
+    }
+
+    private String decryptPhone(String encryptedPhone) {
+        try {
+            return AesUtil.decrypt(encryptedPhone);
+        } catch (Exception e) {
+            log.error("手机号解密失败", e);
+            return null;
+        }
+    }
+}
@@ -0,0 +1,148 @@
+package cn.novalon.gym.manage.auth.service.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.novalon.gym.manage.auth.config.SmsProperties;
+import cn.novalon.gym.manage.auth.service.SmsService;
+import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
+import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
+import com.aliyun.teaopenapi.models.Config;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+
+/**
+ * 短信服务实现类
+ *
+ * @author auto-generated
+ * @date 2026-06-20
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmsServiceImpl implements SmsService {
+
+    private final SmsProperties smsProperties;
+    private final RedisUtil redisUtil;
+
+    @Override
+    public boolean sendVerificationCode(String phone) {
+        log.info("发送短信验证码, phone: {}", phone);
+
+        try {
+            // 生成验证码
+            String code = generateCode();
+
+            // 发送短信
+            boolean sent = sendSms(phone, code);
+
+            if (sent) {
+                // 将验证码存入Redis，5分钟过期
+                String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+                redisUtil.setWithExpire(cacheKey, code, smsProperties.getCodeExpireSeconds())
+                        .doOnSuccess(result -> log.info("验证码已缓存, phone: {}, code: {}, expire: {}s",
+                                phone, code, smsProperties.getCodeExpireSeconds()))
+                        .block();
+
+                log.info("短信验证码发送成功, phone: {}", phone);
+                return true;
+            }
+
+            log.warn("短信验证码发送失败, phone: {}", phone);
+            return false;
+
+        } catch (Exception e) {
+            log.error("发送短信验证码异常, phone: {}", phone, e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean verifyCode(String phone, String code) {
+        log.info("验证短信验证码, phone: {}", phone);
+
+        try {
+            String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+            String cachedCode = redisUtil.get(cacheKey, String.class).block();
+
+            if (cachedCode == null) {
+                log.warn("验证码已过期或不存在, phone: {}", phone);
+                return false;
+            }
+
+            if (cachedCode.equals(code)) {
+                // 验证成功后删除验证码
+                redisUtil.delete(cacheKey).block();
+                log.info("验证码验证成功, phone: {}", phone);
+                return true;
+            }
+
+            log.warn("验证码不匹配, phone: {}, input: {}, cached: {}", phone, code, cachedCode);
+            return false;
+
+        } catch (Exception e) {
+            log.error("验证短信验证码异常, phone: {}", phone, e);
+            return false;
+        }
+    }
+
+    @Override
+    public String getVerificationCode(String phone) {
+        try {
+            String cacheKey = RedisKeyConstants.SMS_CODE + phone;
+            return redisUtil.get(cacheKey, String.class).block();
+        } catch (Exception e) {
+            log.error("获取验证码异常, phone: {}", phone, e);
+            return null;
+        }
+    }
+
+    /**
+     * 生成验证码
+     */
+    private String generateCode() {
+        return RandomUtil.randomNumbers(smsProperties.getCodeLength());
+    }
+
+    /**
+     * 发送短信
+     */
+    private boolean sendSms(String phone, String code) throws Exception {
+        log.info("调用阿里云短信API发送短信, phone: {}, code: {}", phone, code);
+
+        // 创建阿里云短信客户端
+        Config config = new Config()
+                .setAccessKeyId(smsProperties.getAccessKeyId())
+                .setAccessKeySecret(smsProperties.getAccessKeySecret())
+                .setEndpoint("dysmsapi.aliyuncs.com");
+
+        Client client = new Client(config);
+
+        // 构建发送短信请求
+        SendSmsRequest request = new SendSmsRequest()
+                .setPhoneNumbers(phone)
+                .setSignName(smsProperties.getSignName())
+                .setTemplateCode(smsProperties.getTemplateCode())
+                .setTemplateParam("{\"code\":\"" + code + "\"}");
+
+        // 发送短信
+        SendSmsResponse response = client.sendSms(request);
+
+        log.info("阿里云短信API响应, phone: {}, code: {}, message: {}",
+                phone, response.getBody().getCode(), response.getBody().getMessage());
+
+        // 判断发送结果
+        if ("OK".equals(response.getBody().getCode())) {
+            return true;
+        }
+
+        log.error("阿里云短信发送失败, phone: {}, code: {}, message: {}",
+                phone, response.getBody().getCode(), response.getBody().getMessage());
+        return false;
+    }
+}
@@ -0,0 +1,36 @@
+package cn.novalon.gym.manage.auth.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 手机号一键登录响应VO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PhoneLoginVO {
+
+    private Long memberId;
+
+    private String memberNo;
+
+    private String phone;
+
+    private String accessToken;
+
+    private String refreshToken;
+
+    private Integer expiresIn;
+
+    private Boolean isNewUser;
+
+    private Boolean needCompleteInfo;
+
+    private String nickname;
+
+    private String avatar;
+}
@@ -0,0 +1,5 @@
+cn.novalon.gym.manage.auth.handler.PhoneAuthHandler
+cn.novalon.gym.manage.auth.service.impl.PhoneAuthServiceImpl
+cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl
+cn.novalon.gym.manage.auth.config.AuthConfig
+cn.novalon.gym.manage.auth.config.SmsProperties
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Class name="~.*\.entity\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.dto\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.converter\..*" />
+    </Match>
+</FindBugsFilter>
@@ -100,8 +100,20 @@
    <build>
        <plugins>
            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
            </plugin>
        </plugins>
    </build>
@@ -35,11 +35,6 @@
            <artifactId>manage-common</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>manage-sys</artifactId>
-            <version>${project.version}</version>
-        </dependency>
        <dependency>
            <groupId>cn.novalon.gym.manage</groupId>
            <artifactId>manage-db</artifactId>
@@ -86,13 +81,26 @@
            <artifactId>gym-member</artifactId>
            <version>${project.version}</version>
        </dependency>
+        
+        <!-- ZXing QR Code依赖 -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.3</version>
+        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
            </plugin>
        </plugins>
    </build>
@@ -1,16 +1,19 @@
-
 package cn.novalon.gym.manage.groupcourse.dao;

+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.repository.Modifying;
 import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;

@Repository
 public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long> {
@@ -38,4 +41,184 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
    Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);

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

+    //二维码路径
+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
    public String getCourseName() {
        return courseName;
    }
@@ -163,4 +167,12 @@ public class GroupCourse extends BaseDomain{
    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
        this.storedValueAmount = storedValueAmount;
    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }
@@ -54,6 +54,9 @@ public class GroupCourseDetail extends BaseDomain {
    @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
    private BigDecimal storedValueAmount;

+    @Schema(description = "二维码路径", example = "D:\\Games\\exmp\\image\\abc123_20260618120000.png")
+    private String qrCodePath;
+
    // ===== 关联的类型信息 =====

    @Schema(description = "类型信息")
@@ -187,6 +190,14 @@ public class GroupCourseDetail extends BaseDomain {
        this.storedValueAmount = storedValueAmount;
    }

+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
+
    public GroupCourseType getTypeInfo() {
        return typeInfo;
    }
@@ -0,0 +1,84 @@
+package cn.novalon.gym.manage.groupcourse.domain;
+
+import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class GroupCourseRecommend extends BaseDomain {
+
+    @Schema(description = "团课ID", example = "1")
+    private Long courseId;
+
+    @Schema(description = "推荐标题", example = "本周热门课程")
+    private String recommendTitle;
+
+    @Schema(description = "推荐内容", example = "这是一门非常棒的课程，快来参加吧！")
+    private String recommendContent;
+
+    @Schema(description = "推荐理由", example = "教练专业，课程内容丰富")
+    private String recommendReason;
+
+    @Schema(description = "优先级（数字越大优先级越高）", example = "10")
+    private Integer priority;
+
+    @Schema(description = "是否启用", example = "true")
+    private Boolean isActive;
+
+    @Schema(description = "团课信息")
+    private GroupCourse groupCourse;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+
+    public GroupCourse getGroupCourse() {
+        return groupCourse;
+    }
+
+    public void setGroupCourse(GroupCourse groupCourse) {
+        this.groupCourse = groupCourse;
+    }
+}
@@ -0,0 +1,116 @@
+package cn.novalon.gym.manage.groupcourse.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.LocalDateTime;
+
+/**
+ * 团课多条件查询请求DTO
+ *
+ * @author 张翔
+ * @date 2026-06-14
+ */
+@Schema(description = "团课多条件查询参数")
+public class GroupCourseQueryDto {
+
+    @Schema(description = "课程名称（模糊查询）", example = "瑜伽")
+    private String courseName;
+
+    @Schema(description = "课程类型ID", example = "1")
+    private Long courseType;
+
+    @Schema(description = "查询开始日期", example = "2026-06-01T00:00:00")
+    private LocalDateTime startDate;
+
+    @Schema(description = "查询结束日期", example = "2026-06-30T23:59:59")
+    private LocalDateTime endDate;
+
+    @Schema(description = "时间段：morning-早晨(6:00-12:00), afternoon-下午(12:00-18:00), evening-夜晚(18:00-24:00)", example = "morning")
+    private String timePeriod;
+
+    @Schema(description = "价格排序：asc-从低到高, desc-从高到低", example = "asc")
+    private String priceSort;
+
+    @Schema(description = "按剩余名额最多排序", example = "true")
+    private Boolean remainingMost;
+
+    @Schema(description = "页码", example = "0")
+    private Integer page = 0;
+
+    @Schema(description = "每页大小", example = "10")
+    private Integer size = 10;
+
+    // ===== Getters and Setters =====
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Long getCourseType() {
+        return courseType;
+    }
+
+    public void setCourseType(Long courseType) {
+        this.courseType = courseType;
+    }
+
+    public LocalDateTime getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDateTime startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDateTime getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDateTime endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getTimePeriod() {
+        return timePeriod;
+    }
+
+    public void setTimePeriod(String timePeriod) {
+        this.timePeriod = timePeriod;
+    }
+
+    public String getPriceSort() {
+        return priceSort;
+    }
+
+    public void setPriceSort(String priceSort) {
+        this.priceSort = priceSort;
+    }
+
+    public Boolean getRemainingMost() {
+        return remainingMost;
+    }
+
+    public void setRemainingMost(Boolean remainingMost) {
+        this.remainingMost = remainingMost;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+}
@@ -62,6 +62,10 @@ public class GroupCourseEntity extends BaseEntity {
    @Column("stored_value_amount")
    private java.math.BigDecimal storedValueAmount;

+    //二维码路径
+    @Column("qr_code_path")
+    private String qrCodePath;
+
    public String getCourseName() {
        return courseName;
    }
@@ -165,4 +169,12 @@ public class GroupCourseEntity extends BaseEntity {
    public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) {
        this.storedValueAmount = storedValueAmount;
    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
 }
@@ -0,0 +1,77 @@
+package cn.novalon.gym.manage.groupcourse.entity;
+
+import cn.novalon.gym.manage.db.entity.BaseEntity;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.time.LocalDateTime;
+
+@Table("group_course_recommend")
+public class GroupCourseRecommendEntity extends BaseEntity {
+
+    @Column("course_id")
+    private Long courseId;
+
+    @Column("recommend_title")
+    private String recommendTitle;
+
+    @Column("recommend_content")
+    private String recommendContent;
+
+    @Column("recommend_reason")
+    private String recommendReason;
+
+    @Column("priority")
+    private Integer priority;
+
+    @Column("is_active")
+    private Boolean isActive;
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getRecommendTitle() {
+        return recommendTitle;
+    }
+
+    public void setRecommendTitle(String recommendTitle) {
+        this.recommendTitle = recommendTitle;
+    }
+
+    public String getRecommendContent() {
+        return recommendContent;
+    }
+
+    public void setRecommendContent(String recommendContent) {
+        this.recommendContent = recommendContent;
+    }
+
+    public String getRecommendReason() {
+        return recommendReason;
+    }
+
+    public void setRecommendReason(String recommendReason) {
+        this.recommendReason = recommendReason;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+}
@@ -5,6 +5,7 @@ import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -158,7 +159,7 @@ public class GroupCourseHandler {

    @Operation(summary = "团课签到", description = "会员签到参加团课")
    public Mono<ServerResponse> signIn(ServerRequest request) {
-        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
        
        return request.bodyToMono(Map.class)
                .flatMap(body -> {
@@ -169,15 +170,15 @@ public class GroupCourseHandler {
                        return ServerResponse.badRequest().bodyValue(response);
                    }
                    
-                    Object memberIdObj = body.get("memberId");
-                    if (memberIdObj == null) {
+                    Object courseIdObj = body.get("courseId");
+                    if (courseIdObj == null) {
                        Map<String, Object> response = new HashMap<>();
                        response.put("success", false);
-                        response.put("message", "memberId不能为空");
+                        response.put("message", "courseId不能为空");
                        return ServerResponse.badRequest().bodyValue(response);
                    }
                    
-                    Long memberId = ((Number) memberIdObj).longValue();
+                    Long courseId = ((Number) courseIdObj).longValue();
                    
                    return groupCourseService.signIn(courseId, memberId)
                            .flatMap(course -> {
@@ -215,6 +216,27 @@ public class GroupCourseHandler {
                });
    }

+    @Operation(summary = "多条件查询团课", description = "支持团课名称模糊查询、类型筛选、日期范围、时间段、价格排序、剩余名额排序等多条件组合查询")
+    public Mono<ServerResponse> searchGroupCourses(ServerRequest request) {
+        return request.bodyToMono(GroupCourseQueryDto.class)
+                .flatMap(query -> {
+                    return groupCourseService.searchGroupCourses(query)
+                            .flatMap(response -> {
+                                Map<String, Object> result = new HashMap<>();
+                                result.put("success", true);
+                                result.put("message", "查询成功");
+                                result.put("data", response);
+                                return ServerResponse.ok().bodyValue(result);
+                            });
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> errorResponse = new HashMap<>();
+                    errorResponse.put("success", false);
+                    errorResponse.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(errorResponse);
+                });
+    }
+
    @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据")
    public Mono<ServerResponse> getCacheByKey(ServerRequest request) {
        return request.bodyToMono(Map.class)
@@ -0,0 +1,164 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Tag(name = "团课推荐管理", description = "团课推荐相关操作")
+public class GroupCourseRecommendHandler {
+
+    private final IGroupCourseRecommendService recommendService;
+
+    public GroupCourseRecommendHandler(IGroupCourseRecommendService recommendService) {
+        this.recommendService = recommendService;
+    }
+
+    @Operation(summary = "获取所有团课推荐", description = "获取系统中所有团课推荐列表，支持按优先级排序")
+    public Mono<ServerResponse> getAllRecommendations(ServerRequest request) {
+        String sortBy = request.queryParam("sortBy").orElse("priority");
+        String sortOrder = request.queryParam("sortOrder").orElse("desc");
+
+        return ServerResponse.ok()
+                .body(recommendService.findAll(sortBy, sortOrder), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "获取所有启用的团课推荐", description = "获取系统中所有已启用的团课推荐列表（按优先级排序）")
+    public Mono<ServerResponse> getAllActiveRecommendations(ServerRequest request) {
+        return ServerResponse.ok()
+                .body(recommendService.findAllActive(), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "根据ID获取团课推荐", description = "根据ID获取团课推荐详情")
+    public Mono<ServerResponse> getRecommendationById(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+        return recommendService.findById(id)
+                .flatMap(recommend -> ServerResponse.ok().bodyValue(recommend))
+                .switchIfEmpty(ServerResponse.notFound().build());
+    }
+
+    @Operation(summary = "根据团课ID获取推荐", description = "根据团课ID获取该团课的推荐信息")
+    public Mono<ServerResponse> getRecommendationsByCourseId(ServerRequest request) {
+        Long courseId = Long.valueOf(request.pathVariable("courseId"));
+        return ServerResponse.ok()
+                .body(recommendService.findByCourseId(courseId), GroupCourseRecommend.class);
+    }
+
+    @Operation(summary = "创建团课推荐", description = "创建新的团课推荐")
+    public Mono<ServerResponse> createRecommendation(ServerRequest request) {
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    if (recommend.getCourseId() == null) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "团课ID不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+
+                    return recommendService.create(recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐创建成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "更新团课推荐", description = "更新指定团课推荐信息")
+    public Mono<ServerResponse> updateRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return request.bodyToMono(GroupCourseRecommend.class)
+                .flatMap(recommend -> {
+                    return recommendService.update(id, recommend)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐更新成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "删除团课推荐", description = "删除指定团课推荐（软删除）")
+    public Mono<ServerResponse> deleteRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.delete(id)
+                .then(Mono.defer(() -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐删除成功");
+                    return ServerResponse.ok().bodyValue(response);
+                }))
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "启用团课推荐", description = "启用指定团课推荐")
+    public Mono<ServerResponse> enableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.enable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐启用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+
+    @Operation(summary = "禁用团课推荐", description = "禁用指定团课推荐")
+    public Mono<ServerResponse> disableRecommendation(ServerRequest request) {
+        Long id = Long.valueOf(request.pathVariable("id"));
+
+        return recommendService.disable(id)
+                .flatMap(r -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", true);
+                    response.put("message", "团课推荐禁用成功");
+                    response.put("data", r);
+                    return ServerResponse.ok().bodyValue(response);
+                })
+                .onErrorResume(error -> {
+                    Map<String, Object> response = new HashMap<>();
+                    response.put("success", false);
+                    response.put("message", error.getMessage());
+                    return ServerResponse.badRequest().bodyValue(response);
+                });
+    }
+}
@@ -0,0 +1,89 @@
+package cn.novalon.gym.manage.groupcourse.initializer;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 项目启动时补全缺失的团课二维码
+ * 遍历所有未删除的团课，对qrCodePath为空的课程生成二维码并上传至阿里云OSS
+ */
+@Component
+public class QrCodeInitializer implements CommandLineRunner {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QrCodeInitializer.class);
+    
+    private final IGroupCourseRepository groupCourseRepository;
+    private final ObjectMapper objectMapper;
+    
+    public QrCodeInitializer(IGroupCourseRepository groupCourseRepository,
+                             ObjectMapper objectMapper) {
+        this.groupCourseRepository = groupCourseRepository;
+        this.objectMapper = objectMapper;
+    }
+    
+    @Override
+    public void run(String... args) {
+        logger.info("===== 开始检查团课二维码缺失情况 =====");
+        
+        groupCourseRepository.findByDeletedAtIsNull()
+                .filter(course -> course.getQrCodePath() == null || course.getQrCodePath().isEmpty())
+                .flatMap(course -> {
+                    try {
+                        logger.info("发现缺失二维码的团课 - id={}, name={}", course.getId(), course.getCourseName());
+                        
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime() != null ? course.getStartTime().toString() : null);
+                        qrCodeContent.put("endTime", course.getEndTime() != null ? course.getEndTime().toString() : null);
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码并上传到阿里云OSS
+                        String uuid = UUID.randomUUID().toString().replace("-", "");
+                        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+                        String fileName = "qr_" + uuid + "_" + timestamp + ".png";
+                        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent, fileName);
+                        
+                        course.setQrCodePath(ossUrl);
+                        
+                        // 更新数据库
+                        return groupCourseRepository.update(course)
+                                .doOnSuccess(updated -> logger.info("团课二维码补全成功 - id={}, name={}, ossUrl={}", 
+                                        updated.getId(), updated.getCourseName(), ossUrl))
+                                .doOnError(error -> logger.error("团课二维码补全失败(更新DB) - id={}, name={}, error: {}", 
+                                        course.getId(), course.getCourseName(), error.getMessage()));
+                    } catch (Exception e) {
+                        logger.error("团课二维码补全失败(生成) - id={}, name={}, error: {}", 
+                                course.getId(), course.getCourseName(), e.getMessage(), e);
+                        return Mono.empty();
+                    }
+                })
+                .collectList()
+                .doOnSuccess(list -> logger.info("===== 团课二维码检查完毕，共补全 {} 个缺失二维码 =====", list.size()))
+                .onErrorResume(error -> {
+                    logger.error("团课二维码初始化检查异常: {}", error.getMessage(), error);
+                    return Mono.empty();
+                })
+                .subscribe();
+    }
+}
@@ -0,0 +1,30 @@
+package cn.novalon.gym.manage.groupcourse.repository;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendRepository {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend);
+
+    Mono<Void> deleteById(Long id);
+
+    Mono<Void> deleteByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive);
+}
@@ -4,6 +4,7 @@ package cn.novalon.gym.manage.groupcourse.repository;
 import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import org.springframework.data.domain.Sort;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,4 +30,6 @@ public interface IGroupCourseRepository {
    Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta);
    
    Flux<GroupCourse> findByCourseType(Long courseType);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
 }
@@ -0,0 +1,136 @@
+package cn.novalon.gym.manage.groupcourse.repository.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.novalon.gym.manage.groupcourse.dao.GroupCourseRecommendDao;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.entity.GroupCourseRecommendEntity;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Repository
+public class GroupCourseRecommendRepository implements IGroupCourseRecommendRepository {
+
+    private final GroupCourseRecommendDao recommendDao;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
+
+    public GroupCourseRecommendRepository(GroupCourseRecommendDao recommendDao, 
+                                          R2dbcEntityTemplate r2dbcEntityTemplate) {
+        this.recommendDao = recommendDao;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendDao.findByIdAndDeletedAtIsNull(id)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendDao.findAllByDeletedAtIsNull()
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        Sort.Direction direction = "asc".equalsIgnoreCase(sortOrder) 
+                ? Sort.Direction.ASC 
+                : Sort.Direction.DESC;
+        Sort sort = Sort.by(direction, sortBy);
+        return recommendDao.findAllByDeletedAtIsNull(sort)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendDao.findByIsActiveTrueAndDeletedAtIsNull(Sort.by(Sort.Direction.DESC, "priority"))
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNull(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findActiveByCourseId(Long courseId) {
+        return recommendDao.findByCourseIdAndDeletedAtIsNullAndIsActiveTrue(courseId)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> save(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setCreatedAt(LocalDateTime.now());
+        entity.setUpdatedAt(LocalDateTime.now());
+        if (entity.getPriority() == null) {
+            entity.setPriority(0);
+        }
+        if (entity.getIsActive() == null) {
+            entity.setIsActive(true);
+        }
+
+        return recommendDao.save(entity)
+                .map(this::toDomain);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(GroupCourseRecommend recommend) {
+        GroupCourseRecommendEntity entity = toEntity(recommend);
+        entity.setUpdatedAt(LocalDateTime.now());
+
+        return r2dbcEntityTemplate.update(entity)
+                .then(findById(recommend.getId()));
+    }
+
+    @Override
+    public Mono<Void> deleteById(Long id) {
+        return recommendDao.softDelete(id, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<Void> deleteByCourseId(Long courseId) {
+        return recommendDao.softDeleteByCourseId(courseId, LocalDateTime.now())
+                .then();
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> updateActiveStatus(Long id, Boolean isActive) {
+        return recommendDao.updateActiveStatus(id, isActive, LocalDateTime.now())
+                .flatMap(updated -> {
+                    if (updated > 0) {
+                        return findById(id);
+                    }
+                    return Mono.empty();
+                });
+    }
+
+    private GroupCourseRecommend toDomain(GroupCourseRecommendEntity entity) {
+        if (entity == null) {
+            return null;
+        }
+        GroupCourseRecommend recommend = new GroupCourseRecommend();
+        BeanUtil.copyProperties(entity, recommend);
+        return recommend;
+    }
+
+    private GroupCourseRecommendEntity toEntity(GroupCourseRecommend domain) {
+        if (domain == null) {
+            return null;
+        }
+        GroupCourseRecommendEntity entity = new GroupCourseRecommendEntity();
+        BeanUtil.copyProperties(domain, entity);
+        if (domain.getId() != null) {
+            entity.markNotNew();
+        }
+        return entity;
+    }
+}
@@ -6,6 +6,7 @@ import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import org.springframework.data.domain.Sort;
@@ -184,4 +185,27 @@ public class GroupCourseRepository implements IGroupCourseRepository {
        return groupCourseDao.findByCourseTypeAndDeletedAtIsNull(courseType)
                .map(groupCourseConverter::toDomain);
    }
+
+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        return groupCourseDao.countSearchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                .flatMap(total -> {
+                    if (total == 0) {
+                        return Mono.just(new PageResponse<>(
+                                List.of(), 0, 0L,
+                                query.getPage() != null ? query.getPage() : 0,
+                                query.getSize() != null ? query.getSize() : 10));
+                    }
+                    return groupCourseDao.searchGroupCourses(r2dbcEntityTemplate.getDatabaseClient(), query)
+                            .map(groupCourseConverter::toDomain)
+                            .collectList()
+                            .map(courseList -> {
+                                int size = query.getSize() != null ? query.getSize() : 10;
+                                int totalPages = (int) Math.ceil((double) total / size);
+                                return new PageResponse<>(
+                                        courseList, totalPages, total,
+                                        query.getPage() != null ? query.getPage() : 0, size);
+                            });
+                });
+    }
 }
@@ -0,0 +1,28 @@
+package cn.novalon.gym.manage.groupcourse.service;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface IGroupCourseRecommendService {
+
+    Mono<GroupCourseRecommend> findById(Long id);
+
+    Flux<GroupCourseRecommend> findAll();
+
+    Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder);
+
+    Flux<GroupCourseRecommend> findAllActive();
+
+    Flux<GroupCourseRecommend> findByCourseId(Long courseId);
+
+    Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend);
+
+    Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend);
+
+    Mono<Void> delete(Long id);
+
+    Mono<GroupCourseRecommend> enable(Long id);
+
+    Mono<GroupCourseRecommend> disable(Long id);
+}
@@ -5,6 +5,7 @@ import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

@@ -25,4 +26,6 @@ public interface IGroupCourseService {
    Mono<GroupCourse> signIn(Long courseId, Long memberId);
    
    Mono<Void> delete(Long id);
+
+    Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
 }
@@ -0,0 +1,142 @@
+package cn.novalon.gym.manage.groupcourse.service.impl;
+
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
+import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRecommendRepository;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
+import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Service
+public class GroupCourseRecommendService implements IGroupCourseRecommendService {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupCourseRecommendService.class);
+
+    private final IGroupCourseRecommendRepository recommendRepository;
+    private final IGroupCourseRepository groupCourseRepository;
+
+    public GroupCourseRecommendService(IGroupCourseRecommendRepository recommendRepository,
+                                       IGroupCourseRepository groupCourseRepository) {
+        this.recommendRepository = recommendRepository;
+        this.groupCourseRepository = groupCourseRepository;
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> findById(Long id) {
+        return recommendRepository.findById(id)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll() {
+        return recommendRepository.findAll()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAll(String sortBy, String sortOrder) {
+        return recommendRepository.findAll(sortBy, sortOrder)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findAllActive() {
+        return recommendRepository.findAllActive()
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Flux<GroupCourseRecommend> findByCourseId(Long courseId) {
+        return recommendRepository.findByCourseId(courseId)
+                .flatMap(this::fillGroupCourseInfo);
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> create(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.error(new RuntimeException("团课ID不能为空"));
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .flatMap(course -> {
+                    return recommendRepository.save(recommend)
+                            .doOnSuccess(r -> logger.info("团课推荐创建成功 - id={}, courseId={}", r.getId(), r.getCourseId()))
+                            .doOnError(error -> logger.error("团课推荐创建失败 - error: {}", error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> update(Long id, GroupCourseRecommend recommend) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(existing -> {
+                    if (recommend.getRecommendTitle() != null) {
+                        existing.setRecommendTitle(recommend.getRecommendTitle());
+                    }
+                    if (recommend.getRecommendContent() != null) {
+                        existing.setRecommendContent(recommend.getRecommendContent());
+                    }
+                    if (recommend.getRecommendReason() != null) {
+                        existing.setRecommendReason(recommend.getRecommendReason());
+                    }
+                    if (recommend.getPriority() != null) {
+                        existing.setPriority(recommend.getPriority());
+                    }
+                    if (recommend.getIsActive() != null) {
+                        existing.setIsActive(recommend.getIsActive());
+                    }
+                    if (recommend.getCourseId() != null) {
+                        existing.setCourseId(recommend.getCourseId());
+                    }
+
+                    return recommendRepository.update(existing);
+                })
+                .doOnSuccess(r -> logger.info("团课推荐更新成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐更新失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<Void> delete(Long id) {
+        return recommendRepository.findById(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .flatMap(recommend -> {
+                    return recommendRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课推荐删除成功 - id={}", id))
+                            .doOnError(error -> logger.error("团课推荐删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> enable(Long id) {
+        return recommendRepository.updateActiveStatus(id, true)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐启用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐启用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    @Override
+    public Mono<GroupCourseRecommend> disable(Long id) {
+        return recommendRepository.updateActiveStatus(id, false)
+                .switchIfEmpty(Mono.error(new RuntimeException("团课推荐不存在")))
+                .doOnSuccess(r -> logger.info("团课推荐禁用成功 - id={}", id))
+                .doOnError(error -> logger.error("团课推荐禁用失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
+    private Mono<GroupCourseRecommend> fillGroupCourseInfo(GroupCourseRecommend recommend) {
+        if (recommend.getCourseId() == null) {
+            return Mono.just(recommend);
+        }
+
+        return groupCourseRepository.findByIdAndDeletedAtIsNull(recommend.getCourseId())
+                .map(course -> {
+                    recommend.setGroupCourse(course);
+                    return recommend;
+                })
+                .defaultIfEmpty(recommend);
+    }
+}
@@ -9,6 +9,7 @@ import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.enums.CourseEvent;
 import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseStateMachine;
@@ -17,6 +18,7 @@ import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepositor
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
@@ -26,11 +28,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;

@Service
 public class GroupCourseService implements IGroupCourseService {
@@ -45,6 +50,7 @@ public class GroupCourseService implements IGroupCourseService {
    private final RedisUtil redisUtil;
    private final ObjectMapper objectMapper;
    private final GroupCourseStateMachine stateMachine;
+    private final DatabaseClient databaseClient;
    
    private static final String CACHE_KEY_PREFIX = "group_course:page:";
    private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
@@ -61,7 +67,8 @@ public class GroupCourseService implements IGroupCourseService {
                              MemberCardRepository memberCardRepository,
                              RedisUtil redisUtil,
                              ObjectMapper objectMapper,
-                              GroupCourseStateMachine stateMachine){
+                              GroupCourseStateMachine stateMachine,
+                              DatabaseClient databaseClient){
        this.groupCourseRepository = groupCourseRepository;
        this.bookingRepository = bookingRepository;
        this.groupCourseTypeRepository = groupCourseTypeRepository;
@@ -71,6 +78,7 @@ public class GroupCourseService implements IGroupCourseService {
        this.redisUtil = redisUtil;
        this.objectMapper = objectMapper;
        this.stateMachine = stateMachine;
+        this.databaseClient = databaseClient;
    }

    @Override
@@ -149,6 +157,7 @@ public class GroupCourseService implements IGroupCourseService {
        detail.setDescription(course.getDescription());
        detail.setPointCardAmount(course.getPointCardAmount());
        detail.setStoredValueAmount(course.getStoredValueAmount());
+        detail.setQrCodePath(course.getQrCodePath());
        detail.setCreatedAt(course.getCreatedAt());
        detail.setUpdatedAt(course.getUpdatedAt());
        
@@ -262,7 +271,38 @@ public class GroupCourseService implements IGroupCourseService {
    @Override
    public Mono<GroupCourse> create(GroupCourse groupCourse) {
        return groupCourseRepository.save(groupCourse)
-                .doOnSuccess(course -> logger.info("团课创建成功 - id={}, name={}", course.getId(), course.getCourseName()))
+                .flatMap(course -> {
+                    try {
+                        // 生成二维码内容：团课基础信息JSON
+                        Map<String, Object> qrCodeContent = new HashMap<>();
+                        qrCodeContent.put("id", course.getId());
+                        qrCodeContent.put("courseName", course.getCourseName());
+                        qrCodeContent.put("coachId", course.getCoachId());
+                        qrCodeContent.put("courseType", course.getCourseType());
+                        qrCodeContent.put("startTime", course.getStartTime());
+                        qrCodeContent.put("endTime", course.getEndTime());
+                        qrCodeContent.put("maxMembers", course.getMaxMembers());
+                        qrCodeContent.put("location", course.getLocation());
+                        qrCodeContent.put("description", course.getDescription());
+                        qrCodeContent.put("createdAt", course.getCreatedAt());
+                        
+                        String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
+                        
+                        // 生成二维码并上传到阿里云OSS
+                        String qrCodeUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
+                        course.setQrCodePath(qrCodeUrl);
+                        
+                        logger.info("团课二维码上传到OSS成功 - id={}, qrCodeUrl={}", course.getId(), qrCodeUrl);
+                        
+                        // 更新团课信息，保存二维码路径
+                        return groupCourseRepository.update(course)
+                                .doOnSuccess(updatedCourse -> logger.info("团课创建成功 - id={}, name={}", updatedCourse.getId(), updatedCourse.getCourseName()));
+                    } catch (Exception e) {
+                        logger.error("团课二维码生成失败 - id={}, error: {}", course.getId(), e.getMessage(), e);
+                        // 即使二维码生成失败，也返回成功创建的团课
+                        return Mono.just(course);
+                    }
+                })
                .flatMap(course -> clearCache().thenReturn(course))
                .doOnError(error -> logger.error("团课创建失败 - error: {}", error.getMessage()));
    }
@@ -308,6 +348,9 @@ public class GroupCourseService implements IGroupCourseService {
                    if (groupCourse.getStoredValueAmount() != null) {
                        existing.setStoredValueAmount(groupCourse.getStoredValueAmount());
                    }
+                    if (groupCourse.getQrCodePath() != null) {
+                        existing.setQrCodePath(groupCourse.getQrCodePath());
+                    }
                    return groupCourseRepository.update(existing);
                })
                .doOnSuccess(course -> logger.info("团课更新成功 - id={}", id))
@@ -440,26 +483,56 @@ public class GroupCourseService implements IGroupCourseService {
    @Override
    public Mono<GroupCourse> signIn(Long courseId, Long memberId) {
        return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
-                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
+                .switchIfEmpty(Mono.error(new RuntimeException("团课不存在或已删除")))
                .flatMap(course -> {
-                    if (course.getStatus() != 0L) {
-                        return Mono.error(new RuntimeException("课程状态不允许签到"));
+                    // 校验1：团课已取消
+                    if (course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已取消，无法签到"));
                    }
                    
+                    // 校验2：团课已结束
+                    if (course.getStatus().equals(CourseStatus.ENDED.getValue())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验3：签到时间校验（开课前2小时内才能签到）
+                    LocalDateTime now = LocalDateTime.now();
+                    LocalDateTime signInStart = course.getStartTime().minusHours(2);
+                    if (now.isBefore(signInStart)) {
+                        return Mono.error(new RuntimeException("未到签到时间，请在开课前2小时内签到"));
+                    }
+                    if (now.isAfter(course.getEndTime())) {
+                        return Mono.error(new RuntimeException("团课已结束，无法签到"));
+                    }
+                    
+                    // 校验4：课程已满员
                    if (course.getCurrentMembers() >= course.getMaxMembers()) {
-                        return Mono.error(new RuntimeException("课程已满员"));
+                        return Mono.error(new RuntimeException("课程已满员，无法签到"));
                    }
                    
-                    // 检查会员是否已预约此课程
-                    return bookingRepository.findValidBooking(courseId, memberId)
-                            .switchIfEmpty(Mono.error(new RuntimeException("会员未预约此课程")))
-                            .flatMap(booking -> {
-                                // 更新课程当前人数
-                                return groupCourseRepository.updateCurrentMembers(courseId, 1)
-                                        .flatMap(updatedCourse -> {
-                                            // 更新预约状态为已出席
-                                            return bookingRepository.updateStatus(booking.getId(), "2")
-                                                    .thenReturn(updatedCourse);
+                    // 校验5：用户今日是否已到店签到（直接查询sign_in_record表）
+                    LocalDateTime todayStart = LocalDateTime.now().toLocalDate().atStartOfDay();
+                    LocalDateTime todayEnd = todayStart.plusDays(1);
+                    return databaseClient.sql("SELECT sign_in_status FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false ORDER BY sign_in_time DESC LIMIT 1")
+                            .bind("memberId", memberId)
+                            .bind("startTime", todayStart)
+                            .bind("endTime", todayEnd)
+                            .map(row -> row.get("sign_in_status", String.class))
+                            .one()
+                            .switchIfEmpty(Mono.error(new RuntimeException("请先完成到店签到")))
+                            .flatMap(status -> {
+                                if (!"SUCCESS".equals(status)) {
+                                    return Mono.error(new RuntimeException("到店签到未成功，请重新签到"));
+                                }
+                                // 校验6：用户已预约此课程（有效预约，状态为0-已预约）
+                                return bookingRepository.findValidBooking(courseId, memberId)
+                                        .switchIfEmpty(Mono.error(new RuntimeException("您未预约此课程，无法签到")))
+                                        .flatMap(booking -> {
+                                            return groupCourseRepository.updateCurrentMembers(courseId, 1)
+                                                    .flatMap(updatedCourse -> {
+                                                        return bookingRepository.updateStatus(booking.getId(), "2")
+                                                                .thenReturn(updatedCourse);
+                                                    });
                                        });
                            });
                })
@@ -488,6 +561,18 @@ public class GroupCourseService implements IGroupCourseService {
                });
    }

+    @Override
+    public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
+        logger.info("多条件查询团课 - courseName={}, courseType={}, startDate={}, endDate={}, timePeriod={}, priceSort={}, remainingMost={}", 
+                query.getCourseName(), query.getCourseType(), query.getStartDate(), query.getEndDate(), 
+                query.getTimePeriod(), query.getPriceSort(), query.getRemainingMost());
+        
+        return groupCourseRepository.searchGroupCourses(query)
+                .doOnSuccess(result -> logger.info("多条件查询结果 - total={}, page={}, size={}", 
+                        result.getTotalElements(), result.getCurrentPage(), result.getPageSize()))
+                .doOnError(error -> logger.error("多条件查询失败 - error: {}", error.getMessage()));
+    }
+
    private Mono<Void> clearCache() {
        return redisUtil.deleteByPattern(CACHE_KEY_PREFIX + "*")
                .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*"))
@@ -0,0 +1,109 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+//import com.aliyun.oss.OSS;
+//import com.aliyun.oss.OSSClientBuilder;
+//import com.aliyun.oss.model.PutObjectRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 阿里云OSS工具类
+ */
+public class OSSUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(OSSUtil.class);
+
+    // OSS配置信息
+    private static final String ENDPOINT = "oss-cn-beijing.aliyuncs.com";
+    private static final String ACCESS_KEY_ID = "LTAI5t9TFh9Vayeahz45kZjg";
+    private static final String ACCESS_KEY_SECRET = "zD6NlCeH5UhjBs4vnQVqn8Ksi3CaZz";
+    private static final String BUCKET_NAME = "ycc-filesaver";
+
+    // OSS访问地址前缀
+    private static final String OSS_URL_PREFIX = "https://" + BUCKET_NAME + "." + ENDPOINT + "/";
+
+    // 文件存储目录
+    private static final String QRCODE_DIR = "qrcode/";
+
+    /**
+     * 上传文件到阿里云OSS
+     *
+     * @param localFilePath 本地文件路径
+     * @param fileName 文件名（不含路径）
+     * @return OSS访问地址
+     */
+    public static String uploadToOSS(String localFilePath, String fileName) {
+        OSS ossClient = null;
+        try {
+            // 创建OSS客户端
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            // 构建OSS文件路径：qrcode/2026/06/18/xxx.png
+            String datePath = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+            String ossFilePath = QRCODE_DIR + datePath + "/" + fileName;
+
+            // 创建上传请求
+            PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, ossFilePath, new File(localFilePath));
+
+            // 上传文件
+            ossClient.putObject(putObjectRequest);
+
+            // 构建访问地址
+            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+
+            logger.info("文件上传到OSS成功: localPath={}, ossUrl={}", localFilePath, accessUrl);
+
+            return accessUrl;
+        } catch (Exception e) {
+            logger.error("文件上传到OSS失败 - localPath: {}, error: {}", localFilePath, e.getMessage(), e);
+            throw new RuntimeException("文件上传到OSS失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+
+    /**
+     * 上传文件到阿里云OSS（自定义存储路径）
+     *
+     * @param localFilePath 本地文件路径
+     * @param ossDirectory OSS存储目录
+     * @param fileName 文件名（不含路径）
+     * @return OSS访问地址
+     */
+    public static String uploadToOSS(String localFilePath, String ossDirectory, String fileName) {
+        OSS ossClient = null;
+        try {
+            // 创建OSS客户端
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            // 构建OSS文件路径
+            String ossFilePath = ossDirectory + fileName;
+
+            // 创建上传请求
+            PutObjectRequest putObjectRequest = new PutObjectRequest(BUCKET_NAME, ossFilePath, new File(localFilePath));
+
+            // 上传文件
+            ossClient.putObject(putObjectRequest);
+
+            // 构建访问地址
+            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+
+            logger.info("文件上传到OSS成功: localPath={}, ossUrl={}", localFilePath, accessUrl);
+
+            return accessUrl;
+        } catch (Exception e) {
+            logger.error("文件上传到OSS失败 - localPath: {}, error: {}", localFilePath, e.getMessage(), e);
+            throw new RuntimeException("文件上传到OSS失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+}
@@ -0,0 +1,156 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 二维码生成工具类
+ */
+public class QRCodeUtil {
+    
+    private static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
+    
+    // 二维码默认保存路径（本地临时路径）
+    private static final String DEFAULT_SAVE_PATH = "D:\\Games\\exmp\\image";
+    
+    // 二维码尺寸
+    private static final int QR_CODE_WIDTH = 300;
+    private static final int QR_CODE_HEIGHT = 300;
+    
+    /**
+     * 生成二维码并保存到指定路径
+     * 
+     * @param content 二维码内容
+     * @param savePath 保存路径
+     * @param fileName 文件名（不含扩展名）
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCode(String content, String savePath, String fileName) {
+        try {
+            Path directory = Paths.get(savePath);
+            if (!Files.exists(directory)) {
+                Files.createDirectories(directory);
+                logger.info("创建二维码保存目录: {}", savePath);
+            }
+            
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.MARGIN, 1);
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
+            
+            String filePath = Paths.get(savePath, fileName + ".png").toString();
+            Path path = Paths.get(filePath);
+            
+            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
+            logger.info("二维码生成成功: {}", filePath);
+            
+            return filePath;
+        } catch (WriterException e) {
+            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("二维码保存失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码保存失败: " + e.getMessage(), e);
+        }
+    }
+    
+    /**
+     * 生成二维码并保存到默认路径
+     * 文件名格式: UUID + 创建时间
+     * 
+     * @param content 二维码内容
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCode(String content) {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        String fileName = uuid + "_" + timestamp;
+        
+        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
+    }
+    
+    /**
+     * 生成二维码并保存到默认路径，使用自定义文件名
+     * 
+     * @param content 二维码内容
+     * @param fileName 文件名（不含扩展名）
+     * @return 生成的二维码文件完整路径
+     */
+    public static String generateQRCodeWithFileName(String content, String fileName) {
+        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
+    }
+    
+    /**
+     * 生成二维码并上传到阿里云OSS
+     * 文件名格式: UUID + 创建时间
+     * 
+     * @param content 二维码内容
+     * @return 阿里云OSS访问地址
+     */
+    public static String generateQRCodeAndUploadToOSS(String content) {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        String fileName = uuid + "_" + timestamp + ".png";
+        
+        return generateQRCodeAndUploadToOSS(content, fileName);
+    }
+    
+    /**
+     * 生成二维码并上传到阿里云OSS
+     * 
+     * @param content 二维码内容
+     * @param fileName 文件名（含扩展名）
+     * @return 阿里云OSS访问地址
+     */
+    public static String generateQRCodeAndUploadToOSS(String content, String fileName) {
+        try {
+            Path tempDir = Files.createTempDirectory("qrcode_temp");
+            String tempFilePath = tempDir.resolve(fileName).toString();
+            
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.MARGIN, 1);
+            
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
+            
+            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", Paths.get(tempFilePath));
+            logger.info("二维码临时文件生成成功: {}", tempFilePath);
+            
+            String ossUrl = OSSUtil.uploadToOSS(tempFilePath, fileName);
+            
+            Files.deleteIfExists(Paths.get(tempFilePath));
+            Files.deleteIfExists(tempDir);
+            logger.info("临时文件已删除: {}", tempFilePath);
+            
+            return ossUrl;
+        } catch (WriterException e) {
+            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("二维码处理失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码处理失败: " + e.getMessage(), e);
+        }
+    }
+}
@@ -0,0 +1,71 @@
+package cn.novalon.gym.manage.groupcourse.util;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * QRCodeUtil测试类
+ */
+class QRCodeUtilTest {
+
+    @TempDir
+    Path tempDir;
+
+    @Test
+    void testGenerateQRCode() {
+        String content = "测试二维码内容";
+        String qrCodePath = QRCodeUtil.generateQRCode(content);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        assertTrue(qrCodePath.contains("D:\\Games\\exmp\\image"), "二维码应保存到指定路径");
+        
+        System.out.println("生成的二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeWithCustomPath() {
+        String content = "自定义路径测试";
+        String customPath = tempDir.toString();
+        String fileName = "test_qrcode";
+        
+        String qrCodePath = QRCodeUtil.generateQRCode(content, customPath, fileName);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        assertTrue(qrCodePath.contains(fileName), "二维码文件名应包含指定名称");
+        
+        System.out.println("生成的二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeWithJsonContent() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
+        
+        String qrCodePath = QRCodeUtil.generateQRCode(jsonContent);
+        
+        assertNotNull(qrCodePath, "二维码路径不应为空");
+        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        
+        System.out.println("JSON内容二维码路径: " + qrCodePath);
+    }
+
+    @Test
+    void testGenerateQRCodeAndUploadToOSS() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
+        
+        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
+        
+        assertNotNull(ossUrl, "OSS访问地址不应为空");
+        assertTrue(ossUrl.startsWith("https://"), "OSS访问地址应为HTTPS");
+        assertTrue(ossUrl.contains("ycc-filesaver.oss-cn-beijing.aliyuncs.com"), "OSS访问地址应包含正确的域名");
+        assertTrue(ossUrl.contains("/qrcode/"), "OSS访问地址应包含qrcode目录");
+        assertTrue(ossUrl.endsWith(".png"), "OSS访问地址应为PNG格式");
+        
+        System.out.println("上传到OSS的二维码地址: " + ossUrl);
+    }
+}
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Class name="~.*\.entity\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.dto\..*" />
+    </Match>
+    <Match>
+        <Class name="~.*\.converter\..*" />
+    </Match>
+</FindBugsFilter>
@@ -32,6 +32,7 @@ public class MemberCardRecordHandler {

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

+import cn.novalon.gym.manage.common.exception.NotFoundException;
 import cn.novalon.gym.manage.member.config.WechatProperties;
 import cn.novalon.gym.manage.member.dto.AdminUpdatePhoneDto;
 import cn.novalon.gym.manage.member.dto.SearchMemberDto;
@@ -16,6 +17,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
@@ -50,7 +52,11 @@ public class MemberHandler {
        return memberService.getMemberInfo(memberId)
                .flatMap(info -> ServerResponse.ok()
                            .contentType(MediaType.APPLICATION_JSON)
-                            .bodyValue(info));
+                            .bodyValue(info))
+                .onErrorResume(NotFoundException.class, e -> 
+                    ServerResponse.status(HttpStatus.NOT_FOUND)
+                            .contentType(MediaType.APPLICATION_JSON)
+                            .bodyValue(java.util.Map.of("code", 404, "message", e.getMessage())));
    }

    @Operation(summary = "更新会员信息", description = "更新会员昵称、性别、生日、头像、地址等信息")
@@ -65,21 +65,37 @@ public class MemberServiceImpl implements MemberService {
    public Mono<MemberInfoVO> getMemberInfo(Long memberId) {
        String cacheKey = MEMBER_INFO_CACHE_PREFIX + memberId;

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

    @Override
@@ -0,0 +1,95 @@
+
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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-payment</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Payment</name>
+    <description>Payment Module - Integrates Huifu Payment Gateway</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.78.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.78.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,23 @@
+package cn.novalon.gym.manage.payment.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+
+@Configuration
+public class CorsConfig {
+    @Bean
+    public CorsWebFilter corsWebFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedOrigin("*");
+        config.addAllowedMethod("*");
+        config.addAllowedHeader("*");
+        config.setAllowCredentials(false);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        return new CorsWebFilter(source);
+    }
+}
@@ -0,0 +1,34 @@
+
+package cn.novalon.gym.manage.payment.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "payment.huifu")
+public class HuifuPayConfig {
+
+    private String sysId;
+
+    private String productId;
+
+    private String huifuId;
+
+    private String acctId;
+
+    private String privateKey;
+
+    private String publicKey;
+
+    private String createUrl;
+
+    private String queryUrl;
+
+    private String refundUrl;
+
+    private String notifyUrl;
+
+    private String version = "1.0";
+}
@@ -0,0 +1,58 @@
+
+package cn.novalon.gym.manage.payment.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentCreateRequest {
+
+    @NotNull(message = "会员ID不能为空")
+    private Long memberId;
+
+    @NotBlank(message = "订单类型不能为空")
+    @Size(max = 50, message = "订单类型长度不能超过50")
+    private String orderType;
+
+    @NotBlank(message = "商品描述不能为空")
+    @Size(max = 128, message = "商品描述长度不能超过128")
+    private String goodsDesc;
+
+    @NotBlank(message = "交易金额不能为空")
+    private String transAmt;
+
+    @NotBlank(message = "交易类型不能为空")
+    @Size(max = 16, message = "交易类型长度不能超过16")
+    private String tradeType;
+
+    @Size(max = 255, message = "备注长度不能超过255")
+    private String remark;
+
+    @Size(max = 9, message = "账户号长度不能超过9")
+    private String acctId;
+
+    private String timeExpire;
+
+    private String delayAcctFlag;
+
+    private Integer feeFlag;
+
+    @Size(max = 128, message = "禁用支付方式长度不能超过128")
+    private String limitPayType;
+
+    @Size(max = 32, message = "渠道号长度不能超过32")
+    private String channelNo;
+
+    private String payScene;
+
+    private String notifyUrl;
+}
@@ -0,0 +1,28 @@
+
+package cn.novalon.gym.manage.payment.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentCreateResponse {
+
+    private String orderId;
+
+    private String tradeType;
+
+    private String qrCode;
+
+    private String payInfo;
+
+    private String transAmt;
+
+    private String payStatus;
+
+    private String message;
+}
@@ -0,0 +1,30 @@
+
+package cn.novalon.gym.manage.payment.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentQueryResponse {
+
+    private String orderId;
+
+    private String tradeType;
+
+    private String transAmt;
+
+    private String payStatus;
+
+    private String outTransId;
+
+    private String qrCode;
+
+    private String payTime;
+
+    private String message;
+}
@@ -0,0 +1,22 @@
+
+package cn.novalon.gym.manage.payment.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaymentRefundResponse {
+
+    private String orderId;
+
+    private String refundAmt;
+
+    private String refundStatus;
+
+    private String message;
+}
@@ -0,0 +1,78 @@
+
+package cn.novalon.gym.manage.payment.handler;
+
+import cn.novalon.gym.manage.payment.dto.request.PaymentCreateRequest;
+import cn.novalon.gym.manage.payment.service.IPaymentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+@Slf4j
+@Component
+@Tag(name = "支付管理", description = "斗拱聚合支付相关操作")
+public class PaymentHandler {
+
+    private final IPaymentService paymentService;
+
+    public PaymentHandler(IPaymentService paymentService) {
+        this.paymentService = paymentService;
+    }
+
+    @Operation(summary = "创建支付", description = "创建支付订单，支持微信、支付宝等多种支付方式")
+    public Mono<ServerResponse> createPayment(ServerRequest request) {
+        log.info("========== PaymentHandler.createPayment 被调用 ==========");
+        return request.bodyToMono(PaymentCreateRequest.class)
+                .flatMap(paymentService::createPayment)
+                .flatMap(response -> ServerResponse.ok().bodyValue(response))
+                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse("创建支付失败: " + e.getMessage())));
+    }
+
+    @Operation(summary = "查询支付状态", description = "根据订单号查询支付状态")
+    public Mono<ServerResponse> queryPayment(ServerRequest request) {
+        String orderId = request.pathVariable("orderId");
+        return paymentService.queryPayment(orderId)
+                .flatMap(response -> ServerResponse.ok().bodyValue(response))
+                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse(e.getMessage())));
+    }
+
+    @Operation(summary = "退款", description = "根据订单号发起退款")
+    public Mono<ServerResponse> refundPayment(ServerRequest request) {
+        String orderId = request.pathVariable("orderId");
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String refundAmt = String.valueOf(body.get("refundAmt"));
+                    return paymentService.refundPayment(orderId, refundAmt);
+                })
+                .flatMap(response -> ServerResponse.ok().bodyValue(response))
+                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse("退款失败: " + e.getMessage())));
+    }
+
+    @Operation(summary = "支付回调", description = "支付成功回调通知")
+    public Mono<ServerResponse> handleNotify(ServerRequest request) {
+        return request.bodyToMono(String.class)
+                .flatMap(paymentService::handleNotify)
+                .then(ServerResponse.ok().bodyValue(buildSuccessResponse("处理成功")))
+                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse("处理失败: " + e.getMessage())));
+    }
+
+    private Map<String, Object> buildErrorResponse(String message) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("success", false);
+        response.put("message", message);
+        return response;
+    }
+
+    private Map<String, Object> buildSuccessResponse(String message) {
+        Map<String, Object> response = new HashMap<>();
+        response.put("success", true);
+        response.put("message", message);
+        return response;
+    }
+}
@@ -0,0 +1,19 @@
+
+package cn.novalon.gym.manage.payment.service;
+
+import cn.novalon.gym.manage.payment.dto.request.PaymentCreateRequest;
+import cn.novalon.gym.manage.payment.dto.response.PaymentCreateResponse;
+import cn.novalon.gym.manage.payment.dto.response.PaymentQueryResponse;
+import cn.novalon.gym.manage.payment.dto.response.PaymentRefundResponse;
+import reactor.core.publisher.Mono;
+
+public interface IPaymentService {
+
+    Mono<PaymentCreateResponse> createPayment(PaymentCreateRequest request);
+
+    Mono<PaymentQueryResponse> queryPayment(String orderId);
+
+    Mono<PaymentRefundResponse> refundPayment(String orderId, String refundAmt);
+
+    Mono<Void> handleNotify(String notifyBody);
+}
@@ -0,0 +1,723 @@
+package cn.novalon.gym.manage.payment.service.impl;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import cn.novalon.gym.manage.payment.dto.request.PaymentCreateRequest;
+import cn.novalon.gym.manage.payment.dto.response.PaymentCreateResponse;
+import cn.novalon.gym.manage.payment.dto.response.PaymentQueryResponse;
+import cn.novalon.gym.manage.payment.dto.response.PaymentRefundResponse;
+import cn.novalon.gym.manage.payment.service.IPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+public class PaymentServiceImpl implements IPaymentService {
+
+    private final OkHttpClient okHttpClient;
+    private final Map<String, PaymentInfo> paymentCache = new ConcurrentHashMap<>();
+
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+    // ==================== 配置 ====================
+    private static final String SYS_ID = "6666000207573586";           // 代理商
+    private static final String PRODUCT_ID = "XLSISV";
+    private static final String HUIFU_ID = "6666000207581039";         // 商户号
+    private static final String ACCT_ID = "F28308086";
+    private static final String ALIPAY_CHANNEL = "hlm001";
+    private static final String NOTIFY_URL = "http://localhost:8084/api/payment/notify";
+
+    // ===== v4 接口 =====
+    private static final String CREATE_URL = "https://api.huifu.com/v4/trade/payment/create";
+    private static final String QUERY_URL = "https://api.huifu.com/v4/trade/payment/query";
+    private static final String REFUND_URL = "https://api.huifu.com/v4/trade/payment/refund";
+    private static final String CLOSE_URL = "https://api.huifu.com/v4/trade/payment/close";
+
+    // ==================== 密钥 ====================
+    // 商户私钥（用于签名请求）
+    private static final String MERCHANT_PRIVATE_KEY =
+            "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
+
+    // 汇付公钥（用于验证回调签名）
+    private static final String HUIFU_PUBLIC_KEY =
+            "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+
+    public PaymentServiceImpl() {
+        this.okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS)
+                .retryOnConnectionFailure(false)
+                .build();
+        
+        // 验证私钥是否有效
+        validatePrivateKey();
+    }
+    
+    private void validatePrivateKey() {
+        try {
+            log.info("========== 验证私钥 ==========");
+            String privateKeyBase64 = MERCHANT_PRIVATE_KEY.replaceAll("\\s", "");
+            log.info("私钥长度（去空格后）: {}", privateKeyBase64.length());
+            
+            byte[] privateKeyBytes = Base64.getDecoder().decode(privateKeyBase64);
+            log.info("私钥解码后长度: {} bytes", privateKeyBytes.length);
+            
+            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(privateKeyBytes);
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+            PrivateKey privateKey = keyFactory.generatePrivate(spec);
+            log.info("私钥加载成功，算法: {}", privateKey.getAlgorithm());
+            
+            // 测试签名
+            Signature signature = Signature.getInstance("SHA256withRSA");
+            signature.initSign(privateKey);
+            signature.update("test".getBytes(StandardCharsets.UTF_8));
+            signature.sign();
+            log.info("私钥签名测试成功!");
+            log.info("========== 私钥验证完成 ==========");
+        } catch (Exception e) {
+            log.error("========== 私钥验证失败 ==========", e);
+        }
+    }
+
+    // ==================== 1. 创建支付订单 ====================
+    @Override
+    public Mono<PaymentCreateResponse> createPayment(PaymentCreateRequest request) {
+        log.info("========== createPayment 方法被调用 ==========");
+        String orderId = UUID.randomUUID().toString().replace("-", "");
+        String reqDate = LocalDateTime.now().format(DATE_FORMATTER);
+        String reqSeqId = "RQ" + System.currentTimeMillis();
+
+        // ===== 构建 data 参数 =====
+        Map<String, Object> data = new HashMap<>();
+        data.put("req_date", reqDate);
+        data.put("req_seq_id", reqSeqId);
+        data.put("huifu_id", HUIFU_ID);
+        data.put("trade_type", "ALIPAY");
+        data.put("pay_type", "APP");  // APP 支付，返回 alipay_scheme
+        data.put("trans_amt", request.getTransAmt() != null ? request.getTransAmt() : "1");
+        data.put("goods_desc", request.getGoodsDesc() != null ? request.getGoodsDesc() : "会员卡");
+        data.put("acct_id", ACCT_ID);
+        data.put("notify_url", NOTIFY_URL);
+        data.put("remark", request.getRemark() != null ? request.getRemark() : "");
+
+        // ===== 支付宝参数 =====
+        data.put("alipay_channel", ALIPAY_CHANNEL);
+
+        String dataJson = JSONUtil.toJsonStr(data);
+        String sign = generateSign(dataJson);
+
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("sys_id", SYS_ID);
+        requestBody.put("product_id", PRODUCT_ID);
+        requestBody.put("data", dataJson);
+        requestBody.put("sign", sign);
+
+        return Mono.fromCallable(() -> {
+            String jsonBody = JSONUtil.toJsonStr(requestBody);
+            log.info("========== 发起支付宝支付请求 (APP) ==========");
+            log.info("请求URL: {}", CREATE_URL);
+            log.info("请求Body: {}", jsonBody);
+            log.info("==================================");
+
+            Request httpRequest = new Request.Builder()
+                    .url(CREATE_URL)
+                    .post(RequestBody.create(jsonBody, MediaType.parse("application/json; charset=utf-8")))
+                    .addHeader("Content-Type", "application/json; charset=UTF-8")
+                    .addHeader("Accept", "application/json")
+                    .build();
+
+            try (Response response = okHttpClient.newCall(httpRequest).execute()) {
+                int httpCode = response.code();
+                String responseBody = response.body() != null ? response.body().string() : "";
+
+                log.info("========== 收到响应 ==========");
+                log.info("HTTP状态码: {}", httpCode);
+                log.info("响应Body: {}", responseBody);
+                log.info("===============================");
+
+                if (httpCode >= 400) {
+                    if (responseBody != null && !responseBody.isEmpty()) {
+                        try {
+                            JSONObject errorJson = JSONUtil.parseObj(responseBody);
+                            String errorMsg = errorJson.getStr("error_msg");
+                            String errorCode = errorJson.getStr("error_code");
+                            if (errorMsg != null) {
+                                throw new RuntimeException("支付失败: " + errorMsg + " (code: " + errorCode + ")");
+                            }
+                        } catch (Exception e) {
+                            // 忽略
+                        }
+                    }
+                    throw new RuntimeException("支付请求失败: HTTP " + httpCode);
+                }
+
+                if (responseBody == null || responseBody.isEmpty()) {
+                    throw new RuntimeException("响应体为空");
+                }
+
+                return parseCreateResponse(responseBody, orderId, request);
+            } catch (IOException e) {
+                log.error("网络请求异常", e);
+                throw new RuntimeException("网络请求异常: " + e.getMessage(), e);
+            }
+        });
+    }
+
+    // ==================== 2. 查询支付状态 ====================
+    @Override
+    public Mono<PaymentQueryResponse> queryPayment(String orderId) {
+        PaymentInfo paymentInfo = paymentCache.get(orderId);
+        if (paymentInfo == null) {
+            return Mono.error(new RuntimeException("支付记录不存在"));
+        }
+
+        String reqDate = LocalDateTime.now().format(DATE_FORMATTER);
+        String reqSeqId = "RQ" + System.currentTimeMillis();
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("req_date", reqDate);
+        data.put("req_seq_id", reqSeqId);
+        data.put("huifu_id", HUIFU_ID);
+        data.put("out_trans_id", paymentInfo.outTransId);
+
+        String dataJson = JSONUtil.toJsonStr(data);
+        String sign = generateSign(dataJson);
+
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("sys_id", SYS_ID);
+        requestBody.put("product_id", PRODUCT_ID);
+        requestBody.put("data", dataJson);
+        requestBody.put("sign", sign);
+
+        return Mono.fromCallable(() -> {
+            String jsonBody = JSONUtil.toJsonStr(requestBody);
+            log.info("查询支付状态, orderId={}", orderId);
+
+            Request httpRequest = new Request.Builder()
+                    .url(QUERY_URL)
+                    .post(RequestBody.create(jsonBody, MediaType.parse("application/json; charset=utf-8")))
+                    .addHeader("Content-Type", "application/json; charset=UTF-8")
+                    .addHeader("Accept", "application/json")
+                    .build();
+
+            try (Response response = okHttpClient.newCall(httpRequest).execute()) {
+                int httpCode = response.code();
+                String responseBody = response.body() != null ? response.body().string() : "";
+
+                log.info("查询响应: code={}, body={}", httpCode, responseBody);
+
+                if (httpCode >= 400) {
+                    throw new RuntimeException("查询失败: HTTP " + httpCode);
+                }
+
+                if (responseBody == null || responseBody.isEmpty()) {
+                    throw new RuntimeException("查询响应为空");
+                }
+
+                return parseQueryResponse(responseBody, orderId);
+            }
+        });
+    }
+
+    // ==================== 3. 申请退款 ====================
+    @Override
+    public Mono<PaymentRefundResponse> refundPayment(String orderId, String refundAmt) {
+        PaymentInfo paymentInfo = paymentCache.get(orderId);
+        if (paymentInfo == null) {
+            return Mono.error(new RuntimeException("支付记录不存在"));
+        }
+
+        String reqDate = LocalDateTime.now().format(DATE_FORMATTER);
+        String reqSeqId = "RQ" + System.currentTimeMillis();
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("req_date", reqDate);
+        data.put("req_seq_id", reqSeqId);
+        data.put("huifu_id", HUIFU_ID);
+        data.put("out_trans_id", paymentInfo.outTransId);
+        data.put("trans_amt", refundAmt);
+
+        String dataJson = JSONUtil.toJsonStr(data);
+        String sign = generateSign(dataJson);
+
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("sys_id", SYS_ID);
+        requestBody.put("product_id", PRODUCT_ID);
+        requestBody.put("data", dataJson);
+        requestBody.put("sign", sign);
+
+        return Mono.fromCallable(() -> {
+            String jsonBody = JSONUtil.toJsonStr(requestBody);
+            log.info("发起退款请求, orderId={}", orderId);
+
+            Request httpRequest = new Request.Builder()
+                    .url(REFUND_URL)
+                    .post(RequestBody.create(jsonBody, MediaType.parse("application/json; charset=utf-8")))
+                    .addHeader("Content-Type", "application/json; charset=UTF-8")
+                    .addHeader("Accept", "application/json")
+                    .build();
+
+            try (Response response = okHttpClient.newCall(httpRequest).execute()) {
+                int httpCode = response.code();
+                String responseBody = response.body() != null ? response.body().string() : "";
+
+                log.info("退款响应: code={}, body={}", httpCode, responseBody);
+
+                if (httpCode >= 400) {
+                    throw new RuntimeException("退款失败: HTTP " + httpCode);
+                }
+
+                return parseRefundResponse(responseBody, orderId, refundAmt);
+            }
+        });
+    }
+
+    // ==================== 4. 关闭订单 ====================
+    public Mono<Void> closePayment(String orderId) {
+        PaymentInfo paymentInfo = paymentCache.get(orderId);
+        if (paymentInfo == null) {
+            return Mono.error(new RuntimeException("支付记录不存在"));
+        }
+
+        String reqDate = LocalDateTime.now().format(DATE_FORMATTER);
+        String reqSeqId = "RQ" + System.currentTimeMillis();
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("req_date", reqDate);
+        data.put("req_seq_id", reqSeqId);
+        data.put("huifu_id", HUIFU_ID);
+        data.put("out_trans_id", paymentInfo.outTransId);
+
+        String dataJson = JSONUtil.toJsonStr(data);
+        String sign = generateSign(dataJson);
+
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("sys_id", SYS_ID);
+        requestBody.put("product_id", PRODUCT_ID);
+        requestBody.put("data", dataJson);
+        requestBody.put("sign", sign);
+
+        return Mono.fromRunnable(() -> {
+            try {
+                String jsonBody = JSONUtil.toJsonStr(requestBody);
+                log.info("关闭订单请求, orderId={}", orderId);
+
+                Request httpRequest = new Request.Builder()
+                        .url(CLOSE_URL)
+                        .post(RequestBody.create(jsonBody, MediaType.parse("application/json; charset=utf-8")))
+                        .addHeader("Content-Type", "application/json; charset=UTF-8")
+                        .addHeader("Accept", "application/json")
+                        .build();
+
+                try (Response response = okHttpClient.newCall(httpRequest).execute()) {
+                    String responseBody = response.body() != null ? response.body().string() : "";
+                    log.info("关闭订单响应, code={}, body={}", response.code(), responseBody);
+                }
+            } catch (Exception e) {
+                log.error("关闭订单异常", e);
+            }
+        });
+    }
+
+    // ==================== 5. 处理异步通知 ====================
+    @Override
+    public Mono<Void> handleNotify(String notifyBody) {
+        return Mono.fromRunnable(() -> {
+            log.info("========== 收到支付回调通知 ==========");
+            log.info("回调内容: {}", notifyBody);
+
+            try {
+                JSONObject notifyJson = JSONUtil.parseObj(notifyBody);
+                String sign = notifyJson.getStr("sign");
+                String data = notifyJson.getStr("data");
+
+                // 直接打印回调信息，不验证签名
+                log.info("签名: {}", sign);
+                log.info("数据: {}", data);
+
+                if (data != null && !data.isEmpty()) {
+                    JSONObject dataJson = JSONUtil.parseObj(data);
+                    String respCode = dataJson.getStr("resp_code");
+                    String respDesc = dataJson.getStr("resp_desc");
+                    String outTransId = dataJson.getStr("out_trans_id");
+                    String transStatus = dataJson.getStr("trans_status");
+                    String transAmt = dataJson.getStr("trans_amt");
+                    String finishDate = dataJson.getStr("finish_date");
+                    String finishTime = dataJson.getStr("finish_time");
+
+                    log.info("========== 回调数据解析 ==========");
+                    log.info("响应码: {}", respCode);
+                    log.info("响应描述: {}", respDesc);
+                    log.info("商户订单号: {}", outTransId);
+                    log.info("交易状态: {}", transStatus);
+                    log.info("交易金额: {}", transAmt);
+                    log.info("交易完成日期: {}", finishDate);
+                    log.info("交易完成时间: {}", finishTime);
+                    log.info("===================================");
+
+                    // 更新本地支付状态
+                    if ("S".equals(transStatus) || "TRADE_SUCCESS".equals(transStatus)) {
+                        paymentCache.values().stream()
+                                .filter(info -> outTransId != null && outTransId.equals(info.outTransId))
+                                .findFirst()
+                                .ifPresent(info -> {
+                                    info.payStatus = transStatus;
+                                    info.payTime = LocalDateTime.now();
+                                    log.info("支付状态更新成功, orderId={}, status={}", info.orderId, transStatus);
+                                });
+                    }
+                }
+            } catch (Exception e) {
+                log.error("处理回调异常", e);
+            }
+        });
+    }
+
+    // ==================== 签名方法 ====================
+    private String generateSign(String dataJson) {
+        Exception originalException = null;
+        System.err.println(">>>>>>>>> [PaymentServiceImpl] generateSign 开始执行 <<<<<<<<<<");
+        System.err.flush();
+        try {
+            System.err.println(">>>>>>>>> 开始签名方法 <<<<<<<<<<");
+            System.err.flush();
+            log.error("========== 开始签名 ==========");
+            
+            // 打印密钥的前几个字节来检查格式
+            String privateKeyBase64 = MERCHANT_PRIVATE_KEY.replaceAll("\\s", "");
+            byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
+            System.err.println(">>>>>>>>> 密钥前20字节(hex): " + bytesToHex(keyBytes, 20) + " <<<<<<<<<<");
+            System.err.println(">>>>>>>>> 密钥长度: " + keyBytes.length + " bytes <<<<<<<<<<");
+            System.err.flush();
+            
+            // 检查是否是PKCS#8格式 (应该以30 82开头)
+            if (keyBytes.length > 2) {
+                System.err.println(">>>>>>>>> 密钥前2字节(hex): " + bytesToHex(keyBytes, 2) + " <<<<<<<<<<");
+                boolean startsWith30 = (keyBytes[0] & 0xFF) == 0x30;
+                System.err.println(">>>>>>>>> 密钥是否以0x30开头: " + startsWith30 + " <<<<<<<<<<");
+                System.err.flush();
+                
+                // 打印更多头部字节来识别密钥类型
+                if (keyBytes.length > 4) {
+                    System.err.println(">>>>>>>>> 密钥前5字节(hex): " + bytesToHex(keyBytes, 5) + " <<<<<<<<<<");
+                    System.err.flush();
+                    // RSA PKCS#8 私钥通常以 30 82 04** 开头
+                    // EC PKCS#8 私钥通常以 30 82 04** 开头 (和RSA一样，需要看后面的内容区分)
+                    // 如果是 30 82，且第4个字节是 0x00 或 0x01，可能是RSA私钥
+                    // 如果是 30 82，且第4个字节是 0x02 或 0x03，可能是EC私钥
+                }
+            }
+            
+            log.info("私钥长度（去空格后）: {}", privateKeyBase64.length());
+            
+            // 检查私钥格式
+            if (privateKeyBase64.length() < 100) {
+                throw new RuntimeException("私钥长度异常: " + privateKeyBase64.length());
+            }
+            
+            log.info("私钥前50字符: {}", privateKeyBase64.substring(0, 50));
+            log.info("私钥后50字符: {}", privateKeyBase64.substring(privateKeyBase64.length() - 50));
+            
+            log.info("开始解码私钥...");
+            byte[] privateKeyBytes = Base64.getDecoder().decode(privateKeyBase64);
+            log.info("私钥解码后长度: {} bytes", privateKeyBytes.length);
+            
+            // 直接尝试使用PKCS8EncodedKeySpec加载
+            log.info("开始生成 PrivateKey 对象...");
+            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(privateKeyBytes);
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+            PrivateKey privateKey = keyFactory.generatePrivate(spec);
+            log.info("私钥生成成功，算法: {}", privateKey.getAlgorithm());
+            
+            log.info("开始签名...");
+            Signature signature = Signature.getInstance("SHA256withRSA");
+            log.info("调用 initSign...");
+            signature.initSign(privateKey);
+            log.info("initSign 完成");
+            log.info("开始 update...");
+            signature.update(dataJson.getBytes(StandardCharsets.UTF_8));
+            log.info("update 完成，开始 sign...");
+            String sign = Base64.getEncoder().encodeToString(signature.sign());
+            log.info("签名生成成功, 签名长度: {}", sign.length());
+            log.info("========== 签名完成 ==========");
+            return sign;
+        } catch (RuntimeException e) {
+            log.error("签名生成失败(RuntimeException): {} - {}", e.getClass().getName(), e.getMessage(), e);
+            throw e;
+        } catch (Exception e) {
+            log.error("签名生成失败(Exception): {} - {}", e.getClass().getName(), e.getMessage(), e);
+            throw new RuntimeException("签名生成失败: " + e.getMessage(), e);
+        }
+    }
+
+    private boolean verifySign(String sign, String dataJson) {
+        try {
+            String publicKeyBase64 = HUIFU_PUBLIC_KEY.replaceAll("\\s", "");
+            byte[] publicKeyBytes = Base64.getDecoder().decode(publicKeyBase64);
+            X509EncodedKeySpec spec = new X509EncodedKeySpec(publicKeyBytes);
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+            PublicKey publicKey = keyFactory.generatePublic(spec);
+            Signature signature = Signature.getInstance("SHA256withRSA");
+            signature.initVerify(publicKey);
+            signature.update(dataJson.getBytes(StandardCharsets.UTF_8));
+            return signature.verify(Base64.getDecoder().decode(sign));
+        } catch (Exception e) {
+            log.error("验签失败", e);
+            return false;
+        }
+    }
+
+    // ==================== 响应解析方法 ====================
+
+    private PaymentCreateResponse parseCreateResponse(String responseBody, String orderId, PaymentCreateRequest request) {
+        JSONObject responseJson = JSONUtil.parseObj(responseBody);
+        String dataStr = responseJson.getStr("data");
+        JSONObject data = JSONUtil.parseObj(dataStr);
+
+        String respCode = data.getStr("resp_code");
+        if (!"000000".equals(respCode)) {
+            throw new RuntimeException("支付创建失败: " + data.getStr("resp_desc") + " (code: " + respCode + ")");
+        }
+
+        // APP 支付优先取 alipay_scheme
+        String payUrl = data.getStr("alipay_scheme");
+        if (payUrl == null) {
+            payUrl = data.getStr("pay_url");
+        }
+        if (payUrl == null) {
+            payUrl = data.getStr("pay_info");
+        }
+
+        PaymentInfo paymentInfo = new PaymentInfo();
+        paymentInfo.orderId = orderId;
+        paymentInfo.memberId = request.getMemberId();
+        paymentInfo.orderType = request.getOrderType();
+        paymentInfo.transAmt = request.getTransAmt();
+        paymentInfo.goodsDesc = request.getGoodsDesc();
+        paymentInfo.payStatus = "PENDING";
+        paymentInfo.outTransId = data.getStr("out_trans_id");
+        paymentInfo.payUrl = payUrl;
+        paymentInfo.remark = request.getRemark();
+        paymentCache.put(orderId, paymentInfo);
+
+        log.info("支付创建成功, orderId={}, outTransId={}, payUrl={}", orderId, paymentInfo.outTransId, payUrl);
+
+        return PaymentCreateResponse.builder()
+                .orderId(orderId)
+                .payInfo(payUrl)
+                .transAmt(request.getTransAmt())
+                .payStatus("PENDING")
+                .message("支付创建成功")
+                .build();
+    }
+
+    private PaymentQueryResponse parseQueryResponse(String responseBody, String orderId) {
+        JSONObject responseJson = JSONUtil.parseObj(responseBody);
+        String dataStr = responseJson.getStr("data");
+        JSONObject data = JSONUtil.parseObj(dataStr);
+
+        String respCode = data.getStr("resp_code");
+        if (!"000000".equals(respCode)) {
+            throw new RuntimeException("查询失败: " + data.getStr("resp_desc"));
+        }
+
+        PaymentInfo paymentInfo = paymentCache.get(orderId);
+        if (paymentInfo != null) {
+            paymentInfo.payStatus = data.getStr("trans_status");
+        }
+
+        return PaymentQueryResponse.builder()
+                .orderId(orderId)
+                .tradeType(data.getStr("trade_type"))
+                .transAmt(data.getStr("trans_amt"))
+                .payStatus(data.getStr("trans_status"))
+                .outTransId(data.getStr("out_trans_id"))
+                .payTime(data.getStr("end_time"))
+                .message("查询成功")
+                .build();
+    }
+
+    private PaymentRefundResponse parseRefundResponse(String responseBody, String orderId, String refundAmt) {
+        JSONObject responseJson = JSONUtil.parseObj(responseBody);
+        String dataStr = responseJson.getStr("data");
+        JSONObject data = JSONUtil.parseObj(dataStr);
+
+        String respCode = data.getStr("resp_code");
+        if (!"000000".equals(respCode)) {
+            throw new RuntimeException("退款失败: " + data.getStr("resp_desc"));
+        }
+
+        PaymentInfo paymentInfo = paymentCache.get(orderId);
+        if (paymentInfo != null) {
+            paymentInfo.payStatus = "REFUNDED";
+        }
+
+        return PaymentRefundResponse.builder()
+                .orderId(orderId)
+                .refundAmt(refundAmt)
+                .refundStatus(data.getStr("trans_status"))
+                .message("退款成功")
+                .build();
+    }
+
+    // ==================== 工具方法 ====================
+    private static String bytesToHex(byte[] bytes, int length) {
+        int len = Math.min(bytes.length, length);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            sb.append(String.format("%02X ", bytes[i] & 0xFF));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 将PKCS#1格式的RSA私钥转换为PKCS#8格式
+     * PKCS#1: SEQUENCE { version, modulus, publicExponent, privateExponent, prime1, prime2, ... }
+     * PKCS#8: SEQUENCE { version, algorithmIdentifier, OCTET STRING (containing PKCS#1) }
+     */
+    private byte[] convertPKCS1ToPKCS8(byte[] pkcs1Key) {
+        try {
+            log.info("检测到PKCS#1格式私钥，开始转换为PKCS#8格式...");
+            log.info("PKCS#1密钥长度: {} bytes", pkcs1Key.length);
+            
+            // RSA算法OID: 1.2.840.113549.1.1.1
+            byte[] rsaOid = new byte[] {
+                0x06, 0x09, 0x2A, (byte)0x86, 0x48, (byte)0x86, (byte)0xF7, 0x0D, 0x01, 0x01, 0x01
+            };
+            
+            // 构建AlgorithmIdentifier: SEQUENCE { OID, NULL }
+            // SEQUENCE (2 bytes: tag + length) + OID + NULL = 15 bytes total
+            byte[] algorithmIdentifier = new byte[15];
+            int idx = 0;
+            algorithmIdentifier[idx++] = 0x30; // SEQUENCE tag
+            algorithmIdentifier[idx++] = 0x0D; // length = 13 bytes for OID + NULL
+            System.arraycopy(rsaOid, 0, algorithmIdentifier, idx, rsaOid.length);
+            idx += rsaOid.length;
+            algorithmIdentifier[idx++] = 0x05; // NULL tag
+            algorithmIdentifier[idx++] = 0x00; // NULL value
+            
+            log.info("AlgorithmIdentifier长度: {} bytes", algorithmIdentifier.length);
+            
+            // 计算 OCTET STRING 长度编码需要的字节数
+            int octetStringLengthBytes = 1; // tag
+            if (pkcs1Key.length > 127) {
+                if (pkcs1Key.length > 255) {
+                    octetStringLengthBytes += 3; // 0x82 + 2 length bytes
+                } else {
+                    octetStringLengthBytes += 2; // 0x81 + 1 length byte
+                }
+            } else {
+                octetStringLengthBytes += 1; // 1 length byte
+            }
+            
+            // 计算 version INTEGER 编码 (3 bytes: tag + length + value)
+            int versionBytes = 3;
+            
+            // 计算 total length of inner content (version + algorithmId + octetString)
+            int innerContentLength = versionBytes + algorithmIdentifier.length + octetStringLengthBytes + pkcs1Key.length;
+            
+            // 计算 outer SEQUENCE 长度编码需要的字节数
+            int sequenceLengthBytes = 1; // tag
+            if (innerContentLength > 127) {
+                if (innerContentLength > 255) {
+                    sequenceLengthBytes += 3; // 0x82 + 2 length bytes
+                } else {
+                    sequenceLengthBytes += 2; // 0x81 + 1 length byte
+                }
+            } else {
+                sequenceLengthBytes += 1;
+            }
+            
+            // 分配最终数组
+            int totalLen = sequenceLengthBytes + innerContentLength;
+            byte[] pkcs8Key = new byte[totalLen];
+            log.info("PKCS#8密钥分配: {} bytes", totalLen);
+            
+            int offset = 0;
+            
+            // outer SEQUENCE
+            pkcs8Key[offset++] = 0x30;
+            if (innerContentLength > 127) {
+                if (innerContentLength > 255) {
+                    pkcs8Key[offset++] = (byte)0x82;
+                    pkcs8Key[offset++] = (byte)((innerContentLength >> 8) & 0xFF);
+                    pkcs8Key[offset++] = (byte)(innerContentLength & 0xFF);
+                } else {
+                    pkcs8Key[offset++] = (byte)0x81;
+                    pkcs8Key[offset++] = (byte)innerContentLength;
+                }
+            } else {
+                pkcs8Key[offset++] = (byte)innerContentLength;
+            }
+            
+            // version = 0
+            pkcs8Key[offset++] = 0x02;
+            pkcs8Key[offset++] = 0x01;
+            pkcs8Key[offset++] = 0x00;
+            
+            // algorithmIdentifier
+            System.arraycopy(algorithmIdentifier, 0, pkcs8Key, offset, algorithmIdentifier.length);
+            offset += algorithmIdentifier.length;
+            
+            // privateKey as OCTET STRING
+            pkcs8Key[offset++] = 0x04;
+            if (pkcs1Key.length > 127) {
+                if (pkcs1Key.length > 255) {
+                    pkcs8Key[offset++] = (byte)0x82;
+                    pkcs8Key[offset++] = (byte)((pkcs1Key.length >> 8) & 0xFF);
+                    pkcs8Key[offset++] = (byte)(pkcs1Key.length & 0xFF);
+                } else {
+                    pkcs8Key[offset++] = (byte)0x81;
+                    pkcs8Key[offset++] = (byte)pkcs1Key.length;
+                }
+            } else {
+                pkcs8Key[offset++] = (byte)pkcs1Key.length;
+            }
+            
+            // 复制 PKCS#1 私钥
+            System.arraycopy(pkcs1Key, 0, pkcs8Key, offset, pkcs1Key.length);
+            
+            log.info("PKCS#1到PKCS#8转换完成，最终长度: {} bytes", pkcs8Key.length);
+            return pkcs8Key;
+        } catch (Exception e) {
+            log.error("PKCS#1到PKCS#8转换失败", e);
+            throw new RuntimeException("密钥格式转换失败: " + e.getMessage(), e);
+        }
+    }
+
+    // ==================== 内部缓存类 ====================
+    private static class PaymentInfo {
+        String orderId;
+        Long memberId;
+        String orderType;
+        String tradeType;
+        String transAmt;
+        String goodsDesc;
+        String payStatus;
+        String outTransId;
+        String payUrl;
+        String hfSeqId;
+        LocalDateTime payTime;
+        String remark;
+    }
+}
@@ -0,0 +1 @@
+cn.novalon.gym.manage.payment.config.HuifuPayConfig
@@ -1,223 +1,387 @@
-2026-06-11T13:43:44.371+08:00 TRACE 9324 --- [gym-manage-api] [nio-8084-exec-2] o.s.w.s.adapter.HttpWebHandlerAdapter    : [27afd417] HTTP POST "/api/groupCourse/types/1/labels", headers={masked}
-2026-06-11T13:43:44.372+08:00 DEBUG 9324 --- [gym-manage-api] [     parallel-2] o.s.w.s.s.DefaultWebSessionManager       : Created new WebSession.
-2026-06-11T13:43:44.372+08:00  INFO 9324 --- [gym-manage-api] [     parallel-2] c.n.g.m.sys.audit.OperationLogWebFilter  : WebFilter 拦截请求: POST /api/groupCourse/types/1/labels
-2026-06-11T13:43:44.372+08:00  INFO 9324 --- [gym-manage-api] [     parallel-2] c.n.g.m.sys.audit.OperationLogWebFilter  : 未匹配到操作日志配置，跳过: POST /api/groupCourse/types/1/labels
-2026-06-11T13:43:44.372+08:00  INFO 9324 --- [gym-manage-api] [     parallel-2] c.n.g.m.sys.audit.OperationLogWebFilter  : WebFilter 拦截请求: POST /api/groupCourse/types/1/labels
-2026-06-11T13:43:44.372+08:00  INFO 9324 --- [gym-manage-api] [     parallel-2] c.n.g.m.sys.audit.OperationLogWebFilter  : 未匹配到操作日志配置，跳过: POST /api/groupCourse/types/1/labels
-2026-06-11T13:43:44.372+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.372+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.372+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.372+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.372+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dictionaries" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/change-password" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/logical-delete" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/logical-delete" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/action/restore" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/action/restore" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/users/{id}/roles" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/menus" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles/{id}/restore" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/roles/{id}/permissions" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/config" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.373+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/login" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/exception" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/logs/operation" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/login" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/register" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/auth/logout" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dict/types" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/dict/data" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/notices" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/messages" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/files/upload" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/permissions" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/auth/miniapp/login" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/auth/mp/callback" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member/phone/bind" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/admin/member/{id}/phone" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.375+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-cards" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/purchase" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/renew" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/use" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/{recordId}/refund" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-records/process-expired" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/member-card-transactions" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/page" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/types" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "GET" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/labels" does not match against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "PUT" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "DELETE" does not match against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Method "POST" matches against value "POST"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.server.RequestPredicates       : Pattern "/api/groupCourse/types/{typeId}/labels" matches against value "/api/groupCourse/types/1/labels"
-2026-06-11T13:43:44.376+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.function.server.RouterFunctions  : [27afd417] Matched (POST && /api/groupCourse/types/{typeId}/labels)
-2026-06-11T13:43:44.376+08:00 DEBUG 9324 --- [gym-manage-api] [     parallel-2] o.s.w.r.f.s.s.RouterFunctionMapping      : [27afd417] Mapped to cn.novalon.gym.manage.app.config.SystemRouter$$Lambda/0x00000223a09d1920@3760f3e8
-2026-06-11T13:43:44.377+08:00 TRACE 9324 --- [gym-manage-api] [     parallel-2] org.springframework.web.HttpLogging      : [27afd417] Decoded [{labelIds=[1, 3, 5]}]
-2026-06-11T13:43:44.377+08:00 DEBUG 9324 --- [gym-manage-api] [     parallel-2] o.s.r.c.R2dbcTransactionManager          : Creating new transaction with name [cn.novalon.gym.manage.groupcourse.repository.impl.CourseLabelRepository.addLabelsToType]: PROPAGATION_REQUIRED,ISOLATION_DEFAULT
-2026-06-11T13:43:44.377+08:00 DEBUG 9324 --- [gym-manage-api] [     parallel-2] o.s.r.c.R2dbcTransactionManager          : Acquired Connection [PooledConnection[PostgresqlConnection{client=io.r2dbc.postgresql.client.ReactorNettyClient@c3a5202, codecs=io.r2dbc.postgresql.codec.DefaultCodecs@922d1d4}]] for R2DBC transaction
-2026-06-11T13:43:44.377+08:00 DEBUG 9324 --- [gym-manage-api] [     parallel-2] o.s.r.c.R2dbcTransactionManager          : Starting R2DBC transaction on Connection [PooledConnection[PostgresqlConnection{client=io.r2dbc.postgresql.client.ReactorNettyClient@c3a5202, codecs=io.r2dbc.postgresql.codec.DefaultCodecs@922d1d4}]] using [ExtendedTransactionDefinition [transactionName='cn.novalon.gym.manage.groupcourse.repository.impl.CourseLabelRepository.addLabelsToType', readOnly=false, isolationLevel=null, lockWaitTimeout=PT0S]]
-2026-06-11T13:43:44.379+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [SELECT course_type_label.type_id, course_type_label.label_id, course_type_label.id, course_type_label.create_by, course_type_label.update_by, course_type_label.created_at, course_type_label.updated_at, course_type_label.deleted_at FROM course_type_label WHERE course_type_label.type_id = $1 AND (course_type_label.label_id = $2) AND (course_type_label.deleted_at IS NULL)]
-2026-06-11T13:43:44.381+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [SELECT course_type_label.type_id, course_type_label.label_id, course_type_label.id, course_type_label.create_by, course_type_label.update_by, course_type_label.created_at, course_type_label.updated_at, course_type_label.deleted_at FROM course_type_label WHERE course_type_label.type_id = $1 AND (course_type_label.label_id = $2) AND (course_type_label.deleted_at IS NULL)]
-2026-06-11T13:43:44.382+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [SELECT course_type_label.type_id, course_type_label.label_id, course_type_label.id, course_type_label.create_by, course_type_label.update_by, course_type_label.created_at, course_type_label.updated_at, course_type_label.deleted_at FROM course_type_label WHERE course_type_label.type_id = $1 AND (course_type_label.label_id = $2) AND (course_type_label.deleted_at IS NULL)]
-2026-06-11T13:43:44.382+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [INSERT INTO course_type_label (type_id, label_id, create_by, update_by, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)]
-2026-06-11T13:43:44.385+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [INSERT INTO course_type_label (type_id, label_id, create_by, update_by, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)]
-2026-06-11T13:43:44.385+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r2dbc.core.DefaultDatabaseClient     : Executing SQL statement [INSERT INTO course_type_label (type_id, label_id, create_by, update_by, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)]
-2026-06-11T13:43:44.387+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r.c.R2dbcTransactionManager          : Initiating transaction rollback
-2026-06-11T13:43:44.387+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r.c.R2dbcTransactionManager          : Rolling back R2DBC transaction on Connection [PooledConnection[PostgresqlConnection{client=io.r2dbc.postgresql.client.ReactorNettyClient@c3a5202, codecs=io.r2dbc.postgresql.codec.DefaultCodecs@922d1d4}]]
-2026-06-11T13:43:44.389+08:00 DEBUG 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.r.c.R2dbcTransactionManager          : Releasing R2DBC Connection [PooledConnection[PostgresqlConnection{client=io.r2dbc.postgresql.client.ReactorNettyClient@c3a5202, codecs=io.r2dbc.postgresql.codec.DefaultCodecs@922d1d4}]] after transaction
-2026-06-11T13:43:44.389+08:00 ERROR 9324 --- [gym-manage-api] [actor-tcp-nio-6] c.n.g.m.g.s.impl.CourseLabelService      : 标签添加到类型失败 - typeId=1, error: executeMany; SQL [INSERT INTO course_type_label (type_id, label_id, create_by, update_by, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)]; 重复键违反唯一约束"course_type_label_type_id_label_id_key"
-2026-06-11T13:43:44.389+08:00 TRACE 9324 --- [gym-manage-api] [actor-tcp-nio-6] org.springframework.web.HttpLogging      : [27afd417] Encoding [{success=false, message=executeMany; SQL [INSERT INTO course_type_label (type_id, label_id, create_by, update_by, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)]; 重复键违反唯一约束"course_type_label_type_id_label_id_key"}]
-2026-06-11T13:43:44.390+08:00 TRACE 9324 --- [gym-manage-api] [actor-tcp-nio-6] o.s.w.s.adapter.HttpWebHandlerAdapter    : [27afd417] Completed 400 BAD_REQUEST, headers={masked}
-2026-06-11T13:43:44.390+08:00 TRACE 9324 --- [gym-manage-api] [actor-tcp-nio-6] org.springframework.web.HttpLogging      : [27afd417] onComplete
+[
+	{
+		"id": "3",
+		"createBy": "admin",
+		"updateBy": null,
+		"createdAt": "2026-06-15T10:00:00",
+		"updatedAt": "2026-06-15T10:00:00",
+		"deletedAt": null,
+		"courseId": "1",
+		"recommendTitle": "本周热门推荐",
+		"recommendContent": "极速燃脂单车课程，跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡！",
+		"recommendReason": "教练专业，课程内容丰富，深受学员喜爱，燃脂效果显著",
+		"priority": 20,
+		"isActive": true,
+		"groupCourse": {
+			"id": "1",
+			"createBy": "system",
+			"updateBy": "system",
+			"createdAt": "2026-06-11T13:50:25.118925",
+			"updatedAt": "2026-06-11T13:50:25.118925",
+			"deletedAt": null,
+			"courseName": "动感单车升级版aaaaa",
+			"coachId": "2",
+			"courseType": "2",
+			"startTime": "2026-06-02T16:45:00",
+			"endTime": "2026-06-15T20:20:00",
+			"maxMembers": 30,
+			"currentMembers": 0,
+			"status": "0",
+			"location": "单车房",
+			"coverImage": "/images/spinning.jpg",
+			"description": "升级版高强度有氧运动课程",
+			"pointCardAmount": 2,
+			"storedValueAmount": 80
+		}
+	},
+	{
+		"id": "7",
+		"createBy": "coach_li",
+		"updateBy": null,
+		"createdAt": "2026-05-25T09:15:00",
+		"updatedAt": "2026-05-25T09:15:00",
+		"deletedAt": null,
+		"courseId": "6",
+		"recommendTitle": "塑形热门课程",
+		"recommendContent": "蜜桃臀塑造课程，针对性训练臀部肌肉群，打造完美曲线。",
+		"recommendReason": "专业私教指导，动作标准，效果显著，深受女性学员喜爱",
+		"priority": 18,
+		"isActive": true,
+		"groupCourse": {
+			"id": "6",
+			"createBy": "coach_li",
+			"updateBy": null,
+			"createdAt": "2026-05-20T09:15:00",
+			"updatedAt": "2026-05-20T09:15:00",
+			"deletedAt": null,
+			"courseName": "蜜桃臀塑造",
+			"coachId": "103",
+			"courseType": "3",
+			"startTime": "2026-05-30T19:00:00",
+			"endTime": "2026-05-30T20:00:00",
+			"maxMembers": 10,
+			"currentMembers": 8,
+			"status": "2",
+			"location": "私教专区",
+			"coverImage": "/images/glute.jpg",
+			"description": "针对性训练臀部肌肉群，课程已于5月30日结束，无法预约。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "9",
+		"createBy": "coach_zhang",
+		"updateBy": null,
+		"createdAt": "2026-06-15T14:00:00",
+		"updatedAt": "2026-06-15T14:00:00",
+		"deletedAt": null,
+		"courseId": "1",
+		"recommendTitle": "减脂首选课程",
+		"recommendContent": "想要快速减脂？极速燃脂单车是你的最佳选择！专业教练带领，科学训练计划。",
+		"recommendReason": "减脂效果最佳，课程强度适中，适合想要快速瘦身的学员",
+		"priority": 16,
+		"isActive": true,
+		"groupCourse": {
+			"id": "1",
+			"createBy": "system",
+			"updateBy": "system",
+			"createdAt": "2026-06-11T13:50:25.118925",
+			"updatedAt": "2026-06-11T13:50:25.118925",
+			"deletedAt": null,
+			"courseName": "动感单车升级版aaaaa",
+			"coachId": "2",
+			"courseType": "2",
+			"startTime": "2026-06-02T16:45:00",
+			"endTime": "2026-06-15T20:20:00",
+			"maxMembers": 30,
+			"currentMembers": 0,
+			"status": "0",
+			"location": "单车房",
+			"coverImage": "/images/spinning.jpg",
+			"description": "升级版高强度有氧运动课程",
+			"pointCardAmount": 2,
+			"storedValueAmount": 80
+		}
+	},
+	{
+		"id": "4",
+		"createBy": "admin",
+		"updateBy": null,
+		"createdAt": "2026-06-15T11:00:00",
+		"updatedAt": "2026-06-15T11:00:00",
+		"deletedAt": null,
+		"courseId": "2",
+		"recommendTitle": "新手友好推荐",
+		"recommendContent": "清晨流瑜伽课程，适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。",
+		"recommendReason": "适合新手入门，教练耐心指导，课程节奏适中",
+		"priority": 15,
+		"isActive": true,
+		"groupCourse": {
+			"id": "2",
+			"createBy": "admin",
+			"updateBy": null,
+			"createdAt": "2026-06-01T10:00:00",
+			"updatedAt": "2026-06-01T10:00:00",
+			"deletedAt": null,
+			"courseName": "清晨流瑜伽",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-06-12T09:00:00",
+			"endTime": "2026-06-12T10:30:00",
+			"maxMembers": 15,
+			"currentMembers": 5,
+			"status": "0",
+			"location": "A座3楼瑜伽教室",
+			"coverImage": "/images/yoga_flow.jpg",
+			"description": "适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "10",
+		"createBy": "coach_wang",
+		"updateBy": null,
+		"createdAt": "2026-06-15T15:00:00",
+		"updatedAt": "2026-06-15T15:00:00",
+		"deletedAt": null,
+		"courseId": "2",
+		"recommendTitle": "晨练优选",
+		"recommendContent": "清晨流瑜伽，唤醒身体能量，开启活力一天！适合晨练爱好者。",
+		"recommendReason": "晨练最佳选择，提升身体活力，改善精神状态",
+		"priority": 14,
+		"isActive": true,
+		"groupCourse": {
+			"id": "2",
+			"createBy": "admin",
+			"updateBy": null,
+			"createdAt": "2026-06-01T10:00:00",
+			"updatedAt": "2026-06-01T10:00:00",
+			"deletedAt": null,
+			"courseName": "清晨流瑜伽",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-06-12T09:00:00",
+			"endTime": "2026-06-12T10:30:00",
+			"maxMembers": 15,
+			"currentMembers": 5,
+			"status": "0",
+			"location": "A座3楼瑜伽教室",
+			"coverImage": "/images/yoga_flow.jpg",
+			"description": "适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "6",
+		"createBy": "coach_li",
+		"updateBy": null,
+		"createdAt": "2026-06-15T13:00:00",
+		"updatedAt": "2026-06-15T13:00:00",
+		"deletedAt": null,
+		"courseId": "4",
+		"recommendTitle": "基础瑜伽推荐",
+		"recommendContent": "基础哈他瑜伽课程，适合所有级别学员，通过基础体式练习提升身体柔韧性和平衡能力。",
+		"recommendReason": "零基础友好，适合所有健身水平，放松身心",
+		"priority": 12,
+		"isActive": true,
+		"groupCourse": {
+			"id": "4",
+			"createBy": "coach_li",
+			"updateBy": null,
+			"createdAt": "2026-06-01T08:00:00",
+			"updatedAt": "2026-06-01T08:00:00",
+			"deletedAt": null,
+			"courseName": "哈他瑜伽",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-06-01T15:20:00",
+			"endTime": "2026-06-01T16:50:00",
+			"maxMembers": 12,
+			"currentMembers": 3,
+			"status": "0",
+			"location": "瑜伽教室B",
+			"coverImage": "/images/hatha_yoga.jpg",
+			"description": "基础哈他瑜伽，适合所有级别。距开始不足30分钟，已停止预约。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "11",
+		"createBy": "coach_li",
+		"updateBy": null,
+		"createdAt": "2026-06-15T16:00:00",
+		"updatedAt": "2026-06-15T16:00:00",
+		"deletedAt": null,
+		"courseId": "4",
+		"recommendTitle": "身心平衡推荐",
+		"recommendContent": "哈他瑜伽课程，通过体式练习和呼吸控制，达到身心平衡，提升整体健康水平。",
+		"recommendReason": "改善身体柔韧性，增强核心力量，提升身体协调性",
+		"priority": 11,
+		"isActive": true,
+		"groupCourse": {
+			"id": "4",
+			"createBy": "coach_li",
+			"updateBy": null,
+			"createdAt": "2026-06-01T08:00:00",
+			"updatedAt": "2026-06-01T08:00:00",
+			"deletedAt": null,
+			"courseName": "哈他瑜伽",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-06-01T15:20:00",
+			"endTime": "2026-06-01T16:50:00",
+			"maxMembers": 12,
+			"currentMembers": 3,
+			"status": "0",
+			"location": "瑜伽教室B",
+			"coverImage": "/images/hatha_yoga.jpg",
+			"description": "基础哈他瑜伽，适合所有级别。距开始不足30分钟，已停止预约。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "1",
+		"createBy": "system",
+		"updateBy": "system",
+		"createdAt": "2026-06-15T16:21:20.865146",
+		"updatedAt": "2026-06-15T16:23:05.180219",
+		"deletedAt": null,
+		"courseId": "1",
+		"recommendTitle": "本周热门课程",
+		"recommendContent": "这是一门非常棒的课程，快来参加吧！",
+		"recommendReason": "教练专业，课程内容丰富",
+		"priority": 10,
+		"isActive": false,
+		"groupCourse": {
+			"id": "1",
+			"createBy": "system",
+			"updateBy": "system",
+			"createdAt": "2026-06-11T13:50:25.118925",
+			"updatedAt": "2026-06-11T13:50:25.118925",
+			"deletedAt": null,
+			"courseName": "动感单车升级版aaaaa",
+			"coachId": "2",
+			"courseType": "2",
+			"startTime": "2026-06-02T16:45:00",
+			"endTime": "2026-06-15T20:20:00",
+			"maxMembers": 30,
+			"currentMembers": 0,
+			"status": "0",
+			"location": "单车房",
+			"coverImage": "/images/spinning.jpg",
+			"description": "升级版高强度有氧运动课程",
+			"pointCardAmount": 2,
+			"storedValueAmount": 80
+		}
+	},
+	{
+		"id": "5",
+		"createBy": "admin",
+		"updateBy": null,
+		"createdAt": "2026-06-15T12:00:00",
+		"updatedAt": "2026-06-15T12:00:00",
+		"deletedAt": null,
+		"courseId": "3",
+		"recommendTitle": "高强度燃脂",
+		"recommendContent": "燃脂搏击课程，高强度间歇训练，配合音乐快速燃脂，释放压力。",
+		"recommendReason": "高强度训练，适合进阶学员，快速燃脂塑形",
+		"priority": 10,
+		"isActive": false,
+		"groupCourse": {
+			"id": "3",
+			"createBy": "coach_zhang",
+			"updateBy": null,
+			"createdAt": "2026-06-01T14:30:00",
+			"updatedAt": "2026-06-01T14:30:00",
+			"deletedAt": null,
+			"courseName": "燃脂搏击",
+			"coachId": "102",
+			"courseType": "2",
+			"startTime": "2026-06-10T18:30:00",
+			"endTime": "2026-06-10T19:30:00",
+			"maxMembers": 20,
+			"currentMembers": 20,
+			"status": "0",
+			"location": "综合训练区",
+			"coverImage": "/images/kickboxing.jpg",
+			"description": "高强度间歇训练，配合音乐快速燃脂，释放压力。名额已满，无法预约。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "12",
+		"createBy": "admin",
+		"updateBy": null,
+		"createdAt": "2026-05-25T10:00:00",
+		"updatedAt": "2026-05-25T10:00:00",
+		"deletedAt": null,
+		"courseId": "7",
+		"recommendTitle": "职场减压课程",
+		"recommendContent": "午间冥想放松，专为职场人士设计，快速缓解工作压力，提升工作状态。",
+		"recommendReason": "职场减压首选，课程时间短，效果显著",
+		"priority": 9,
+		"isActive": false,
+		"groupCourse": {
+			"id": "7",
+			"createBy": "admin",
+			"updateBy": null,
+			"createdAt": "2026-05-25T09:00:00",
+			"updatedAt": "2026-05-25T09:00:00",
+			"deletedAt": null,
+			"courseName": "午间冥想放松",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-05-31T12:00:00",
+			"endTime": "2026-05-31T13:00:00",
+			"maxMembers": 15,
+			"currentMembers": 6,
+			"status": "2",
+			"location": "冥想室",
+			"coverImage": "/images/meditation_noon.jpg",
+			"description": "午间冥想课程，已于5月31日结束。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	},
+	{
+		"id": "8",
+		"createBy": "admin",
+		"updateBy": null,
+		"createdAt": "2026-05-25T09:00:00",
+		"updatedAt": "2026-05-25T09:00:00",
+		"deletedAt": null,
+		"courseId": "7",
+		"recommendTitle": "午间放松推荐",
+		"recommendContent": "午间冥想放松课程，通过呼吸和正念冥想，深度放松身心，缓解工作压力。",
+		"recommendReason": "适合上班族，午间放松充电，提升下午工作效率",
+		"priority": 8,
+		"isActive": true,
+		"groupCourse": {
+			"id": "7",
+			"createBy": "admin",
+			"updateBy": null,
+			"createdAt": "2026-05-25T09:00:00",
+			"updatedAt": "2026-05-25T09:00:00",
+			"deletedAt": null,
+			"courseName": "午间冥想放松",
+			"coachId": "101",
+			"courseType": "1",
+			"startTime": "2026-05-31T12:00:00",
+			"endTime": "2026-05-31T13:00:00",
+			"maxMembers": 15,
+			"currentMembers": 6,
+			"status": "2",
+			"location": "冥想室",
+			"coverImage": "/images/meditation_noon.jpg",
+			"description": "午间冥想课程，已于5月31日结束。",
+			"pointCardAmount": 1,
+			"storedValueAmount": 0
+		}
+	}
+]
@@ -53,6 +53,11 @@
            <artifactId>gym-dataCount</artifactId>
            <version>${project.version}</version>
        </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-auth</artifactId>
+            <version>${project.version}</version>
+        </dependency>
        
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -10,14 +10,13 @@ import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDeta
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.server.WebFilter;

 import java.util.List;

@SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = {
        ReactiveUserDetailsServiceAutoConfiguration.class })
-@EnableScheduling
+//@EnableScheduling
@EnableR2dbcRepositories(basePackages = {
        "cn.novalon.gym.manage.db.dao",
        "cn.novalon.gym.manage.sys.audit.repository" ,
@@ -4,8 +4,10 @@ package cn.novalon.gym.manage.app.config;
 import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
 import cn.novalon.gym.manage.datacount.handler.DataStatisticsHandler;
 import cn.novalon.gym.manage.file.handler.SysFileHandler;
+import cn.novalon.gym.manage.auth.handler.PhoneAuthHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
+import cn.novalon.gym.manage.groupcourse.handler.GroupCourseRecommendHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseTypeHandler;
 import cn.novalon.gym.manage.groupcourse.handler.CourseLabelHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardHandler;
@@ -71,10 +73,12 @@ public class SystemRouter {
            MemberCardTransactionHandler memberCardTransactionHandler,
            GroupCourseHandler groupCourseHandler,
            GroupCourseBookingHandler groupCourseBookingHandler,
+            GroupCourseRecommendHandler groupCourseRecommendHandler,
            GroupCourseTypeHandler groupCourseTypeHandler,
            CourseLabelHandler courseLabelHandler,
            CheckInHandler checkInHandler,
-            DataStatisticsHandler dataStatisticsHandler) {
+            DataStatisticsHandler dataStatisticsHandler,
+            PhoneAuthHandler phoneAuthHandler) {

        return route()
                // ========== 诊断路由 ==========
@@ -190,10 +194,13 @@ public class SystemRouter {

                // ========== 消息路由 ==========
                .GET("/api/messages/user/{userId}", messageHandler::getMessagesByUser)
+                .GET("/api/messages/user/{userId}/page", messageHandler::getMessagesByUserPage)
                .GET("/api/messages/user/{userId}/unread", messageHandler::getUnreadCount)
                .GET("/api/messages/user/{userId}/unread/list", messageHandler::getUnreadList)
+                .GET("/api/messages/user/{userId}/unread/page", messageHandler::getUnreadMessagesPage)
                .POST("/api/messages", messageHandler::createMessage)
                .PUT("/api/messages/{id}/read", messageHandler::markAsRead)
+                .PUT("/api/messages/user/{userId}/read", messageHandler::markAllAsRead)
                .DELETE("/api/messages/{id}", messageHandler::deleteMessage)

                // ========== 文件路由 ==========
@@ -216,6 +223,11 @@ public class SystemRouter {
                .PUT("/api/permissions/{id}", permissionHandler::updatePermission)
                .DELETE("/api/permissions/{id}", permissionHandler::deletePermission)

+                // ========== 手机号认证路由 ==========
+                .POST("/api/auth/phone/one-click-login", phoneAuthHandler::oneClickLogin)
+                .POST("/api/auth/phone/send-code", phoneAuthHandler::sendSmsCode)
+                .POST("/api/auth/phone/code-login", phoneAuthHandler::codeLogin)
+
                // ========== 会员模块路由 - 微信认证 ==========
                .POST("/api/member/auth/miniapp/login", wechatAuthHandler::miniappLogin)
                .GET("/api/member/auth/mp/callback", wechatAuthHandler::verifyMpSignature)
@@ -299,6 +311,17 @@ public class SystemRouter {
                .GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
                .GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)

+                // ===== 团课推荐管理 =====
+                .GET("/api/groupCourse/recommend/list", groupCourseRecommendHandler::getAllRecommendations)
+                .GET("/api/groupCourse/recommend/active", groupCourseRecommendHandler::getAllActiveRecommendations)
+                .GET("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::getRecommendationById)
+                .GET("/api/groupCourse/recommend/course/{courseId}", groupCourseRecommendHandler::getRecommendationsByCourseId)
+                .POST("/api/groupCourse/recommend", groupCourseRecommendHandler::createRecommendation)
+                .PUT("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::updateRecommendation)
+                .DELETE("/api/groupCourse/recommend/{id}", groupCourseRecommendHandler::deleteRecommendation)
+                .POST("/api/groupCourse/recommend/{id}/enable", groupCourseRecommendHandler::enableRecommendation)
+                .POST("/api/groupCourse/recommend/{id}/disable", groupCourseRecommendHandler::disableRecommendation)
+
                // ===== 团课课程管理（需要放在具体路由之后）=====
                .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById)
                .GET("/api/groupCourse/{id}/detail", groupCourseHandler::getGroupCourseDetailById)
@@ -306,7 +329,8 @@ public class SystemRouter {
                .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse)
                .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse)
                .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse)
-                .POST("/api/groupCourse/{courseId}/signin", groupCourseHandler::signIn)
+                .POST("/api/groupCourse/signin/{memberId}", groupCourseHandler::signIn)
+                .POST("/api/groupCourse/search", groupCourseHandler::searchGroupCourses)
                
                // ========= 签到模块路由 ==========
                // ===== 签到核心功能 =====
@@ -335,6 +359,7 @@ public class SystemRouter {
                .GET("/api/datacount/signin", dataStatisticsHandler::getSignInStatistics)
                .GET("/api/datacount/history", dataStatisticsHandler::queryHistoricalStatistics)
                .GET("/api/datacount/export", dataStatisticsHandler::exportStatistics)
+
                .build();
    }
 }
@@ -2,9 +2,9 @@ spring:
  cache:
    type: none
  r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
-    username: novalon
-    password: novalon123
+    url: r2dbc:postgresql://localhost:5432/manage_system
+    username: postgres
+    password: 123456
    pool:
      initial-size: 5
      max-size: 20
@@ -12,10 +12,10 @@ spring:
      max-life-time: 30m
      acquire-timeout: 3s
  flyway:
-    url: jdbc:postgresql://localhost:55432/manage_system
-    user: novalon
-    password: novalon123
-    enabled: true
+    url: jdbc:postgresql://localhost:5432/manage_system
+    user: postgres
+    password: 123456
+    enabled: false
    locations: classpath:db/migration
    baseline-on-migrate: true
    validate-on-migrate: true
@@ -4,8 +4,8 @@ spring:
    activate:
      on-profile: local
  r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
-    username: novalon
+    url: r2dbc:postgresql://localhost:5432/manage_system
+    username: postgres
    password: 123456
    pool:
      initial-size: 5
@@ -14,8 +14,8 @@ spring:
      max-life-time: 30m
      acquire-timeout: 3s
  datasource:
-    url: jdbc:postgresql://localhost:55432/manage_system
-    username: novalon
+    url: jdbc:postgresql://localhost:5432/manage_system
+    username: postgres
    password: 123456
    driver-class-name: org.postgresql.Driver
  flyway:
@@ -5,9 +5,9 @@ spring:
  application:
    name: manage-app
  r2dbc:
-    url: r2dbc:postgresql://localhost:55432/manage_system
-    username: novalon
-    password: novalon123
+    url: r2dbc:postgresql://localhost:5432/manage_system
+    username: postgres
+    password: 123456
    pool:
      initial-size: 5
      max-size: 20
@@ -15,9 +15,9 @@ spring:
    exclude:
      - org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
  r2dbc:
-    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:novalon123}
+    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
    pool:
      initial-size: 10
      max-size: 50
@@ -25,12 +25,12 @@ spring:
      max-life-time: 1h
      acquire-timeout: 5s
  datasource:
-    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:novalon123}
+    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
+    username: ${DB_USERNAME:postgres}
+    password: ${DB_PASSWORD:123456}
    driver-class-name: org.postgresql.Driver
  flyway:
-    enabled: true
+    enabled: false
    locations: classpath:db/migration
    baseline-on-migrate: true
    baseline-version: 0
@@ -54,7 +54,7 @@ spring:
  profiles:
    active: dev
  config:
-    import: classpath:member-config.yml
+    import: classpath:keys.properties,classpath:member-config.yml



@@ -94,3 +94,13 @@ springdoc:
  show-actuator: false
  default-consumes-media-type: application/json
  default-produces-media-type: application/json
+
+alibaba:
+  cloud:
+    sms:
+      access-key-id: ${ALIBABA_ACCESS_KEY_ID:}
+      access-key-secret: ${ALIBABA_ACCESS_KEY_SECRET:}
+      sign-name: ${ALIBABA_SMS_SIGN_NAME:}
+      template-code: ${ALIBABA_SMS_TEMPLATE_CODE:}
+      code-length: 6
+      code-expire-seconds: 300
@@ -0,0 +1,2 @@
+huifu.private-key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNUdQE59I4bV1dIgLs2IRN3Wl8KI2yS4KpTUQWrvvlUcBTztB8rIeN5lr6Yv4VsZ1TG0FAb0D80JjxEQ1+0HizYNOQ1h2935v2r8h7rx3VTLbMOkmsg8Lb8LQRTbPaJOZfsIZMzBytYiRzWunHaMlCr800EA3q5NMj9VjHQuamxKqyzyHqfkIjA/sZ8q9atVjn8ahUjPKdrGA8b79HexHhCgOSLdK+fWw0eMCsWWYP2qECLsvZ+tjfvqSBXx1kg7womwT1VBCf+0Dx+jJPKR3mxQfz2szoucJYuXRo55kA6yCwoeNsjanLDRkPBSy3NHdKrffP6YODhRHG6KHyayyNAgMBAAECggEATIR69TEETVNCEzRgOxe9A2AYRoa6ukhSdhMFA/c5IuCR747yqh7MwtNwfVRuWRazpZUDTr0uhfT4asad9QUx5YZO54RX1EAn9XkWZ4nY8G46J/iDfapWLrp09U2KTVpfdn5hKWH3QRX7wI4AON2O49HGnSL4NjAx9q1YpYOe2bqevxmB4uD9vR/FHMjZ2qWzPaL7pId98x4DCJCiZctBQqb7gxR8EseD1Ddn2HbH5DEUjoxz2umtL+zrcGKDFBy4kM3r+10FP5jFG4fJfZFQwrzMTEkXJriau9DMRTQ83rWHzNvhdTNUuyqah74ez5V1piVEOXCPudzFsMttD2DyzQKBgQDokQH3WtcQqwFTUo+uWVVup4NoQzNZpEGIHK17afRsf9YnkoJVqjhywq1dhQT+yuyW9geJJKWpHQIAS4gGudhNK+j6d//bbvvbkOmtsdWyZ6Z2EmY8JrPkHdHAcadNJX7vrIc1xPeyci4AHhErDHc3hhD5njuSLx3DUp4iODNxKwKBgQCbjyHvP90YGjh49DWklh2NJgR2+OR6Fd0afdmwtGKeCUP5l2To6rfLBbcSRIWCON4iLME5wLLdHcm5wAQukC4dsUB5iZffp21+7hrrwUw/G0MUzFudfhZkjsDU5i+FwnVMqmsLJPUsjJTOfKsJdA2DjnwfMcgxw9FeClGveSFNJwKBgQDCpjuDECDY7oeZeYyQXGzIxKOTbEtaR8Qha/83QCM3fHd9f35evK2qP45iq6bWqnkCkMEV4/pTZNf77zvWhU2oqYvBtxYKTwW1a8BphGJbg60rPZMb3TjLQLoB3B4uz6dCaqBwPH8kd7RQnNm5siFF84vZoLozTAQZKtj3wxorKQKBgQCGKnEONHqwaw0B5T7O8VoTfxKiug/07B6C1sCGk03rF/q0rkquSKK0S/2Vl9u+cOXFe+w7r2OVKjfuKRpyPpBHs7T0HiQLFhBuRVaat2DXnN/CdG8f6rvNhwHxnYanSwx4TxN7zShYf/doEEZEJP/y01ViYkFUCpvtC+FgAo0iSQKBgFrkJGxPo6T7i5ZF7VoZWdARnypfbOl4gF9GMrXykk0fnKBDTof9Bg34a8OX54cf4yEH1ifZzVtNyzPTH9FxV88TksWRouqi1Uo6///kJI6gXROspE91TpNtNGHPgLhebA83WlFtS/H7i5G6RO+6KO0uflSImfy3Owp/ChyFUGmn
+huifu.public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjVHUBOfSOG1dXSIC7NiETd1pfCiNskuCqU1EFq775VHAU87QfKyHjeZa+mL+FbGdUxtBQG9A/NCY8RENftB4s2DTkNYdvd+b9q/Ie68d1Uy2zDpJrIPC2/C0EU2z2iTmX7CGTMwcrWIkc1rpx2jJQq/NNBAN6uTTI/VYx0LmpsSqss8h6n5CIwP7GfKvWrVY5/GoVIzynaxgPG+/R3sR4QoDki3Svn1sNHjArFlmD9qhAi7L2frY376kgV8dZIO8KJsE9VQQn/tA8foyTykd5sUH89rM6LnCWLl0aOeZAOsgsKHjbI2pyw0ZDwUstzR3Sq33z+mDg4URxuih8mssjQIDAQAB
@@ -21,4 +21,17 @@ wechat:

 spring:
  elasticsearch:
-    uris: http://localhost:9200
+    uris: http://localhost:9200
+
+payment:
+  huifu:
+    sys-id: "6666000207573586"
+    product-id: "XLSISV"
+    huifu-id: "6666000207573586"
+    acct-id: "F28226571"
+    private-key: ${huifu.private-key}
+    public-key: ${huifu.public-key}
+    create-url: "https://api.huifu.com/v4/trade/payment/create"
+    query-url: "https://api.huifu.com/v4/trade/payment/query"
+    refund-url: "https://api.huifu.com/v4/trade/refund"
+    notify-url: "http://localhost:8084/api/payment/notify"
@@ -61,4 +61,13 @@ public final class RedisKeyConstants {
     * appType: miniapp(小程序), mp(公众号)
     */
    public static final String WECHAT_ACCESS_TOKEN = "wechat:access_token:";
+
+    // ==================== 认证模块 ====================
+
+    /**
+     * 手机短信验证码缓存
+     * 格式：sms:code:{phone}
+     * 用途：存储登录/注册等场景的短信验证码
+     */
+    public static final String SMS_CODE = "sms:code:";
 }
@@ -7,6 +7,7 @@ public class ErrorCode {
    public static final String PERMISSION_PREFIX = "PERMISSION_";
    public static final String CONFLICT_PREFIX = "CONFLICT_";
    public static final String SYSTEM_PREFIX = "SYSTEM_";
+    public static final String AUTH_PREFIX = "AUTH_";

    public static final String VALIDATION_REQUIRED = VALIDATION_PREFIX + "001";
    public static final String VALIDATION_INVALID_FORMAT = VALIDATION_PREFIX + "002";
@@ -29,4 +30,7 @@ public class ErrorCode {
    public static final String SYSTEM_INTERNAL_ERROR = SYSTEM_PREFIX + "001";
    public static final String SYSTEM_DATABASE_ERROR = SYSTEM_PREFIX + "002";
    public static final String SYSTEM_NETWORK_ERROR = SYSTEM_PREFIX + "003";
+
+    public static final String AUTH_PHONE_ERROR = AUTH_PREFIX + "001";
+    public static final String AUTH_CODE_ERROR = AUTH_PREFIX + "002";
 }
@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.db.entity;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
@@ -21,10 +22,10 @@ public class SysUserMessageEntity {
    @Column("user_id")
    private Long userId;

-    @Column("title")
+    @Column("message_title")
    private String title;

-    @Column("content")
+    @Column("message_content")
    private String content;

    @Column("message_type")
@@ -33,9 +34,13 @@ public class SysUserMessageEntity {
    @Column("is_read")
    private String isRead;

-    @Column("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column("created_at")
    private LocalDateTime createTime;

+    @Column("deleted_at")
+    private LocalDateTime deletedAt;
+
    public Long getId() {
        return id;
    }
@@ -91,4 +96,12 @@ public class SysUserMessageEntity {
    public void setCreateTime(LocalDateTime createTime) {
        this.createTime = createTime;
    }
+
+    public LocalDateTime getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(LocalDateTime deletedAt) {
+        this.deletedAt = deletedAt;
+    }
 }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.db.repository;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import cn.novalon.gym.manage.notify.core.repository.ISysUserMessageRepository;
 import cn.novalon.gym.manage.db.converter.SysUserMessageConverter;
@@ -13,6 +15,8 @@ import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

+import java.util.List;
+
 /**
 * 用户消息仓储实现类
 * 
@@ -75,6 +79,87 @@ public class SysUserMessageRepository implements ISysUserMessageRepository {
        return r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class);
    }

+    @Override
+    public Mono<PageResponse<SysUserMessage>> findByUserIdPage(Long userId, PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
+
+        SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
+        criteria.setUserId(userId);
+        org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
+
+        return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
+                .matching(dbQuery.with(pageable))
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<SysUserMessage> messageList = tuple.getT1().stream()
+                            .map(sysUserMessageConverter::toDomain)
+                            .toList();
+                    return new PageResponse<>(messageList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    public Mono<PageResponse<SysUserMessage>> findByUserIdAndIsReadPage(Long userId, String isRead, PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
+
+        SysUserMessageQueryCriteria criteria = new SysUserMessageQueryCriteria();
+        criteria.setUserId(userId);
+        criteria.setIsRead(isRead);
+        org.springframework.data.relational.core.query.Query dbQuery = QueryUtil.getQuery(criteria);
+
+        return r2dbcEntityTemplate.select(SysUserMessageEntity.class)
+                .matching(dbQuery.with(pageable))
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(dbQuery, SysUserMessageEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<SysUserMessage> messageList = tuple.getT1().stream()
+                            .map(sysUserMessageConverter::toDomain)
+                            .toList();
+                    return new PageResponse<>(messageList, totalPages, total, page, size);
+                });
+    }
+
+    @Override
+    public Mono<Long> markAllAsReadByUserId(Long userId) {
+        org.springframework.data.relational.core.query.Update update = org.springframework.data.relational.core.query.Update.update("is_read", "1");
+        
+        org.springframework.data.relational.core.query.Query query = org.springframework.data.relational.core.query.Query.query(
+                org.springframework.data.relational.core.query.Criteria.where("user_id").is(userId)
+                        .and("deleted_at").isNull()
+        );
+
+        return r2dbcEntityTemplate.update(SysUserMessageEntity.class)
+                .matching(query)
+                .apply(update);
+    }
+
    @Override
    public Mono<SysUserMessage> save(SysUserMessage message) {
        SysUserMessageEntity entity = sysUserMessageConverter.toEntity(message);
@@ -0,0 +1,38 @@
+-- ============================================
+-- 团课推荐表
+-- ============================================
+
+-- 团课推荐表
+CREATE TABLE IF NOT EXISTS group_course_recommend (
+    id BIGSERIAL PRIMARY KEY,
+    course_id BIGINT NOT NULL,
+    recommend_title VARCHAR(200),
+    recommend_content TEXT,
+    recommend_reason VARCHAR(500),
+    priority INTEGER DEFAULT 0,
+    is_active BOOLEAN DEFAULT TRUE,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+-- 创建索引
+CREATE INDEX IF NOT EXISTS idx_group_course_recommend_course_id ON group_course_recommend(course_id);
+CREATE INDEX IF NOT EXISTS idx_group_course_recommend_priority ON group_course_recommend(priority);
+CREATE INDEX IF NOT EXISTS idx_group_course_recommend_is_active ON group_course_recommend(is_active);
+
+COMMENT ON TABLE group_course_recommend IS '团课推荐表';
+COMMENT ON COLUMN group_course_recommend.id IS '主键ID';
+COMMENT ON COLUMN group_course_recommend.course_id IS '团课ID（关联group_course.id）';
+COMMENT ON COLUMN group_course_recommend.recommend_title IS '推荐标题';
+COMMENT ON COLUMN group_course_recommend.recommend_content IS '推荐内容';
+COMMENT ON COLUMN group_course_recommend.recommend_reason IS '推荐理由';
+COMMENT ON COLUMN group_course_recommend.priority IS '优先级（数字越大优先级越高）';
+COMMENT ON COLUMN group_course_recommend.is_active IS '是否启用';
+COMMENT ON COLUMN group_course_recommend.create_by IS '创建人';
+COMMENT ON COLUMN group_course_recommend.update_by IS '更新人';
+COMMENT ON COLUMN group_course_recommend.created_at IS '创建时间';
+COMMENT ON COLUMN group_course_recommend.updated_at IS '更新时间';
+COMMENT ON COLUMN group_course_recommend.deleted_at IS '删除时间（软删除）';
@@ -0,0 +1,43 @@
+-- ============================================
+-- 团课推荐测试数据
+-- ============================================
+
+-- 推荐数据1: 极速燃脂单车 - 高优先级推荐（热门课程）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (1, '本周热门推荐', '极速燃脂单车课程，跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡！', '教练专业，课程内容丰富，深受学员喜爱，燃脂效果显著', 20, true, 'admin', '2026-06-15 10:00:00', '2026-06-15 10:00:00');
+
+-- 推荐数据2: 清晨流瑜伽 - 中等优先级推荐（适合新手）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (2, '新手友好推荐', '清晨流瑜伽课程，适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。', '适合新手入门，教练耐心指导，课程节奏适中', 15, true, 'admin', '2026-06-15 11:00:00', '2026-06-15 11:00:00');
+
+-- 推荐数据3: 燃脂搏击 - 低优先级推荐（满员课程，已禁用）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (3, '高强度燃脂', '燃脂搏击课程，高强度间歇训练，配合音乐快速燃脂，释放压力。', '高强度训练，适合进阶学员，快速燃脂塑形', 10, false, 'admin', '2026-06-15 12:00:00', '2026-06-15 12:00:00');
+
+-- 推荐数据4: 哈他瑜伽 - 中等优先级推荐（基础课程）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (4, '基础瑜伽推荐', '基础哈他瑜伽课程，适合所有级别学员，通过基础体式练习提升身体柔韧性和平衡能力。', '零基础友好，适合所有健身水平，放松身心', 12, true, 'coach_li', '2026-06-15 13:00:00', '2026-06-15 13:00:00');
+
+-- 推荐数据5: 蜜桃臀塑造 - 高优先级推荐（热门课程，但课程已结束）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (6, '塑形热门课程', '蜜桃臀塑造课程，针对性训练臀部肌肉群，打造完美曲线。', '专业私教指导，动作标准，效果显著，深受女性学员喜爱', 18, true, 'coach_li', '2026-05-25 09:15:00', '2026-05-25 09:15:00');
+
+-- 推荐数据6: 午间冥想放松 - 低优先级推荐（放松课程）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (7, '午间放松推荐', '午间冥想放松课程，通过呼吸和正念冥想，深度放松身心，缓解工作压力。', '适合上班族，午间放松充电，提升下午工作效率', 8, true, 'admin', '2026-05-25 09:00:00', '2026-05-25 09:00:00');
+
+-- 推荐数据7: 极速燃脂单车 - 第二个推荐（不同角度推荐）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (1, '减脂首选课程', '想要快速减脂？极速燃脂单车是你的最佳选择！专业教练带领，科学训练计划。', '减脂效果最佳，课程强度适中，适合想要快速瘦身的学员', 16, true, 'coach_zhang', '2026-06-15 14:00:00', '2026-06-15 14:00:00');
+
+-- 推荐数据8: 清晨流瑜伽 - 第二个推荐（不同角度推荐）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (2, '晨练优选', '清晨流瑜伽，唤醒身体能量，开启活力一天！适合晨练爱好者。', '晨练最佳选择，提升身体活力，改善精神状态', 14, true, 'coach_wang', '2026-06-15 15:00:00', '2026-06-15 15:00:00');
+
+-- 推荐数据9: 哈他瑜伽 - 第二个推荐（不同角度推荐）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (4, '身心平衡推荐', '哈他瑜伽课程，通过体式练习和呼吸控制，达到身心平衡，提升整体健康水平。', '改善身体柔韧性，增强核心力量，提升身体协调性', 11, true, 'coach_li', '2026-06-15 16:00:00', '2026-06-15 16:00:00');
+
+-- 推荐数据10: 午间冥想放松 - 第二个推荐（不同角度推荐，已禁用）
+INSERT INTO group_course_recommend (course_id, recommend_title, recommend_content, recommend_reason, priority, is_active, create_by, created_at, updated_at) VALUES
+    (7, '职场减压课程', '午间冥想放松，专为职场人士设计，快速缓解工作压力，提升工作状态。', '职场减压首选，课程时间短，效果显著', 9, false, 'admin', '2026-05-25 10:00:00', '2026-05-25 10:00:00');
@@ -0,0 +1,9 @@
+-- ============================================
+-- 为团课表添加二维码路径字段
+-- ============================================
+
+-- 添加二维码路径字段
+ALTER TABLE group_course ADD COLUMN qr_code_path VARCHAR(500);
+
+-- 添加字段注释
+COMMENT ON COLUMN group_course.qr_code_path IS '二维码图片路径';
@@ -61,7 +61,9 @@ public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory<JwtAut
               path.equals("/api/member/auth/miniapp/login") || 
               path.equals("/api/member/auth/mp/callback") || 
               path.equals("/api/auth/login") ||
-               path.startsWith("/api/checkIn/") ||
+               path.equals("/api/groupCourse/page") ||
+               path.startsWith("/api/checkIn") ||
+                path.startsWith("/api/payment") ||
               path.startsWith("/actuator/info");
    }

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.notify.core.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.time.LocalDateTime;

 public class SysUserMessage {
@@ -10,6 +12,8 @@ public class SysUserMessage {
    private String content;
    private String messageType;
    private String isRead;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    public Long getId() { return id; }
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.notify.core.repository;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -12,6 +14,12 @@ public interface ISysUserMessageRepository {

    Mono<Long> countByUserIdAndIsRead(Long userId, String isRead);

+    Mono<PageResponse<SysUserMessage>> findByUserIdPage(Long userId, PageRequest pageRequest);
+
+    Mono<PageResponse<SysUserMessage>> findByUserIdAndIsReadPage(Long userId, String isRead, PageRequest pageRequest);
+
+    Mono<Long> markAllAsReadByUserId(Long userId);
+
    Mono<SysUserMessage> save(SysUserMessage message);

    Mono<SysUserMessage> findById(Long id);
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.notify.core.service;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -12,6 +14,12 @@ public interface ISysUserMessageService {

    Flux<SysUserMessage> getUnreadMessages(Long userId);

+    Mono<PageResponse<SysUserMessage>> getMessagesByUserPage(Long userId, PageRequest pageRequest);
+
+    Mono<PageResponse<SysUserMessage>> getUnreadMessagesPage(Long userId, PageRequest pageRequest);
+
+    Mono<Long> markAllAsRead(Long userId);
+
    Mono<SysUserMessage> createMessage(SysUserMessage message);

    Mono<SysUserMessage> markAsRead(Long id);
@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.notify.core.service.impl;

+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import cn.novalon.gym.manage.notify.core.repository.ISysUserMessageRepository;
 import cn.novalon.gym.manage.notify.core.service.ISysUserMessageService;
@@ -33,6 +35,16 @@ public class SysUserMessageServiceImpl implements ISysUserMessageService {
        return messageRepository.findByUserIdAndIsReadOrderByCreateTimeDesc(userId, "0");
    }

+    @Override
+    public Mono<PageResponse<SysUserMessage>> getMessagesByUserPage(Long userId, PageRequest pageRequest) {
+        return messageRepository.findByUserIdPage(userId, pageRequest);
+    }
+
+    @Override
+    public Mono<PageResponse<SysUserMessage>> getUnreadMessagesPage(Long userId, PageRequest pageRequest) {
+        return messageRepository.findByUserIdAndIsReadPage(userId, "0", pageRequest);
+    }
+
    @Override
    public Mono<SysUserMessage> createMessage(SysUserMessage message) {
        message.setCreateTime(LocalDateTime.now());
@@ -40,6 +52,11 @@ public class SysUserMessageServiceImpl implements ISysUserMessageService {
        return messageRepository.save(message);
    }

+    @Override
+    public Mono<Long> markAllAsRead(Long userId) {
+        return messageRepository.markAllAsReadByUserId(userId);
+    }
+
    @Override
    public Mono<SysUserMessage> markAsRead(Long id) {
        return messageRepository.findById(id)
@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.notify.handler;

+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.notify.core.domain.SysUserMessage;
 import cn.novalon.gym.manage.notify.core.service.ISysUserMessageService;
 import org.springframework.stereotype.Component;
@@ -23,6 +24,24 @@ public class SysUserMessageHandler {
        return ServerResponse.ok().body(messages, SysUserMessage.class);
    }

+    public Mono<ServerResponse> getMessagesByUserPage(ServerRequest request) {
+        Long userId = Long.parseLong(request.pathVariable("userId"));
+        
+        int page = Integer.parseInt(request.queryParam("page").orElse("0"));
+        int size = Integer.parseInt(request.queryParam("size").orElse("10"));
+        String sort = request.queryParam("sort").orElse("createTime");
+        String order = request.queryParam("order").orElse("desc");
+        
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPage(page);
+        pageRequest.setSize(size);
+        pageRequest.setSort(sort);
+        pageRequest.setOrder(order);
+        
+        return messageService.getMessagesByUserPage(userId, pageRequest)
+                .flatMap(pageResponse -> ServerResponse.ok().bodyValue(pageResponse));
+    }
+
    public Mono<ServerResponse> getUnreadCount(ServerRequest request) {
        Long userId = Long.parseLong(request.pathVariable("userId"));
        return messageService.getUnreadCount(userId)
@@ -35,6 +54,24 @@ public class SysUserMessageHandler {
        return ServerResponse.ok().body(messages, SysUserMessage.class);
    }

+    public Mono<ServerResponse> getUnreadMessagesPage(ServerRequest request) {
+        Long userId = Long.parseLong(request.pathVariable("userId"));
+        
+        int page = Integer.parseInt(request.queryParam("page").orElse("0"));
+        int size = Integer.parseInt(request.queryParam("size").orElse("10"));
+        String sort = request.queryParam("sort").orElse("createTime");
+        String order = request.queryParam("order").orElse("desc");
+        
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPage(page);
+        pageRequest.setSize(size);
+        pageRequest.setSort(sort);
+        pageRequest.setOrder(order);
+        
+        return messageService.getUnreadMessagesPage(userId, pageRequest)
+                .flatMap(pageResponse -> ServerResponse.ok().bodyValue(pageResponse));
+    }
+
    public Mono<ServerResponse> createMessage(ServerRequest request) {
        return request.bodyToMono(SysUserMessage.class)
                .flatMap(messageService::createMessage)
@@ -48,6 +85,12 @@ public class SysUserMessageHandler {
                .switchIfEmpty(ServerResponse.notFound().build());
    }

+    public Mono<ServerResponse> markAllAsRead(ServerRequest request) {
+        Long userId = Long.parseLong(request.pathVariable("userId"));
+        return messageService.markAllAsRead(userId)
+                .flatMap(count -> ServerResponse.ok().bodyValue(count));
+    }
+
    public Mono<ServerResponse> deleteMessage(ServerRequest request) {
        Long id = Long.parseLong(request.pathVariable("id"));
        return messageService.deleteMessage(id)
@@ -58,7 +58,13 @@ public class SecurityConfig {
                            .pathMatchers("/api/member-card-records/**").permitAll()
                            .pathMatchers("/**").permitAll()
                            .pathMatchers("/api/member-card-transactions/**").permitAll()
-                            .pathMatchers("/api/checkIn/**").permitAll();
+                            .pathMatchers("/api/groupCourse/page").permitAll()
+                            .pathMatchers("/api/checkIn/**").permitAll()
+                            .pathMatchers("/api/payment/**").permitAll()
+                            .pathMatchers("/api/payment/create").permitAll()
+                            .pathMatchers("/api/payment/query").permitAll()
+                            .pathMatchers("/api/payment/notify").permitAll()
+                            .pathMatchers("/api/payment/refund").permitAll();


                    if (isDevOrTest) {
@@ -0,0 +1,46 @@
+package cn.novalon.gym.manage.sys;
+
+import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+import cn.novalon.gym.manage.common.config.JwtProperties;
+import org.junit.jupiter.api.Test;
+
+public class TokenGenerator {
+    
+    @Test
+    public void generateTokenForUser1_Dev() {
+        // dev环境secret
+        JwtProperties jwtProperties = new JwtProperties();
+        jwtProperties.setSecret("novalon-gym-manage-jwt-secret-key-for-development-only-2026");
+        JwtTokenProvider provider = new JwtTokenProvider(jwtProperties);
+        
+        String token = provider.generateToken("admin", 1L);
+        System.out.println("【Dev环境】Token for userId=1:");
+        System.out.println(token);
+        System.out.println();
+    }
+    
+    @Test
+    public void generateTokenForUser1_Local() {
+        // local环境secret
+        JwtProperties jwtProperties = new JwtProperties();
+        jwtProperties.setSecret("U2FsdGVkX1+vZ5Y9QmKxL8nN3rP7tW2jH4fG6dA8sB1cE5yN0zX3qV7wM4");
+        JwtTokenProvider provider = new JwtTokenProvider(jwtProperties);
+        
+        String token = provider.generateToken("admin", 1L);
+        System.out.println("【Local环境】Token for userId=1:");
+        System.out.println(token);
+        System.out.println();
+    }
+    
+    @Test
+    public void generateTokenForUser1_Default() {
+        // 默认环境secret
+        JwtProperties jwtProperties = new JwtProperties();
+        jwtProperties.setSecret("U2FsdGVkX1+vZ5Y9QmKxL8nN3rP7tW2jH4fG6dA8sB1cE5yN0zX3qV7wM4");
+        JwtTokenProvider provider = new JwtTokenProvider(jwtProperties);
+        
+        String token = provider.generateToken("admin", 1L);
+        System.out.println("【默认环境】Token for userId=1:");
+        System.out.println(token);
+    }
+}
@@ -46,6 +46,8 @@
        <module>gym-groupCourse</module>
        <module>gym-checkIn</module>
        <module>gym-dataCount</module>
+        <module>gym-payment</module>
+        <module>gym-auth</module>
 	</modules>

    <dependencyManagement>
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Created-By: Maven JAR Plugin 3.4.2
+Build-Jdk-Spec: 21
+Implementation-Title: Gym Payment
+Implementation-Version: 1.0.0
+
@@ -0,0 +1,3 @@
+artifactId=gym-payment
+groupId=cn.novalon.gym.manage
+version=1.0.0
@@ -0,0 +1,85 @@
+
+<?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-payment</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Payment</name>
+    <description>Payment Module - Integrates Huifu Payment Gateway</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1 @@
+cn.novalon.gym.manage.payment.config.HuifuPayConfig
@@ -1,4 +0,0 @@
-node_modules/
-unpackage/
-.hbuilderx/
-.DS_Store
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="gym.manage.uniapp">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-
-    <application>
-        <activity
-            android:name="com.mobile.auth.gatewayauth.LoginAuthActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="behind"
-            android:theme="@style/authsdk_activity_dialog" /> 
-			
-        <activity
-            android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="behind" />
-
-        <activity
-            android:name="com.mobile.auth.gatewayauth.PrivacyDialogActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="behind"
-            android:theme="@style/authsdk_activity_dialog" />
-    </application>
-</manifest>
@@ -1,85 +0,0 @@
-<template>
-  <view>
-    <GlobalLoading />
-  </view>
-</template>
-
-<script setup>
-import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
-import GlobalLoading from '@/components/global/GlobalLoading.vue'
-
-// 隐藏原生 TabBar - 这里是核心修复
-const hideNativeTabBar = () => {
-  // 尝试多次执行，确保执行成功
-  const tryHide = (times = 0) => {
-    if (times > 10) return // 最多尝试10次
-    
-    uni.hideTabBar({
-      animation: false,
-      success: () => {
-        console.log('✅ 原生TabBar隐藏成功')
-        // 强制 CSS 覆盖（双重保险）
-        forceCSSHide()
-      },
-      fail: (err) => {
-        console.log(`❌ 第${times+1}次隐藏失败，1秒后重试`, err)
-        setTimeout(() => tryHide(times + 1), 1000)
-      }
-    })
-  }
-  
-  // 延迟 300ms 执行，确保页面挂载完成
-  setTimeout(() => tryHide(), 300)
-}
-
-// 强制 CSS 覆盖（最终保险）
-const forceCSSHide = () => {
-  // #ifdef APP-PLUS
-  const style = document.createElement('style')
-  style.innerHTML = `
-    uni-tabbar, 
-    uni-tabbar .uni-tabbar,
-    .uni-tabbar,
-    uni-tabbar > .uni-tabbar,
-    [class*="uni-tabbar"] {
-      display: none !important;
-      height: 0 !important;
-      opacity: 0 !important;
-      visibility: hidden !important;
-      pointer-events: none !important;
-    }
-  `
-  document.head.appendChild(style)
-  console.log('✅ CSS 强制覆盖已注入')
-  // #endif
-}
-
-// 预加载所有 Tab 页面的核心数据
-const preloadTabData = () => {
-  // 延迟执行，不阻塞首屏
-  setTimeout(() => {
-    // 预加载课程数据等...
-  }, 1000)
-}
-
-onLaunch(() => {
-  console.log('App Launch')
-  preloadTabData()
-})
-
-onShow(() => {
-  console.log('App Show')
-  // #ifdef APP-PLUS
-  hideNativeTabBar()
-  // #endif
-})
-
-onHide(() => {
-  console.log('App Hide')
-})
-</script>
-
-<style lang="scss">
-/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-@import "@/uni.scss";
-</style>
@@ -1,132 +0,0 @@
-import request from "@/utils/request.js"
-
-export function getGroupCourseList(params = {}, options = {}) {
-  return request.get('/groupCourse/list', params, options)
-}
-
-export function getGroupCoursePage(params = {}, options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
-  const { page = 0, size = 10, sort = 'id', order = 'asc', keyword } = params
-  return request.post('/groupCourse/page', { page, size, sort, order, keyword }, options)
-}
-
-export function getGroupCourseById(id, options = { cache: true, cacheTime: 15 * 60 * 1000 }) {
-  return request.get(`/groupCourse/${id}`, {}, options)
-}
-
-export function getGroupCourseDetail(id, options = { cache: true, cacheTime: 15 * 60 * 1000 }) {
-  return request.get(`/groupCourse/${id}/detail`, {}, options)
-}
-
-export function createGroupCourse(params) {
-  return request.post('/groupCourse', params)
-}
-
-export function updateGroupCourse(id, params) {
-  return request.put(`/groupCourse/${id}`, params)
-}
-
-export function cancelGroupCourse(id) {
-  return request.post(`/groupCourse/${id}/cancel`)
-}
-
-export function deleteGroupCourse(id) {
-  return request.delete(`/groupCourse/${id}`)
-}
-
-export function getGroupCourseTypes(params = {}, options = { cache: true, cacheTime: 10 * 60 * 1000 }) {
-  return request.get('/groupCourse/types', params, options)
-}
-
-export function getGroupCourseTypeById(id, options = { cache: true, cacheTime: 10 * 60 * 1000 }) {
-  return request.get(`/groupCourse/types/${id}`, {}, options)
-}
-
-export function getTypeLabels(typeId, options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
-  return request.get(`/groupCourse/types/${typeId}/labels`, {}, options)
-}
-
-export function searchGroupCourse(params = {}, options = {}) {
-  const { 
-    courseName, 
-    courseType, 
-    startDate, 
-    endDate, 
-    timePeriod, 
-    priceSort, 
-    remainingMost,
-    isRecurring,
-    page = 0, 
-    size = 10 
-  } = params
-  
-  const requestBody = { page, size }
-  
-  if (courseName) requestBody.courseName = courseName
-  if (courseType) requestBody.courseType = courseType
-  if (startDate) requestBody.startDate = formatDateTime(startDate)
-  if (endDate) requestBody.endDate = formatDateTime(endDate, true)
-  if (timePeriod) requestBody.timePeriod = timePeriod
-  if (priceSort) requestBody.priceSort = priceSort
-  if (remainingMost !== undefined) requestBody.remainingMost = remainingMost
-  if (isRecurring !== undefined) requestBody.isRecurring = isRecurring
-  
-  return request.post('/groupCourse/search', requestBody, options)
-}
-
-function formatDateTime(dateStr, isEnd = false) {
-  if (!dateStr) return dateStr
-  if (dateStr.includes('T')) return dateStr
-  return isEnd 
-    ? `${dateStr}T23:59:59` 
-    : `${dateStr}T00:00:00`
-}
-
-export function bookGroupCourse(params) {
-  return request.post('/groupCourse/book', params)
-}
-
-export function cancelBooking(bookingId, params) {
-  return request.post(`/groupCourse/booking/${bookingId}/cancel`, params)
-}
-
-export function getMemberBookings(memberId, options = {}) {
-  return request.get(`/groupCourse/bookings/member/${memberId}`, {}, options)
-}
-
-export function getActiveRecommendCourses(options = { cache: false }) {
-  return request.get('/groupCourse/recommend/active', {}, options)
-}
-
-export function getGroupCourseRecommendList(params = {}, options = { cache: false }) {
-  return request.get('/groupCourse/recommend/list', params, options)
-}
-
-/**
- * 扫码签到
- * 扫描团课二维码后签到，将预约状态更新为已出席
- * @param {number} courseId - 团课ID
- * @param {number} memberId - 会员ID
- */
-export function qrSignInGroupCourse(courseId, memberId) {
-  return request.post(`/groupCourse/signin/${memberId}`, { courseId })
-}
-
-export default {
-  getGroupCourseList,
-  getGroupCoursePage,
-  searchGroupCourse,
-  getGroupCourseById,
-  getGroupCourseDetail,
-  createGroupCourse,
-  updateGroupCourse,
-  cancelGroupCourse,
-  deleteGroupCourse,
-  getGroupCourseTypes,
-  getGroupCourseTypeById,
-  getTypeLabels,
-  bookGroupCourse,
-  cancelBooking,
-  getMemberBookings,
-  getActiveRecommendCourses,
-  getGroupCourseRecommendList
-}
@@ -1,294 +0,0 @@
-import request from "@/utils/request.js"
-
-/**
- * 微信小程序登录
- * @param {object} params - 登录参数 { code: string }
- */
-export function login(params) {
-  return request.post('/member/auth/miniapp/login', params)
-}
-
-/**
- * 发送短信验证码
- * @param {object} params - { phone: string }
- */
-export function sendCode(params) {
-  return request.post('/auth/phone/send-code', params)
-}
-
-/**
- * 手机号验证码登录
- * @param {object} params - { phone: string, code: string }
- */
-export function loginWithPhone(params) {
-  return request.post('/auth/phone/code-login', params)
-}
-
-/**
- * 手机号一键登录
- * @param {object} params - { accessToken: string, openid: string, nickname?: string, avatar?: string }
- */
-export function oneClickLogin(params) {
-  return request.post('/auth/phone/one-click-login', params)
-}
-
-/**
- * 退出登录
- */
-export function logout() {
-  return request.post('/member/auth/logout')
-}
-
-/**
- * 获取签到二维码
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getQRCode(options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
-  return request.get('/checkIn/qrcode', {}, options)
-}
-
-/**
- * 扫码签到
- * @param {object} params - { qrcode: string, memberId: number }
- */
-export function checkIn(params) {
-  return request.post('/checkIn', params)
-}
-
-/**
- * 获取签到记录（分页）
- * @param {object} params - { page: number, size: number }
- * @param {object} options - 请求选项
- */
-export function getCheckInRecords(params = {}, options = {}) {
-  const { page = 0, size = 5 } = params
-  return request.post('/checkIn/page', { page, size }, options)
-}
-
-/**
- * 获取用户未读消息数量
- * @param {number} userId - 用户ID
- * @param {object} options - 请求选项
- */
-export function getUnreadMessageCount(userId, options = {}) {
-  return request.get(`/messages/user/${userId}/unread`, {}, options)
-}
-
-// ========== 消息相关API ==========
-
-/**
- * 获取用户消息列表（支持分页）
- * @param {number} userId - 用户ID
- * @param {object} params - 查询参数
- * @param {number} params.page - 页码（从0开始）
- * @param {number} params.size - 每页条数
- * @param {object} options - 请求选项
- * @returns {Promise} 消息列表
- */
-export function getUserMessages(userId, params = {}, options = {}) {
-  const { page = 0, size = 10 } = params
-  return request.get(`/messages/user/${userId}/page`, { page, size }, options)
-}
-
-/**
- * 获取未读消息列表（支持分页）
- * @param {number} userId - 用户ID
- * @param {object} params - 查询参数
- * @param {number} params.page - 页码（从0开始）
- * @param {number} params.size - 每页条数
- * @param {object} options - 请求选项
- * @returns {Promise} 未读消息列表
- */
-export function getUnreadMessages(userId, params = {}, options = {}) {
-  const { page = 0, size = 10 } = params
-  return request.get(`/messages/user/${userId}/unread/page`, { page, size }, options)
-}
-
-/**
- * 标记消息为已读
- * @param {number|string} id - 消息ID
- * @param {object} options - 请求选项
- * @returns {Promise} 操作结果
- */
-export function markMessageAsRead(id, options = {}) {
-  return request.put(`/messages/${id}/read`, {}, options)
-}
-
-/**
- * 标记所有消息为已读
- * @param {number} userId - 用户ID
- * @param {object} options - 请求选项
- * @returns {Promise} 操作结果
- */
-export function markAllMessagesAsRead(userId, options = {}) {
-  return request.put(`/messages/user/${userId}/read`, {}, options)
-}
-
-/**
- * 删除消息
- * @param {number|string} id - 消息ID
- * @param {object} options - 请求选项
- * @returns {Promise} 操作结果
- */
-export function deleteMessage(id, options = {}) {
-  return request.delete(`/messages/${id}`, {}, options)
-}
-
-/**
- * 获取用户信息（基础信息缓存）
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getUserInfo(options = { cache: true, cacheTime: 30 * 60 * 1000 }) {
-  return request.get('/member/info', {}, options)
-}
-
-/**
- * 获取会员详细信息（包含会员卡、积分等）
- * @param {object} options - 请求选项 { cache: boolean }
- */
-export function getMemberDetail(options = { cache: false }) {
-  return request.get('/member/info', {}, options)
-}
-
-/**
- * 获取签到统计
- * @param {object} params - 查询参数 { startDate: string, endDate: string }
- * @param {object} options - 请求选项 { cache: boolean }
- */
-export function getCheckInStats(params = {}, options = { cache: false }) {
-  return request.get('/checkIn/statistics', params, options)
-}
-
-/**
- * 更新用户信息
- * @param {object} params - 用户信息参数
- */
-export function updateUserInfo(params) {
-  return request.put('/member/info', params)
-}
-
-// ========== 系统配置相关API ==========
-
-/**
- * 根据配置键获取配置值
- * @param {string} configKey - 配置键
- * @param {object} options - 请求选项
- */
-export function getConfigByKey(configKey, options = {}) {
-  return request.get(`/config/key/${configKey}`, {}, options)
-}
-
-// ========== 课程相关API ==========
-
-/**
- * 获取推荐课程列表
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getRecommendCourses(options = { cache: true, cacheTime: 10 * 60 * 1000 }) {
-  return request.get('/course/recommend', {}, options)
-}
-
-/**
- * 获取课程详情
- * @param {number} id - 课程ID
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getCourseDetail(id, options = { cache: true, cacheTime: 15 * 60 * 1000 }) {
-  return request.get(`/course/${id}`, {}, options)
-}
-
-/**
- * 获取团课列表（分页）
- * @param {object} params - 查询参数 { page: number, size: number, sort: string, order: string, keyword: string }
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getGroupCoursePage(params = {}, options = { cache: true, cacheTime: 5 * 60 * 1000 }) {
-  const { page = 0, size = 10, sort = 'id', order = 'asc', keyword } = params
-  return request.post('/groupCourse/page', { page, size, sort, order, keyword }, options)
-}
-
-// ========== 团课预约相关API ==========
-
-/**
- * 预约团课
- * @param {object} params - 预约参数
- * @param {number} params.courseId - 团课ID
- * @param {number} params.memberId - 会员ID
- */
-export function bookGroupCourse(params) {
-  return request.post('/groupCourse/book', params)
-}
-
-/**
- * 取消预约
- * @param {number} bookingId - 预约ID
- */
-export function cancelBooking(bookingId) {
-  return request.delete(`/groupCourse/book/${bookingId}`, {})
-}
-
-/**
- * 团课签到
- * @param {number} memberId - 会员ID
- * @param {number} courseId - 团课ID
- */
-export function signinGroupCourse(memberId, courseId) {
-  return request.post(`/groupCourse/signin/${memberId}`, { courseId })
-}
-
-/**
- * 查询会员预约记录
- * @param {number} memberId - 会员ID
- */
-export function getMemberBookings(memberId, options = { cache: false }) {
-  return request.get(`/groupCourse/bookings/member/${memberId}`, {}, options)
-}
-
-/**
- * 查询课程预约记录
- * @param {number} courseId - 团课ID
- */
-export function getCourseBookings(courseId, options = { cache: false }) {
-  return request.get(`/groupCourse/bookings/course/${courseId}`, {}, options)
-}
-
-// ========== 轮播图相关API ==========
-
-/**
- * 获取启用的轮播图列表
- * @param {object} options - 请求选项 { cache: boolean, cacheTime: number }
- */
-export function getActiveBanners(options = { cache: true, cacheTime: 10 * 60 * 1000 }) {
-  return request.get('/banner/active', {}, options)
-}
-
-export default {
-  login,
-  sendCode,
-  loginWithPhone,
-  oneClickLogin,
-  logout,
-  getQRCode,
-  checkIn,
-  getCheckInRecords,
-  getCheckInStats,
-  getUnreadMessageCount,
-  getUserMessages,
-  getUnreadMessages,
-  markMessageAsRead,
-  markAllMessagesAsRead,
-  deleteMessage,
-  getUserInfo,
-  getMemberDetail,
-  updateUserInfo,
-  getConfigByKey,
-  getRecommendCourses,
-  getCourseDetail,
-  getGroupCoursePage,
-  bookGroupCourse,
-  cancelBooking,
-  signinGroupCourse,
-  getMemberBookings,
-  getCourseBookings,
-  getActiveBanners
-}
@@ -1,188 +0,0 @@
-// common/constants/routes.js
-
-/** 与 pages.json 保持一致 */
-export const PAGE = {
-    INDEX: '/pages/index/index',
-    COURSE: '/pages/course/index',
-    MEMBER: '/pages/memberInfo/memberInfo',
-    BOOKING: '/pages/memberInfo/booking',
-    USER_INFO: '/pages/memberInfo/userInfo',
-    BODY_TEST_HOME: '/pages/memberInfo/bodyTestHome',
-    BODY_TEST_CONNECT: '/pages/memberInfo/bodyTestConnect',
-    BODY_TEST_MEASURING: '/pages/memberInfo/bodyTestMeasuring',
-    BODY_TEST_REPORT: '/pages/memberInfo/bodyTestReport',
-    BODY_TEST_HISTORY: '/pages/memberInfo/bodyTestHistory',
-    BODY_TEST_COMPARE: '/pages/memberInfo/bodyTestCompare',
-    BODY_TEST_SETTINGS: '/pages/memberInfo/bodyTestSettings',
-    BODY_TEST_TREND: '/pages/memberInfo/bodyTestTrend',
-    COURSE_LIST: '/pages/groupCourse/list',
-    COURSE_DETAIL: '/pages/memberInfo/courseDetail',
-    COUPON_DETAIL: '/pages/memberInfo/couponDetail',
-    COUPON_CENTER: '/pages/memberInfo/couponCenter',
-    POINTS_MALL: '/pages/memberInfo/pointsMall',
-    POINTS_HISTORY: '/pages/memberInfo/pointsHistory',
-    ONLINE_COURSE: '/pages/memberInfo/onlineCourseDetail',
-    COURSE_EVALUATE: '/pages/memberInfo/courseEvaluate',
-    TRAIN_SESSION: '/pages/memberInfo/trainSessionDetail',
-    TRAIN_REPORT: '/pages/memberInfo/trainReport',
-    COUPONS: '/pages/memberInfo/coupons',
-    POINTS: '/pages/memberInfo/points',
-    REFERRAL: '/pages/memberInfo/referral',
-    MY_COURSES: '/pages/memberInfo/myCourses',
-    CHECK_IN_HISTORY: '/pages/memberInfo/checkInHistory'
-}
-
-/** 底部 TabBar 页面路径，顺序与 TabBar.vue 一致 */
-export const TAB_ROUTES = [
-    PAGE.INDEX,
-    PAGE.COURSE,
-    PAGE.MEMBER
-]
-
-const TAB_PAGES = new Set(TAB_ROUTES)
-
-/** 防止 Tab 连点触发并发路由 */
-let tabNavigating = false
-
-function normalizePath(url) {
-    if (!url) return ''
-    const path = url.split('?')[0]
-    return path.startsWith('/') ? path : `/${path}`
-}
-
-export function getTabIndexByRoute(route) {
-    const path = normalizePath(route)
-    const idx = TAB_ROUTES.indexOf(path)
-    return idx >= 0 ? idx : 0
-}
-
-export function getCurrentRoutePath() {
-    const pages = getCurrentPages()
-    if (!pages.length) return PAGE.INDEX
-    const page = pages[pages.length - 1]
-    const route = page.route || page.$page?.fullPath || ''
-    return normalizePath(route ? `/${route}` : PAGE.INDEX)
-}
-
-/**
- * 跳转到普通页面（非 TabBar 页面）
- * 使用 navigateTo，保留页面栈，可以正常返回
- */
-export function navigateToPage(url) {
-	uni.showLoading({ title: '加载中...', mask: true })
-    const path = normalizePath(url)
-    
-    // ✅ 如果目标是 TabBar 页面，不应该使用 navigateTo
-    // 这种情况应该使用 switchToTabPage（会清空页面栈）
-    if (TAB_PAGES.has(path)) {
-        console.warn('[navigateToPage] 不应该用 navigateTo 跳转 TabBar 页面，请使用 switchToTabPage')
-        uni.hideLoading()
-        switchToTabPage(path)
-        return
-    }
-    
-    console.log('[navigateToPage] 跳转到:', url)
-    
-    uni.navigateTo({
-        url,
-        fail: (err) => {
-            console.error('[navigateTo]', url, err)
-            uni.hideLoading()
-            // 页面栈满时降级使用 redirectTo
-            if (err.errMsg && err.errMsg.includes('limit')) {
-                uni.redirectTo({ url })
-            } else {
-                uni.showToast({ title: '页面跳转失败', icon: 'none' })
-            }
-        },
-        complete: () => {
-            // 页面已发起跳转，隐藏 loading
-            // 目标页面的 onLoad/onReady 也会调用 hideLoading 做兜底
-            uni.hideLoading()
-        }
-    })
-}
-
-/**
- * 跳转到 TabBar 页面（清空页面栈）
- * 用于从任何页面跳转到首页/课程/训练等 TabBar 页面
- */
-export function switchToTabPage(url) {
-    const path = normalizePath(url)
-    if (!TAB_PAGES.has(path)) {
-        console.warn('[switchToTabPage] 目标不是 TabBar 页面:', path)
-        navigateToPage(url)
-        return
-    }
-    
-    if (getCurrentRoutePath() === path || tabNavigating) return
-    
-    console.log('[switchToTabPage] 跳转到 TabBar:', path)
-    
-    tabNavigating = true
-    uni.switchTab({
-        url: path,
-        complete: () => {
-            uni.hideLoading()
-            setTimeout(() => {
-                tabNavigating = false
-            }, 320)
-        },
-        fail: (err) => {
-            console.error('[switchTab]', path, err)
-            uni.hideLoading()
-            uni.reLaunch({
-                url: path,
-                complete: () => {
-                    uni.hideLoading()
-                    setTimeout(() => {
-                        tabNavigating = false
-                    }, 320)
-                }
-            })
-        }
-    })
-}
-
-/**
- * 重置到 TabBar 页面（清空所有历史）
- * 用于退出登录、强制跳转等场景
- */
-export function reLaunchToTabPage(url) {
-    const path = normalizePath(url)
-    console.log('[reLaunchToTabPage] 重置到:', path)
-    
-    uni.reLaunch({
-        url: path,
-        fail: (err) => {
-            console.error('[reLaunch]', path, err)
-            uni.switchTab({ url: path })
-        }
-    })
-}
-
-/**
- * 返回上一页，如果没有上一页则跳转到指定 TabBar 页面
- */
-export function goBackOrTab(fallbackUrl = PAGE.MEMBER) {
-    const pages = getCurrentPages()
-    if (pages.length > 1) {
-        uni.navigateBack({ delta: 1 })
-    } else {
-        switchToTabPage(fallbackUrl)
-    }
-}
-
-/**
- * 子页面返回个人中心
- */
-export function backToMemberCenter() {
-    goBackOrTab(PAGE.MEMBER)
-}
-
-/**
- * 子页面返回指定 TabBar 页面
- */
-export function backToTab(tabUrl) {
-    goBackOrTab(tabUrl)
-}
@@ -1,247 +0,0 @@
-/**
- * 登录拦截Hook
- * 用于在需要登录的操作前检查用户登录状态，未登录则弹出登录框
- *
- * 使用方式：
- * import { useLoginGuard } from '@/common/hooks/useLoginGuard.js'
- *
- * const { checkLogin, requireLogin } = useLoginGuard()
- *
- * // 方式1：检查登录状态（返回布尔值）
- * if (!checkLogin()) return
- *
- * // 方式2：需要登录才执行（推荐）
- * await requireLogin()
- * // 之后的代码只有在登录后才执行
- *
- * // 方式3：在点击事件中使用
- * async function handleClick() {
- *   await requireLogin()
- *   // 执行需要登录的操作
- * }
- */
-
-import { getToken } from '@/utils/request.js'
-import { loadMemberStore } from '@/common/memberInfo/store.js'
-
-// 保存当前页面的登录弹窗引用
-let loginModalRef = null
-
-/**
- * 注册登录弹窗组件
- * 在App.vue或页面onMounted中调用
- * @param {Object} modalRef - loginModal组件的ref
- */
-export function registerLoginModal(modalRef) {
-    loginModalRef = modalRef
-}
-
-/**
- * 获取当前登录状态
- * @returns {Boolean}
- */
-export function isLoggedIn() {
-    const token = getToken()
-    const isLoginStorage = uni.getStorageSync('isLogin')
-    return !!(token || isLoginStorage)
-}
-
-/**
- * 获取登录用户信息
- * @returns {Object|null}
- */
-export function getLoginUser() {
-    const store = loadMemberStore()
-    return store.profile || null
-}
-
-/**
- * 使用登录拦截Hook
- * @returns {Object}
- */
-export function useLoginGuard() {
-
-    /**
-     * 检查登录状态（同步）
-     * @returns {Boolean} 是否已登录
-     */
-    function checkLogin() {
-        return isLoggedIn()
-    }
-
-    /**
-     * 需要登录才继续执行（异步）
-     * 如果未登录，弹出登录框，等待用户登录或取消
-     * @param {Object} options - 配置选项
-     * @param {String} options.title - 弹窗标题
-     * @param {String} options.subtitle - 弹窗副标题
-     * @param {Function} options.onSuccess - 登录成功回调
-     * @param {Function} options.onCancel - 取消登录回调
-     * @returns {Promise<Boolean>} 是否已登录（用户登录成功返回true，取消返回false）
-     */
-    async function requireLogin(options = {}) {
-        // 如果已经登录，直接返回true
-        if (isLoggedIn()) {
-            return true
-        }
-
-        // 如果传入了onSuccess回调，先检查
-        if (options.onSuccess) {
-            const store = loadMemberStore()
-            if (store.profile?.id) {
-                options.onSuccess(store.profile)
-                return true
-            }
-        }
-
-        // 显示登录弹窗
-        return new Promise((resolve) => {
-            if (!loginModalRef) {
-                console.warn('[useLoginGuard] 登录弹窗未注册，请先调用 registerLoginModal')
-                // 尝试跳转到登录页
-                uni.navigateTo({
-                    url: '/pages/memberInfo/login',
-                    fail: () => {
-                        uni.showToast({
-                            title: '请先登录',
-                            icon: 'none'
-                        })
-                    }
-                })
-                resolve(false)
-                return
-            }
-
-            // 保存resolve函数
-            let resolvePromise = resolve
-
-            // 显示登录弹窗
-            loginModalRef.show()
-
-            // 监听登录成功
-            const loginSuccessHandler = (result) => {
-                if (options.onSuccess) {
-                    options.onSuccess(result)
-                }
-                resolvePromise(true)
-            }
-
-            // 监听登录失败/取消
-            const closeHandler = () => {
-                if (options.onCancel) {
-                    options.onCancel()
-                }
-                resolvePromise(false)
-            }
-
-            // 注册事件监听
-            uni.$once('loginModal:success', loginSuccessHandler)
-            uni.$once('loginModal:close', closeHandler)
-
-            // 设置超时
-            setTimeout(() => {
-                uni.$off('loginModal:success', loginSuccessHandler)
-                uni.$off('loginModal:close', closeHandler)
-            }, 60000) // 60秒超时
-        })
-    }
-
-    /**
-     * 安全执行函数（仅登录后执行）
-     * @param {Function} fn - 要执行的函数
-     * @param {Object} options - 配置选项
-     * @returns {Promise<any>} 函数返回值或null
-     */
-    async function safeExecute(fn, options = {}) {
-        const loggedIn = await requireLogin(options)
-        if (loggedIn && typeof fn === 'function') {
-            return await fn()
-        }
-        return null
-    }
-
-    /**
-     * 包装需要登录的API调用
-     * @param {Function} apiFn - API函数
-     * @param {Array} args - API参数
-     * @param {Object} options - 配置选项
-     * @returns {Promise<any>}
-     */
-    async function callLoggedInApi(apiFn, args = [], options = {}) {
-        const loggedIn = await requireLogin(options)
-        if (loggedIn && typeof apiFn === 'function') {
-            return await apiFn(...args)
-        }
-        throw new Error('用户未登录')
-    }
-
-    return {
-        checkLogin,
-        requireLogin,
-        safeExecute,
-        callLoggedInApi,
-        isLoggedIn,
-        getLoginUser
-    }
-}
-
-/**
- * 创建登录拦截Mixin（用于选项式API）
- * @returns {Object}
- */
-export function loginGuardMixin() {
-    return {
-        data() {
-            return {
-                isLogin: false
-            }
-        },
-        onLoad() {
-            this.checkLoginStatus()
-        },
-        onShow() {
-            this.checkLoginStatus()
-        },
-        methods: {
-            checkLoginStatus() {
-                this.isLogin = isLoggedIn()
-            },
-
-            async ensureLogin() {
-                if (!this.isLogin) {
-                    if (!loginModalRef) {
-                        uni.navigateTo({
-                            url: '/pages/memberInfo/login'
-                        })
-                        return false
-                    }
-                    loginModalRef.show()
-                    return false
-                }
-                return true
-            }
-        }
-    }
-}
-
-/**
- * 路由守卫配置
- * 配置需要登录的页面路径
- */
-export const protectedRoutes = [
-    '/pages/memberInfo/memberInfo',
-    '/pages/memberInfo/checkIn',
-    '/pages/memberInfo/booking',
-    '/pages/memberInfo/coupons',
-    '/pages/memberInfo/points',
-    '/pages/memberInfo/userInfo'
-]
-
-/**
- * 检查当前页面是否需要登录
- * @param {String} currentPage - 当前页面路径
- * @returns {Boolean}
- */
-export function isProtectedRoute(currentPage) {
-    return protectedRoutes.some(route => currentPage.includes(route))
-}
@@ -1,163 +0,0 @@
-const COLORS = {
-    primary: '#0B2B4B',
-    accent: '#FF6B35',
-    accentLight: 'rgba(255, 107, 53, 0.25)',
-    grid: '#E9EDF2',
-    text: '#5E6F8D',
-    fill: 'rgba(26, 74, 111, 0.35)',
-    line: '#1A4A6F'
-}
-
-function setupCanvas(canvas, width, height, dpr) {
-    canvas.width = width * dpr
-    canvas.height = height * dpr
-    const ctx = canvas.getContext('2d')
-    ctx.scale(dpr, dpr)
-    return ctx
-}
-
-/** 绘制雷达图 */
-export function drawRadarChart(canvas, opts = {}) {
-    if (!canvas) return
-    const {
-        width = 280,
-        height = 240,
-        labels = [],
-        values = [],
-        dpr = 1
-    } = opts
-    const ctx = setupCanvas(canvas, width, height, dpr)
-    ctx.clearRect(0, 0, width, height)
-
-    const cx = width / 2
-    const cy = height / 2 + 8
-    const radius = Math.min(width, height) * 0.32
-    const count = labels.length || 6
-    const angleStep = (Math.PI * 2) / count
-
-    for (let level = 1; level <= 4; level += 1) {
-        ctx.beginPath()
-        const r = (radius * level) / 4
-        for (let i = 0; i <= count; i += 1) {
-            const angle = -Math.PI / 2 + i * angleStep
-            const x = cx + r * Math.cos(angle)
-            const y = cy + r * Math.sin(angle)
-            if (i === 0) ctx.moveTo(x, y)
-            else ctx.lineTo(x, y)
-        }
-        ctx.strokeStyle = COLORS.grid
-        ctx.lineWidth = 1
-        ctx.stroke()
-    }
-
-    for (let i = 0; i < count; i += 1) {
-        const angle = -Math.PI / 2 + i * angleStep
-        ctx.beginPath()
-        ctx.moveTo(cx, cy)
-        ctx.lineTo(cx + radius * Math.cos(angle), cy + radius * Math.sin(angle))
-        ctx.strokeStyle = COLORS.grid
-        ctx.stroke()
-    }
-
-    ctx.beginPath()
-    values.forEach((val, i) => {
-        const ratio = Math.min(1, Math.max(0, val / 100))
-        const angle = -Math.PI / 2 + i * angleStep
-        const x = cx + radius * ratio * Math.cos(angle)
-        const y = cy + radius * ratio * Math.sin(angle)
-        if (i === 0) ctx.moveTo(x, y)
-        else ctx.lineTo(x, y)
-    })
-    ctx.closePath()
-    ctx.fillStyle = COLORS.fill
-    ctx.fill()
-    ctx.strokeStyle = COLORS.accent
-    ctx.lineWidth = 2
-    ctx.stroke()
-
-    ctx.font = '11px sans-serif'
-    ctx.fillStyle = COLORS.text
-    ctx.textAlign = 'center'
-    labels.forEach((label, i) => {
-        const angle = -Math.PI / 2 + i * angleStep
-        const x = cx + (radius + 18) * Math.cos(angle)
-        const y = cy + (radius + 18) * Math.sin(angle) + 4
-        ctx.fillText(label, x, y)
-    })
-}
-
-/** 绘制折线趋势图 */
-export function drawTrendChart(canvas, opts = {}) {
-    if (!canvas) return
-    const {
-        width = 300,
-        height = 160,
-        points = [],
-        dpr = 1,
-        unit = ''
-    } = opts
-    const ctx = setupCanvas(canvas, width, height, dpr)
-    ctx.clearRect(0, 0, width, height)
-
-    if (!points.length) {
-        ctx.fillStyle = COLORS.text
-        ctx.font = '13px sans-serif'
-        ctx.textAlign = 'center'
-        ctx.fillText('暂无趋势数据', width / 2, height / 2)
-        return
-    }
-
-    const pad = { top: 16, right: 12, bottom: 28, left: 12 }
-    const chartW = width - pad.left - pad.right
-    const chartH = height - pad.top - pad.bottom
-    const values = points.map((p) => p.value)
-    const min = Math.min(...values) * 0.95
-    const max = Math.max(...values) * 1.05
-    const range = max - min || 1
-
-    ctx.strokeStyle = COLORS.grid
-    ctx.lineWidth = 1
-    for (let i = 0; i <= 3; i += 1) {
-        const y = pad.top + (chartH * i) / 3
-        ctx.beginPath()
-        ctx.moveTo(pad.left, y)
-        ctx.lineTo(width - pad.right, y)
-        ctx.stroke()
-    }
-
-    const coords = points.map((p, i) => ({
-        x: pad.left + (chartW * i) / Math.max(1, points.length - 1),
-        y: pad.top + chartH - ((p.value - min) / range) * chartH
-    }))
-
-    ctx.beginPath()
-    coords.forEach((pt, i) => {
-        if (i === 0) ctx.moveTo(pt.x, pt.y)
-        else ctx.lineTo(pt.x, pt.y)
-    })
-    ctx.strokeStyle = COLORS.line
-    ctx.lineWidth = 2
-    ctx.stroke()
-
-    coords.forEach((pt, i) => {
-        ctx.beginPath()
-        ctx.arc(pt.x, pt.y, 4, 0, Math.PI * 2)
-        ctx.fillStyle = COLORS.accent
-        ctx.fill()
-        ctx.strokeStyle = '#fff'
-        ctx.lineWidth = 1.5
-        ctx.stroke()
-
-        ctx.fillStyle = COLORS.text
-        ctx.font = '10px sans-serif'
-        ctx.textAlign = 'center'
-        ctx.fillText(points[i].label, pt.x, height - 8)
-    })
-
-    if (unit) {
-        ctx.fillStyle = COLORS.text
-        ctx.font = '10px sans-serif'
-        ctx.textAlign = 'left'
-        ctx.fillText(unit, pad.left, pad.top - 2)
-    }
-}
@@ -1,286 +0,0 @@
-function formatRecordTime(date) {
-    const y = date.getFullYear()
-    const m = String(date.getMonth() + 1).padStart(2, '0')
-    const d = String(date.getDate()).padStart(2, '0')
-    const h = String(date.getHours()).padStart(2, '0')
-    const min = String(date.getMinutes()).padStart(2, '0')
-    return `${y}-${m}-${d}  ${h}:${min}`
-}
-
-function formatIsoDate(date) {
-    const y = date.getFullYear()
-    const m = String(date.getMonth() + 1).padStart(2, '0')
-    const d = String(date.getDate()).padStart(2, '0')
-    return `${y}-${m}-${d}`
-}
-
-function formatTime(date) {
-    const h = String(date.getHours()).padStart(2, '0')
-    const min = String(date.getMinutes()).padStart(2, '0')
-    return `${h}:${min}`
-}
-
-export function getDefaultBodyTestState() {
-    return {
-        settings: {},
-        device: { connected: false, battery: 80 },
-        records: []
-    }
-}
-
-export function mergeBodyTestState(saved) {
-    const defaults = getDefaultBodyTestState()
-    if (!saved) return defaults
-    return {
-        settings: { ...defaults.settings, ...(saved.settings || {}) },
-        device: { ...defaults.device, ...(saved.device || {}) },
-        records: saved.records?.length ? saved.records : defaults.records
-    }
-}
-
-export function getLatestBodyTestRecord(store) {
-    const records = store.bodyTest?.records || []
-    return records.length ? { ...records[0] } : null
-}
-
-export function getBodyTestRecordById(store, id) {
-    const numId = Number(id)
-    const record = (store.bodyTest?.records || []).find((item) => item.id === numId)
-    return record ? { ...record } : null
-}
-
-export function getBodyTestHistory(store, year) {
-    let list = (store.bodyTest?.records || []).map((item) => ({ ...item }))
-    if (year && year !== 'all') {
-        list = list.filter((r) => r.date.startsWith(String(year)))
-    }
-    return list
-}
-
-export function getBodyTestChangeBadge(record, previous) {
-    if (!previous?.metrics || !record?.metrics) return null
-    const diff = Math.round((record.metrics.bodyFat - previous.metrics.bodyFat) * 10) / 10
-    if (diff === 0) return null
-    const sign = diff > 0 ? '+' : ''
-    return { key: 'bodyFat', text: `体脂率${sign}${diff}%`, good: diff < 0 }
-}
-
-export function getBodyTestYears(store) {
-    const years = new Set((store.bodyTest?.records || []).map((r) => r.date.slice(0, 4)))
-    return ['all', ...Array.from(years).sort().reverse()]
-}
-
-export function computeGrade(score) {
-    if (score >= 90) return { grade: 'A', gradeLabel: '优秀' }
-    if (score >= 80) return { grade: 'B+', gradeLabel: '良好' }
-    if (score >= 70) return { grade: 'B', gradeLabel: '中等' }
-    if (score >= 60) return { grade: 'C', gradeLabel: '一般' }
-    return { grade: 'D', gradeLabel: '需改善' }
-}
-
-export function computeScore(metrics) {
-    const bmi = metrics.bmi || 22
-    const bodyFat = metrics.bodyFat || 25
-    const muscle = metrics.muscleMass || 22
-    const bmiScore = bmi >= 18.5 && bmi <= 24 ? 90 : bmi >= 17 && bmi <= 27 ? 75 : 60
-    const fatScore = bodyFat <= 22 ? 92 : bodyFat <= 26 ? 80 : bodyFat <= 30 ? 68 : 55
-    const muscleScore = muscle >= 22 ? 88 : muscle >= 20 ? 76 : 62
-    return Math.round((bmiScore + fatScore + muscleScore) / 3)
-}
-
-export function computeChanges(current, previous) {
-    if (!previous?.metrics) return {}
-    const keys = ['weight', 'bmi', 'bodyFat', 'muscleMass', 'visceralFat', 'bmr', 'bodyWater', 'boneMass']
-    const changes = {}
-    keys.forEach((key) => {
-        const cur = Number(current.metrics[key])
-        const prev = Number(previous.metrics[key])
-        if (Number.isFinite(cur) && Number.isFinite(prev)) {
-            const diff = Math.round((cur - prev) * 10) / 10
-            changes[key] = diff
-        }
-    })
-    return changes
-}
-
-export function formatChangeValue(key, diff, unitSystem = 'metric') {
-    if (diff === undefined || diff === null) return '--'
-    const sign = diff > 0 ? '+' : ''
-    const units = {
-        weight: unitSystem === 'metric' ? 'kg' : 'lb',
-        bodyFat: '%',
-        muscleMass: 'kg',
-        bmi: '',
-        visceralFat: '级',
-        bmr: 'kcal',
-        bodyWater: '%',
-        boneMass: 'kg'
-    }
-    const unit = units[key] || ''
-    return `${sign}${diff}${unit}`
-}
-
-export function buildBodyReportSummary(record, previous) {
-    if (!record) {
-        return {
-            date: '--',
-            weight: '--',
-            bmi: '--',
-            bodyFat: '--',
-            bmr: '--',
-            status: '暂无数据',
-            change: '--'
-        }
-    }
-    const changes = computeChanges(record, previous)
-    const weightChange = changes.weight
-    let changeText = '--'
-    if (weightChange !== undefined) {
-        const sign = weightChange > 0 ? '+' : ''
-        changeText = `${sign}${weightChange}kg`
-    }
-    return {
-        date: record.date,
-        weight: String(record.metrics.weight),
-        bmi: String(record.metrics.bmi),
-        bodyFat: `${record.metrics.bodyFat}%`,
-        bmr: String(record.metrics.bmr),
-        status: record.status,
-        change: changeText,
-        recordId: record.id
-    }
-}
-
-export function getBodyTestTrendData(store, metricKey, limit = 6) {
-    const records = [...(store.bodyTest?.records || [])].reverse().slice(-limit)
-    return records.map((item) => ({
-        id: item.id,
-        date: item.date,
-        label: item.date.slice(5),
-        value: Number(item.metrics[metricKey]) || 0
-    }))
-}
-
-function getMetricDefs() {
-    return [
-        { key: 'weight', label: '体重' },
-        { key: 'bmi', label: 'BMI' },
-        { key: 'bodyFat', label: '体脂率' },
-        { key: 'muscleMass', label: '肌肉量' },
-        { key: 'visceralFat', label: '内脏脂肪' },
-        { key: 'bmr', label: '基础代谢' }
-    ]
-}
-
-export function getCompareData(store, idA, idB) {
-    const a = getBodyTestRecordById(store, idA)
-    const b = getBodyTestRecordById(store, idB)
-    if (!a || !b) return null
-    const metricDefs = getMetricDefs()
-    const keys = ['weight', 'bmi', 'bodyFat', 'muscleMass', 'visceralFat', 'bmr']
-    const metrics = keys.map((key) => ({
-        key,
-        label: metricDefs.find((m) => m.key === key)?.label || key,
-        valueA: a.metrics[key],
-        valueB: b.metrics[key],
-        diff: Math.round((a.metrics[key] - b.metrics[key]) * 10) / 10
-    }))
-    return { recordA: a, recordB: b, metrics }
-}
-
-export function getRecommendedCourses(record) {
-    return []
-}
-
-export function updateBodyTestSettings(store, patch) {
-    store.bodyTest.settings = { ...store.bodyTest.settings, ...patch }
-    return store
-}
-
-export function connectBodyTestDevice(store) {
-    store.bodyTest.device = {
-        ...store.bodyTest.device,
-        connected: true,
-        battery: Math.min(100, (store.bodyTest.device.battery || 80) + Math.floor(Math.random() * 5)),
-        lastConnected: formatRecordTime(new Date())
-    }
-    return store
-}
-
-export function disconnectBodyTestDevice(store) {
-    store.bodyTest.device = { ...store.bodyTest.device, connected: false }
-    return store
-}
-
-function nextRecordId(records) {
-    return (records || []).reduce((max, item) => Math.max(max, item.id || 0), 0) + 1
-}
-
-/** 模拟一次完整体测并写入记录 */
-export function saveSimulatedBodyTestRecord(store, finalMetrics) {
-    const now = new Date()
-    const previous = getLatestBodyTestRecord(store)
-    const metrics = { ...finalMetrics }
-    const heightCm = Number(store.profile?.height) || 165
-    const heightM = heightCm / 100
-    metrics.bmi = Math.round((metrics.weight / (heightM * heightM)) * 10) / 10
-
-    const score = computeScore(metrics)
-    const { grade, gradeLabel } = computeGrade(score)
-    const status = score >= 80 ? '比较健康' : score >= 70 ? '需关注' : '建议改善'
-
-    const radar = {
-        weight: Math.min(95, Math.round(score * 0.9 + Math.random() * 5)),
-        bodyFat: Math.min(95, Math.round(100 - metrics.bodyFat * 2.5)),
-        muscle: Math.min(95, Math.round(metrics.muscleMass * 3.2)),
-        bone: Math.min(95, Math.round(metrics.boneMass * 32)),
-        water: Math.min(95, Math.round(metrics.bodyWater * 1.4)),
-        bmr: Math.min(95, Math.round(metrics.bmr / 16))
-    }
-
-    const record = {
-        id: nextRecordId(store.bodyTest.records),
-        date: formatIsoDate(now),
-        time: formatTime(now),
-        score,
-        grade,
-        gradeLabel,
-        status,
-        metrics,
-        radar,
-        bodySegments: [],
-        advice: [],
-        recommendedCourseIds: []
-    }
-
-    if (previous) {
-        record.changes = computeChanges(record, previous)
-    }
-
-    store.bodyTest.records.unshift(record)
-    store.bodyReport = buildBodyReportSummary(record, previous)
-    return record
-}
-
-/** 测量过程实时数据插值 */
-export function interpolateMeasuringMetrics(progress, profile) {
-    const baseWeight = Number(profile?.weight) || 64
-    const target = {
-        weight: baseWeight - 0.3 + Math.random() * 0.2,
-        bodyFat: 24.5 + Math.random() * 0.8,
-        muscleMass: 22.4 + Math.random() * 0.3,
-        visceralFat: 6,
-        bmr: 1380 + Math.floor(Math.random() * 20),
-        bodyWater: 52.5 + Math.random(),
-        boneMass: 2.4,
-        protein: 16.2
-    }
-    const ratio = Math.min(1, progress / 100)
-    return {
-        weight: Math.round((baseWeight + (target.weight - baseWeight) * ratio) * 10) / 10,
-        bodyFat: Math.round((26 + (target.bodyFat - 26) * ratio) * 10) / 10,
-        muscleMass: Math.round((21.5 + (target.muscleMass - 21.5) * ratio) * 10) / 10,
-        bmr: Math.round(1340 + (target.bmr - 1340) * ratio),
-        bodyWater: Math.round((51 + (target.bodyWater - 51) * ratio) * 10) / 10
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
future	ffcea3104e	Merge branch 'feature/member-register' of https://git.f.novalon.cn/novalon/gym-manage into feature/member-register	2026-06-23 22:48:21 +08:00
future	3586a7d74b	登录	2026-06-23 22:47:35 +08:00
liwentao	8da58a8f51	新增功能：团课签到前验证是否到店签到	2026-06-18 10:48:23 +08:00
liwentao	0b2146f237	新增团课扫码签到功能，文档已更新	2026-06-18 10:11:47 +08:00
liwentao	7cc9a68144	新增团课推荐功能	2026-06-15 16:43:12 +08:00
liwentao	b5c8a087dd	新增团课多条件查询	2026-06-15 14:09:19 +08:00
future	af707e1bb4	添加签到表迁移文件	2026-06-09 17:27:44 +08:00
				`@@ -0,0 +1 @@`
				`cn.novalon.gym.manage.payment.config.HuifuPayConfig`