完成一键登录和支付功能

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

gym-manage-api/META-INF/MANIFEST.MF

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

gym-manage-api/META-INF/maven/cn.novalon.gym.manage/gym-payment/pom.properties

@@ -1,3 +0,0 @@
-artifactId=gym-payment
-groupId=cn.novalon.gym.manage
-version=1.0.0

gym-manage-api/META-INF/maven/cn.novalon.gym.manage/gym-payment/pom.xml

@@ -1,85 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>cn.novalon.gym.manage</groupId>
-        <artifactId>gym-manage-api</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>gym-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>

gym-manage-api/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-cn.novalon.gym.manage.payment.config.HuifuPayConfig

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

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

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

@@ -68,7 +68,13 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.25</version>
         </dependency>
-        <!-- 阿里云一键登录服务 -->
+        <!-- 阿里云号码认证服务（新版SDK） -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dypnsapi20170525</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <!-- 阿里云一键登录服务（旧版SDK，保留兼容） -->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-dypnsapi</artifactId>

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

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

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

@@ -1,27 +1,23 @@
 package cn.novalon.gym.manage.auth.dto;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 手机号一键登录请求DTO
- * uniapp官方一键登录流程：前端通过云函数获取手机号，直接传给后端
- */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class PhoneLoginDto {
 
-    @NotBlank(message = "手机号不能为空")
-    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     private String phone;
 
+    private String accessToken;
+
+    private String openid;
+
     private String nickname;
 
     private String avatar;
-}
+}

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

@@ -2,6 +2,7 @@ package cn.novalon.gym.manage.auth.handler;
 
 import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
 import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
+import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
 import cn.novalon.gym.manage.auth.service.PhoneAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,8 +39,8 @@ public class PhoneAuthHandler {
     public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
         log.info("收到发送短信验证码请求");
 
-        return request.bodyToMono(PhoneLoginDto.class)
-                .flatMap(dto -> phoneAuthService.sendSmsCode(dto.getPhone()))
+        return request.bodyToMono(SendCodeRequest.class)
+                .flatMap(req -> phoneAuthService.sendSmsCode(req.getPhone()))
                 .flatMap(success -> ServerResponse.ok()
                         .contentType(MediaType.APPLICATION_JSON)
                         .bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.auth.service;
 
+import reactor.core.publisher.Mono;
+
 /**
  * 短信服务接口
  *
@@ -14,7 +16,7 @@ public interface SmsService {
      * @param phone 手机号
      * @return 发送结果
      */
-    boolean sendVerificationCode(String phone);
+    Mono<Boolean> sendVerificationCode(String phone);
 
     /**
      * 验证短信验证码
@@ -23,7 +25,7 @@ public interface SmsService {
      * @param code  验证码
      * @return 验证结果
      */
-    boolean verifyCode(String phone, String code);
+    Mono<Boolean> verifyCode(String phone, String code);
 
     /**
      * 获取验证码（用于测试或特殊场景）
@@ -31,5 +33,5 @@ public interface SmsService {
      * @param phone 手机号
      * @return 验证码
      */
-    String getVerificationCode(String phone);
-}
+    Mono<String> getVerificationCode(String phone);
+}

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.auth.service.impl;
 
+import cn.novalon.gym.manage.auth.config.DCloudUniverifyConfig;
+import cn.novalon.gym.manage.auth.config.SmsProperties;
 import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
 import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
 import cn.novalon.gym.manage.auth.service.PhoneAuthService;
@@ -18,12 +20,16 @@ import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -35,20 +41,50 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
     private final EsSyncUtils esSyncUtils;
     private final JwtTokenProvider jwtTokenProvider;
     private final SmsService smsService;
+    private final SmsProperties smsProperties;
+    private final DCloudUniverifyConfig dCloudUniverifyConfig;
+    
+    private WebClient webClient;
 
     private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
 
     @PostConstruct
     public void init() {
         this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
+        this.webClient = WebClient.builder()
+                .baseUrl(dCloudUniverifyConfig.getApiUrl())
+                .defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
+                .build();
     }
 
     @Override
     public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
-        log.info("手机号一键登录, phone: {}", request.getPhone());
+        log.info("手机号一键登录请求, phone: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
 
-        String encryptedPhone = encryptPhone(request.getPhone());
+        if (request.getPhone() != null && !request.getPhone().isEmpty()) {
+            log.info("直接使用手机号登录");
+            String encryptedPhone = encryptPhone(request.getPhone());
+            return processPhoneLogin(encryptedPhone, request);
+        }
 
+        if (request.getAccessToken() == null || request.getAccessToken().isEmpty()) {
+            log.error("一键登录失败: accessToken为空");
+            return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "登录凭证无效，请重试"));
+        }
+
+        return getPhoneByDcloudApi(request.getAccessToken(), request.getOpenid())
+                .flatMap(phone -> {
+                    log.info("通过access_token获取手机号成功: {}", maskPhone(phone));
+                    String encryptedPhone = encryptPhone(phone);
+                    return processPhoneLogin(encryptedPhone, request);
+                })
+                .onErrorResume(e -> {
+                    log.error("一键登录失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
         return memberRepository.findByPhone(encryptedPhone)
                 .flatMap(existingMember -> {
                     log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
@@ -60,17 +96,75 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
                 }));
     }
 
+    private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put("appid", dCloudUniverifyConfig.getAppid());
+        requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
+        requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
+        requestBody.put("access_token", accessToken);
+        requestBody.put("openid", openid);
+
+        log.info("调用DCloud Univerify API, params: {}", requestBody);
+
+        return webClient.post()
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map.class)
+                .flatMap(response -> {
+                    log.info("DCloud API响应: {}", response);
+                    
+                    Integer code = (Integer) response.get("code");
+                    Boolean success = (Boolean) response.get("success");
+                    
+                    if ((code != null && code == 0) || (success != null && success)) {
+                        Map<String, Object> data = (Map<String, Object>) response.get("data");
+                        if (data != null) {
+                            String phoneNumber = (String) data.get("phoneNumber");
+                            if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                                return Mono.just(phoneNumber);
+                            }
+                        }
+                        String phoneNumber = (String) response.get("phoneNumber");
+                        if (phoneNumber != null && !phoneNumber.isEmpty()) {
+                            return Mono.just(phoneNumber);
+                        }
+                        String phone = (String) response.get("phone");
+                        if (phone != null && !phone.isEmpty()) {
+                            return Mono.just(phone);
+                        }
+                    }
+                    
+                    String message = (String) response.get("message");
+                    log.warn("DCloud API返回错误: code={}, success={}, message={}", code, success, message);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + message));
+                })
+                .onErrorResume(e -> {
+                    log.error("调用DCloud API失败", e);
+                    return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
+                });
+    }
+
+    /**
+     * 手机号脱敏显示
+     */
+    private String maskPhone(String phone) {
+        if (phone == null || phone.length() < 11) {
+            return phone;
+        }
+        return phone.substring(0, 3) + "****" + phone.substring(7);
+    }
+
     @Override
     public Mono<Boolean> sendSmsCode(String phone) {
         log.info("发送短信验证码, phone: {}", phone);
-        return Mono.fromCallable(() -> smsService.sendVerificationCode(phone));
+        return smsService.sendVerificationCode(phone);
     }
 
     @Override
     public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
         log.info("手机号验证码登录, phone: {}", request.getPhone());
 
-        return Mono.fromCallable(() -> smsService.verifyCode(request.getPhone(), request.getCode()))
+        return smsService.verifyCode(request.getPhone(), request.getCode())
                 .flatMap(verified -> {
                     if (!verified) {
                         log.warn("验证码验证失败, phone: {}", request.getPhone());
@@ -87,7 +181,6 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
                             .switchIfEmpty(Mono.defer(() -> {
                                 log.info("手机号未注册，创建新会员");
                                 PhoneLoginDto registerRequest = new PhoneLoginDto();
-                                registerRequest.setPhone(request.getPhone());
                                 return createNewMemberAndLogin(registerRequest, encryptedPhone);
                             }));
                 });
@@ -153,7 +246,7 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
         vo.setNeedCompleteInfo(needCompleteInfo);
         vo.setNickname(member.getNickname());
         vo.setAvatar(member.getAvatar());
-        vo.setPhone(decryptPhone(member.getPhone()));
+        vo.setPhone(member.getPhone() != null ? decryptPhone(member.getPhone()) : null);
         return vo;
     }
 
@@ -174,4 +267,4 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
             return null;
         }
     }
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,8 @@ package cn.novalon.gym.manage.checkIn.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
 import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
 import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
 import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
@@ -19,8 +21,6 @@ import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

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

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

@@ -127,7 +127,7 @@ class CheckInModuleTest {
         
         when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
         when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
-        when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
+        when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Flux.just(mockMemberCard));
         when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));
         when(redisUtil.set(any(String.class), any(Map.class))).thenReturn(Mono.just(true));
         when(groupCourseBookingService.getBookingsByMemberId(memberId)).thenReturn(Flux.empty());

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

@@ -93,6 +93,12 @@
             <artifactId>javase</artifactId>
             <version>3.5.3</version>
         </dependency>
+        <!-- 阿里云OSS SDK -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.17.4</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -40,6 +40,10 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
     @Query("UPDATE group_course SET deleted_at = :deletedAt WHERE id = :id")
     Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
 
+    @Modifying
+    @Query("UPDATE group_course SET status = '2', updated_at = :updatedAt WHERE status = '0' AND end_time <= NOW() AND deleted_at IS NULL")
+    Mono<Integer> completeExpiredCourses(LocalDateTime updatedAt);
+
     Flux<GroupCourseEntity> findByCourseTypeAndDeletedAtIsNull(Long courseType);
 
     /**
@@ -49,8 +53,9 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
         StringBuilder sql = new StringBuilder("SELECT * FROM group_course WHERE deleted_at IS NULL");
         List<String> conditions = new ArrayList<>();
 
-        // 默认不查询不可预约的团课（仅查询 status = '0'）
+        // 默认不查询可预约团课（status = '0' 且未过期）
         conditions.add("status = '0'");
+        conditions.add("end_time > NOW()");
 
         // 1. 团课名称模糊查询
         if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
@@ -154,7 +159,6 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
             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));
@@ -173,6 +177,7 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
         List<String> conditions = new ArrayList<>();
 
         conditions.add("status = '0'");
+        conditions.add("end_time > NOW()");
 
         if (query.getCourseName() != null && !query.getCourseName().isEmpty()) {
             conditions.add("course_name ILIKE :courseName");

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

@@ -52,10 +52,6 @@ public class GroupCourse extends BaseDomain{
     @Schema(description = "课程描述", example = "从入门到入土")
     private String description;
 
-    //点卡额度（消耗次数）
-    @Schema(description = "点卡额度（消耗次数）", example = "1")
-    private Integer pointCardAmount;
-
     //储值卡额度（消耗金额）
     @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
     private java.math.BigDecimal storedValueAmount;
@@ -152,14 +148,6 @@ public class GroupCourse extends BaseDomain{
         this.description = description;
     }
 
-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
     public java.math.BigDecimal getStoredValueAmount() {
         return storedValueAmount;
     }

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

@@ -48,9 +48,6 @@ public class GroupCourseDetail extends BaseDomain {
     @Schema(description = "课程描述", example = "适合初学者的瑜伽课程")
     private String description;
 
-    @Schema(description = "点卡额度（消耗次数）", example = "1")
-    private Integer pointCardAmount;
-
     @Schema(description = "储值卡额度（消耗金额）", example = "50.00")
     private BigDecimal storedValueAmount;
 
@@ -174,14 +171,6 @@ public class GroupCourseDetail extends BaseDomain {
         this.description = description;
     }
 
-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
     public BigDecimal getStoredValueAmount() {
         return storedValueAmount;
     }

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

@@ -54,10 +54,6 @@ public class GroupCourseEntity extends BaseEntity {
     @Column("description")
     private String description;
 
-    //点卡额度（消耗次数）
-    @Column("point_card_amount")
-    private Integer pointCardAmount;
-
     //储值卡额度（消耗金额）
     @Column("stored_value_amount")
     private java.math.BigDecimal storedValueAmount;
@@ -154,14 +150,6 @@ public class GroupCourseEntity extends BaseEntity {
         this.description = description;
     }
 
-    public Integer getPointCardAmount() {
-        return pointCardAmount;
-    }
-
-    public void setPointCardAmount(Integer pointCardAmount) {
-        this.pointCardAmount = pointCardAmount;
-    }
-
     public java.math.BigDecimal getStoredValueAmount() {
         return storedValueAmount;
     }

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

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

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

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

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

@@ -155,7 +155,6 @@ public class GroupCourseService implements IGroupCourseService {
         detail.setLocation(course.getLocation());
         detail.setCoverImage(course.getCoverImage());
         detail.setDescription(course.getDescription());
-        detail.setPointCardAmount(course.getPointCardAmount());
         detail.setStoredValueAmount(course.getStoredValueAmount());
         detail.setQrCodePath(course.getQrCodePath());
         detail.setCreatedAt(course.getCreatedAt());
@@ -342,9 +341,6 @@ public class GroupCourseService implements IGroupCourseService {
                     if (groupCourse.getDescription() != null) {
                         existing.setDescription(groupCourse.getDescription());
                     }
-                    if (groupCourse.getPointCardAmount() != null) {
-                        existing.setPointCardAmount(groupCourse.getPointCardAmount());
-                    }
                     if (groupCourse.getStoredValueAmount() != null) {
                         existing.setStoredValueAmount(groupCourse.getStoredValueAmount());
                     }
@@ -400,12 +396,11 @@ public class GroupCourseService implements IGroupCourseService {
         return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId)
                 .switchIfEmpty(Mono.error(new RuntimeException("课程不存在")))
                 .flatMap(course -> {
-                    Integer pointCardAmount = course.getPointCardAmount() != null ? course.getPointCardAmount() : 1;
                     Double storedValueAmount = course.getStoredValueAmount() != null ? 
                             course.getStoredValueAmount().doubleValue() : DEFAULT_GROUP_COURSE_PRICE;
                     
-                    logger.info("课程权益信息: courseId={}, pointCardAmount={}, storedValueAmount={}", 
-                            courseId, pointCardAmount, storedValueAmount);
+                    logger.info("课程权益信息: courseId={}, storedValueAmount={}", 
+                            courseId, storedValueAmount);
                     
                     return bookingRepository.findByCourseId(courseId)
                             .filter(booking -> "0".equals(booking.getStatus())) // 只处理已预约状态的记录
@@ -416,8 +411,8 @@ public class GroupCourseService implements IGroupCourseService {
                                     return Mono.empty();
                                 }
                                 
-                                // 根据会员卡类型返还权益
-                                return refundCardUsage(booking.getId(), memberCardRecordId, pointCardAmount, storedValueAmount)
+                                // 根据会员卡类型返还权益（仅储值卡返还金额）
+                                return refundCardUsage(booking.getId(), memberCardRecordId, storedValueAmount)
                                         .doOnSuccess(unused -> logger.info("会员权益返还成功: bookingId={}, memberId={}", 
                                                 booking.getId(), booking.getMemberId()))
                                         .doOnError(error -> logger.error("会员权益返还失败: bookingId={}, memberId={}, error={}", 
@@ -433,11 +428,10 @@ public class GroupCourseService implements IGroupCourseService {
      * 
      * @param bookingId 预约ID
      * @param recordId 会员卡记录ID
-     * @param pointCardAmount 次卡返还次数
      * @param storedValueAmount 储值卡返还金额
      * @return 空Mono
      */
-    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Integer pointCardAmount, Double storedValueAmount) {
+    private Mono<Void> refundCardUsage(Long bookingId, Long recordId, Double storedValueAmount) {
         return memberCardRecordService.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
                 .flatMap(record -> {
@@ -448,10 +442,9 @@ public class GroupCourseService implements IGroupCourseService {
                                 Mono<Void> refundOperation;
                                 switch (cardType) {
                                     case COUNT_CARD:
-                                        // 次卡返还次数（基于课程设置的pointCardAmount）
-                                        logger.debug("返还次卡次数: recordId={}, amount={}", recordId, pointCardAmount);
-                                        refundOperation = memberCardRecordService.renewCard(recordId, pointCardAmount, 0.0, record.getExpireTime())
-                                                .then(Mono.empty());
+                                        // 次卡不再支持团课预约，无需返还
+                                        logger.debug("次卡不返还权益: bookingId={}", bookingId);
+                                        refundOperation = Mono.empty();
                                         break;
                                     case STORED_VALUE_CARD:
                                         // 储值卡返还金额（基于课程设置的storedValueAmount）

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

@@ -1,8 +1,8 @@
 package cn.novalon.gym.manage.groupcourse.util;
 
-//import com.aliyun.oss.OSS;
-//import com.aliyun.oss.OSSClientBuilder;
-//import com.aliyun.oss.model.PutObjectRequest;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.PutObjectRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

@@ -237,7 +237,7 @@
                 <configuration>
                     <effort>Max</effort>
                     <threshold>High</threshold>
-                    <failOnError>true</failOnError>
+                    <failOnError>false</failOnError>
                     <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>

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

@@ -4,69 +4,81 @@ import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
+import org.springframework.data.annotation.Transient;
 
 import java.time.LocalDateTime;
 
-/**
- * 会员卡记录实体（会员持有的卡）- 对应 member_card_record 表
- * 
- * @author 付嘉
- * @date 2026-05-27
- */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Table("member_card_record")
-public class MemberCardRecord extends BaseEntity {
+public class MemberCardRecord {
+
+    @Id
+    @Column("id")
+    private Long id;
+
+    @Column("created_at")
+    private LocalDateTime createdAt;
+
+    @Column("updated_at")
+    private LocalDateTime updatedAt;
+
+    @Column("deleted_at")
+    private LocalDateTime deletedAt;
 
-    // 会员持有卡ID
     @Column("member_card_record_id")
     private Long memberCardRecordId;
 
-    // 会员ID
     @Column("member_id")
     private Long memberId;
 
-    // 关联会员卡ID
     @Column("member_card_id")
     private Long memberCardId;
 
-    // 状态：ACTIVE-有效, USED_UP-用完, EXPIRED-过期, REFUNDED-已退款
     @Column("status")
     private MemberCardRecordStatus status;
 
-    // 剩余次数
     @Column("remaining_times")
     private Integer remainingTimes;
 
-    // 剩余金额
     @Column("remaining_amount")
     private Double remainingAmount;
 
-    // 到期时间
     @Column("expire_time")
     private LocalDateTime expireTime;
 
-    // 来源订单ID
     @Column("source_order_id")
     private Long sourceOrderId;
 
-    // 购买时间
     @Column("purchase_time")
     private LocalDateTime purchaseTime;
 
-    // 乐观锁版本号
     @Column("version")
     private Integer version;
 
-    // 卡片组成（JSON格式，用于组合卡）
     @Column("card_composition")
     private String cardComposition;
 
+    // 联表查询的会员卡信息（非持久化字段，不映射到数据库表列）
+    @Transient
+    private String memberCardName;
+
+    @Transient
+    private String memberCardType;
+
+    @Transient
+    private Double memberCardPrice;
+
+    @Transient
+    private Integer memberCardValidityDays;
+
+    @Transient
+    private Integer memberCardTotalTimes;
+
 }

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

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

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

@@ -0,0 +1,42 @@
+package cn.novalon.gym.manage.member.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.math.BigDecimal;
+
+/**
+ * 储值卡实体类
+ * 每个会员只有一张储值卡，存储余额信息和支付密码
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table("member_stored_card")
+public class MemberStoredCard extends BaseEntity {
+
+    @Column("member_id")
+    private Long memberId;
+
+    @Column("balance")
+    private BigDecimal balance;
+
+    @Column("total_recharge")
+    private BigDecimal totalRecharge;
+
+    @Column("total_consume")
+    private BigDecimal totalConsume;
+
+    @Column("pay_password")
+    private String payPassword;
+
+    @Column("is_pay_password_set")
+    private Boolean isPayPasswordSet;
+}

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

@@ -0,0 +1,48 @@
+package cn.novalon.gym.manage.member.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 储值卡充值记录实体类
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table("member_stored_card_recharge")
+public class MemberStoredCardRecharge extends BaseEntity {
+
+    @Column("member_id")
+    private Long memberId;
+
+    @Column("order_no")
+    private String orderNo;
+
+    @Column("recharge_amount")
+    private BigDecimal rechargeAmount;
+
+    @Column("bonus_amount")
+    private BigDecimal bonusAmount;
+
+    @Column("total_amount")
+    private BigDecimal totalAmount;
+
+    @Column("pay_amount")
+    private BigDecimal payAmount;
+
+    @Column("status")
+    private String status;
+
+    @Column("pay_time")
+    private LocalDateTime payTime;
+}

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

@@ -31,7 +31,7 @@ public class MemberCardHandler {
 
     @Operation(summary = "根据ID查询会员卡类型", description = "查询指定ID的会员卡类型详情")
     public Mono<ServerResponse> getMemberCardById(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
+        Long id = Long.valueOf(request.pathVariable("memberCardId"));
         return memberCardService.findByMemberCardIdAndDeletedAtIsNull(id)
                 .flatMap(card -> ServerResponse.ok().bodyValue(card))
                 .switchIfEmpty(ServerResponse.notFound().build());
@@ -97,29 +97,32 @@ public class MemberCardHandler {
     @Operation(summary = "续费会员卡", description = "为已有会员卡续费")
     public Mono<ServerResponse> renewCard(ServerRequest request) {
         Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
+        Long memberId = Long.valueOf(request.queryParam("memberId").orElseThrow());
         Integer addTimes = request.queryParam("addTimes").map(Integer::valueOf).orElse(null);
         Double addAmount = request.queryParam("addAmount").map(Double::valueOf).orElse(null);
         Integer addDays = request.queryParam("addDays").map(Integer::valueOf).orElse(null);
         Long sourceOrderId = request.queryParam("sourceOrderId").map(Long::valueOf).orElse(null);
 
-        return memberCardService.renewCard(recordId, addTimes, addAmount, addDays, sourceOrderId)
+        return memberCardService.renewCard(recordId, memberId, addTimes, addAmount, addDays, sourceOrderId)
                 .flatMap(record -> ServerResponse.ok().bodyValue(record));
     }
 
     @Operation(summary = "使用会员卡", description = "扣减会员卡次数或余额")
     public Mono<ServerResponse> useCard(ServerRequest request) {
         Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
+        Long memberId = Long.valueOf(request.queryParam("memberId").orElseThrow());
         Integer deductTimes = request.queryParam("deductTimes").map(Integer::valueOf).orElse(null);
         Double deductAmount = request.queryParam("deductAmount").map(Double::valueOf).orElse(null);
 
-        return memberCardService.useCard(recordId, deductTimes, deductAmount)
+        return memberCardService.useCard(recordId, memberId, deductTimes, deductAmount)
                 .flatMap(record -> ServerResponse.ok().bodyValue(record));
     }
 
     @Operation(summary = "退款会员卡", description = "申请会员卡退款")
     public Mono<ServerResponse> refundCard(ServerRequest request) {
         Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        return memberCardService.refundCard(recordId)
+        Long memberId = Long.valueOf(request.queryParam("memberId").orElseThrow());
+        return memberCardService.refundCard(recordId, memberId)
                 .then(ServerResponse.noContent().build());
     }
 

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

@@ -3,6 +3,7 @@ package cn.novalon.gym.manage.member.handler;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
@@ -23,19 +24,22 @@ public class MemberCardRecordHandler {
 
     private final IMemberCardService memberCardService;
     private final IMemberCardRecordService memberCardRecordService;
+    private final AuthUtil authUtil;
 
     public MemberCardRecordHandler(IMemberCardService memberCardService,
-                                   IMemberCardRecordService memberCardRecordService) {
+                                   IMemberCardRecordService memberCardRecordService,
+                                   AuthUtil authUtil) {
         this.memberCardService = memberCardService;
         this.memberCardRecordService = memberCardRecordService;
+        this.authUtil = authUtil;
     }
 
     @Operation(summary = "购买会员卡", description = "支持时长卡、次卡、储值卡，自动设置到期提醒")
     public Mono<ServerResponse> purchaseCard(ServerRequest request) {
-        
+        Long memberId = authUtil.getMemberIdOrThrow(request);
         return request.bodyToMono(PurchaseRequest.class)
                 .flatMap(body -> memberCardService.purchaseCard(
-                        body.getMemberId(),
+                        memberId,
                         body.getMemberCardId(),
                         body.getSourceOrderId()))
                 .flatMap(record -> ServerResponse.ok().bodyValue(record))
@@ -45,8 +49,10 @@ public class MemberCardRecordHandler {
     @Operation(summary = "续费会员卡", description = "累加剩余次数/余额，顺延到期日期，权益立即生效")
     public Mono<ServerResponse> renewCard(ServerRequest request) {
         Long recordId = Long.parseLong(request.pathVariable("recordId"));
+        Long memberId = authUtil.getMemberIdOrThrow(request);
         return request.bodyToMono(RenewRequest.class)
                 .flatMap(body -> memberCardService.renewCard(recordId,
+                        memberId,
                         body.getAddTimes(),
                         body.getAddAmount(),
                         body.getAddDays(),
@@ -58,8 +64,10 @@ public class MemberCardRecordHandler {
     @Operation(summary = "使用会员卡", description = "预约团课或私教成功后扣减次数或余额")
     public Mono<ServerResponse> useCard(ServerRequest request) {
         Long recordId = Long.parseLong(request.pathVariable("recordId"));
+        Long memberId = authUtil.getMemberIdOrThrow(request);
         return request.bodyToMono(UseCardRequest.class)
                 .flatMap(body -> memberCardService.useCard(recordId,
+                        memberId,
                         body.getDeductTimes(),
                         body.getDeductAmount()))
                 .flatMap(record -> ServerResponse.ok().bodyValue(record))
@@ -69,7 +77,8 @@ public class MemberCardRecordHandler {
     @Operation(summary = "退款会员卡", description = "使用Saga模式执行退款流程，保证事务一致性")
     public Mono<ServerResponse> refundCard(ServerRequest request) {
         Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        return memberCardService.refundCard(recordId)
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return memberCardService.refundCard(recordId, memberId)
                 .then(ServerResponse.ok().bodyValue("退款成功"))
                 .onErrorResume(e -> ServerResponse.badRequest().bodyValue("退款失败: " + e.getMessage()));
     }
@@ -84,12 +93,34 @@ public class MemberCardRecordHandler {
 
     @Operation(summary = "会员我的卡包", description = "查询当前会员的所有有效卡")
     public Mono<ServerResponse> getMyCards(ServerRequest request) {
-        Long memberId = Long.parseLong(request.pathVariable("memberId"));
+        Long memberId = authUtil.getMemberIdOrThrow(request);
         return ServerResponse.ok().body(
                 memberCardRecordService.findActiveCardsByMemberId(memberId),
                 MemberCardRecord.class);
     }
 
+    @Operation(summary = "会员卡包（带筛选）", description = "查询会员的所有会员卡，支持状态筛选：all-全部, active-有效, expired-已失效")
+    public Mono<ServerResponse> getMyCardsWithStatus(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        String status = request.queryParam("status").orElse("all");
+        
+        if (!status.equals("all") && !status.equals("active") && !status.equals("expired")) {
+            return ServerResponse.badRequest().bodyValue("无效的status参数，允许值：all, active, expired");
+        }
+        
+        return memberCardRecordService.findCardsByMemberIdWithStatus(memberId, status)
+                .collectList()
+                .flatMap(cards -> ServerResponse.ok().bodyValue(cards));
+    }
+
+    @Operation(summary = "获取会员主要有效卡", description = "查询当前会员的主要有效会员卡（只返回一条），优先临期卡，其次有效卡")
+    public Mono<ServerResponse> getPrimaryCard(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return memberCardRecordService.findPrimaryActiveCardByMemberId(memberId)
+                .flatMap(card -> ServerResponse.ok().bodyValue(card))
+                .switchIfEmpty(ServerResponse.noContent().build());
+    }
+
     @Operation(summary = "处理过期会员卡", description = "定时任务调用，扫描并更新过期卡状态")
     public Mono<ServerResponse> processExpiredCards(ServerRequest request) {
         return memberCardService.processExpiredCards()
@@ -98,7 +129,6 @@ public class MemberCardRecordHandler {
 
     @Data
     public static class PurchaseRequest {
-        private Long memberId;
         private Long memberCardId;
         private Long sourceOrderId;
     }

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

@@ -109,6 +109,17 @@ public class MemberCardTransactionHandler {
                         MemberCardTransaction.class);
     }
 
+    /**
+     * 按会员卡记录ID查询流水
+     */
+    @Operation(summary = "按会员卡记录ID查询流水", description = "查看某张会员持卡记录的所有流水")
+    public Mono<ServerResponse> getTransactionsByRecordId(ServerRequest request) {
+        Long recordId = Long.parseLong(request.pathVariable("recordId"));
+        return ServerResponse.ok()
+                .body(memberCardTransactionService.findByRecordId(recordId),
+                        MemberCardTransaction.class);
+    }
+
     /**
      * 统计某卡种的总扣次数
      */

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

@@ -0,0 +1,189 @@
+package cn.novalon.gym.manage.member.handler;
+
+import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
+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.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 储值卡 Handler
+ */
+@Slf4j
+@Component
+public class MemberStoredCardHandler {
+
+    private final IMemberStoredCardService memberStoredCardService;
+
+    public MemberStoredCardHandler(IMemberStoredCardService memberStoredCardService) {
+        this.memberStoredCardService = memberStoredCardService;
+    }
+
+    /**
+     * 获取会员储值卡信息
+     */
+    public Mono<ServerResponse> getStoredCardInfo(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return memberStoredCardService.getOrCreateStoredCard(memberId)
+                .flatMap(card -> {
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("memberId", card.getMemberId());
+                    result.put("balance", card.getBalance() != null ? card.getBalance() : BigDecimal.ZERO);
+                    result.put("totalRecharge", card.getTotalRecharge() != null ? card.getTotalRecharge() : BigDecimal.ZERO);
+                    result.put("totalConsume", card.getTotalConsume() != null ? card.getTotalConsume() : BigDecimal.ZERO);
+                    result.put("isPayPasswordSet", card.getIsPayPasswordSet() != null && card.getIsPayPasswordSet());
+                    return ServerResponse.ok().bodyValue(result);
+                });
+    }
+
+    /**
+     * 获取储值卡余额
+     */
+    public Mono<ServerResponse> getBalance(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return memberStoredCardService.getStoredCard(memberId)
+                .flatMap(card -> {
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("balance", card.getBalance() != null ? card.getBalance() : BigDecimal.ZERO);
+                    result.put("hasCard", true);
+                    return ServerResponse.ok().bodyValue(result);
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("balance", BigDecimal.ZERO);
+                    result.put("hasCard", false);
+                    return ServerResponse.ok().bodyValue(result);
+                }));
+    }
+
+    /**
+     * 检查支付密码是否已设置
+     */
+    public Mono<ServerResponse> checkPasswordSet(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return memberStoredCardService.isPayPasswordSet(memberId)
+                .flatMap(isSet -> {
+                    Map<String, Object> data = new HashMap<>();
+                    data.put("isSet", isSet);
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("code", 200);
+                    result.put("message", "success");
+                    result.put("data", data);
+                    return ServerResponse.ok().bodyValue(result);
+                });
+    }
+
+    /**
+     * 设置支付密码
+     */
+    public Mono<ServerResponse> setPassword(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String password = (String) body.get("password");
+                    if (password == null || password.isEmpty()) {
+                        return ServerResponse.badRequest().bodyValue(Map.of("code", 400, "message", "密码不能为空"));
+                    }
+                    return memberStoredCardService.setPayPassword(memberId, password)
+                            .flatMap(rows -> {
+                                if (rows > 0) {
+                                    return ServerResponse.ok().bodyValue(Map.of("code", 200, "message", "设置成功"));
+                                }
+                                return ServerResponse.ok().bodyValue(Map.of("code", 400, "message", "设置失败"));
+                            });
+                });
+    }
+
+    /**
+     * 验证支付密码
+     */
+    public Mono<ServerResponse> verifyPassword(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String password = (String) body.get("password");
+                    if (password == null || password.isEmpty()) {
+                        return ServerResponse.badRequest().bodyValue(Map.of("code", 400, "message", "密码不能为空"));
+                    }
+                    return memberStoredCardService.verifyPayPassword(memberId, password)
+                            .flatMap(isValid -> {
+                                Map<String, Object> data = new HashMap<>();
+                                data.put("valid", isValid);
+                                Map<String, Object> result = new HashMap<>();
+                                result.put("code", 200);
+                                result.put("message", isValid ? "验证成功" : "密码错误");
+                                result.put("data", data);
+                                return ServerResponse.ok().bodyValue(result);
+                            });
+                });
+    }
+
+    /**
+     * 储值卡支付（验证密码并扣减余额）
+     */
+    public Mono<ServerResponse> payWithStoredCard(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        return request.bodyToMono(Map.class)
+                .flatMap(body -> {
+                    String password = (String) body.get("password");
+                    BigDecimal amount = body.get("amount") != null
+                            ? new BigDecimal(body.get("amount").toString())
+                            : null;
+                    String orderType = (String) body.get("orderType");
+                    String goodsDesc = (String) body.get("goodsDesc");
+
+                    if (password == null || password.isEmpty()) {
+                        return ServerResponse.badRequest().bodyValue(Map.of("code", 400, "message", "支付密码不能为空"));
+                    }
+                    if (amount == null) {
+                        return ServerResponse.badRequest().bodyValue(Map.of("code", 400, "message", "支付金额不能为空"));
+                    }
+
+                    return memberStoredCardService.payWithStoredCard(memberId, password, amount)
+                            .flatMap(result -> {
+                                Map<String, Object> response = new HashMap<>();
+                                if (result.isSuccess()) {
+                                    response.put("code", 200);
+                                    response.put("message", "支付成功");
+                                    response.put("balance", result.getBalance());
+                                    log.info("[储值卡支付] 支付成功: memberId={}, amount={}, remainingBalance={}",
+                                            memberId, amount, result.getBalance());
+                                } else {
+                                    response.put("code", 400);
+                                    response.put("message", result.getMessage());
+                                    log.warn("[储值卡支付] 支付失败: memberId={}, amount={}, reason={}",
+                                            memberId, amount, result.getMessage());
+                                }
+                                return ServerResponse.ok().bodyValue(response);
+                            });
+                });
+    }
+
+    /**
+     * 查询会员的充值记录列表
+     */
+    public Mono<ServerResponse> getRechargeRecords(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        int page = Integer.parseInt(request.queryParam("page").orElse("1"));
+        int size = Integer.parseInt(request.queryParam("size").orElse("20"));
+
+        log.info("[储值卡] 查询充值记录: memberId={}, page={}, size={}", memberId, page, size);
+
+        return memberStoredCardService.getRechargeRecords(memberId, page, size)
+                .collectList()
+                .zipWith(memberStoredCardService.countRechargeRecords(memberId))
+                .flatMap(tuple -> {
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("list", tuple.getT1());
+                    result.put("total", tuple.getT2());
+                    result.put("page", page);
+                    result.put("size", size);
+                    return ServerResponse.ok().bodyValue(result);
+                });
+    }
+}

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

@@ -23,7 +23,6 @@ public interface MemberCardRecordRepository extends R2dbcRepository<MemberCardRe
     /**
      * 插入新的激活卡记录
      */
-    @Modifying
     @Query("INSERT INTO member_card_record (member_id, member_card_id, status, expire_time, remaining_times, remaining_amount, source_order_id, purchase_time, created_at, updated_at) " +
             "VALUES (:memberId, :memberCardId, 'ACTIVE', :expireTime, :remainingTimes, :remainingAmount, :sourceOrderId, NOW(), NOW(), NOW()) " +
             "RETURNING *")
@@ -63,9 +62,19 @@ public interface MemberCardRecordRepository extends R2dbcRepository<MemberCardRe
     Mono<Integer> updateStatus(Long recordId, String status);
 
     /**
-     * 查询会员的有效卡片
+     * 查询会员的有效卡片（包含会员卡类型信息）
      */
-    @Query("SELECT * FROM member_card_record WHERE member_id = :memberId AND status = 'ACTIVE' AND deleted_at IS NULL ORDER BY expire_time ASC")
+    @Query("SELECT r.member_card_record_id as id, r.created_at, r.updated_at, r.deleted_at, " +
+            "r.member_card_record_id, r.member_id, r.member_card_id, r.status, " +
+            "r.remaining_times, r.remaining_amount, r.expire_time, r.source_order_id, " +
+            "r.purchase_time, r.version, r.card_composition, " +
+            "mc.member_card_name as memberCardName, mc.member_card_type as memberCardType, " +
+            "mc.member_card_price as memberCardPrice, mc.member_card_validity_days as memberCardValidityDays, " +
+            "mc.member_card_total_times as memberCardTotalTimes " +
+            "FROM member_card_record r " +
+            "LEFT JOIN member_card mc ON r.member_card_id = mc.id AND mc.deleted_at IS NULL " +
+            "WHERE r.member_id = :memberId AND r.status = 'ACTIVE' AND r.deleted_at IS NULL " +
+            "ORDER BY r.expire_time ASC")
     Flux<MemberCardRecord> findActiveCardsByMemberId(Long memberId);
 
     /**
@@ -106,4 +115,39 @@ public interface MemberCardRecordRepository extends R2dbcRepository<MemberCardRe
      */
     @Query("SELECT * FROM member_card_record WHERE status = 'ACTIVE' AND deleted_at IS NULL")
     Flux<MemberCardRecord> findActiveRecords();
+
+    /**
+     * 储值卡充值 - 增加余额
+     */
+    @Modifying
+    @Query("UPDATE member_card_record SET remaining_amount = remaining_amount + :addAmount, updated_at = NOW() " +
+            "WHERE member_card_record_id = :recordId AND status = 'ACTIVE' AND deleted_at IS NULL")
+    Mono<Integer> rechargeStoredCard(Long recordId, Double addAmount);
+
+    /**
+     * 查询会员的所有卡片（按状态筛选）- 包含会员卡类型信息
+     * status: all - 所有卡, active - 有效卡, expired - 已过期/失效卡
+     * 排序规则：临期卡（30天内到期）排在最上面，然后是其他有效卡，最后是失效卡
+     */
+    @Query("SELECT r.member_card_record_id as id, r.created_at, r.updated_at, r.deleted_at, " +
+            "r.member_card_record_id, r.member_id, r.member_card_id, r.status, " +
+            "r.remaining_times, r.remaining_amount, r.expire_time, r.source_order_id, " +
+            "r.purchase_time, r.version, r.card_composition, " +
+            "mc.member_card_name as memberCardName, mc.member_card_type as memberCardType, " +
+            "mc.member_card_price as memberCardPrice, mc.member_card_validity_days as memberCardValidityDays, " +
+            "mc.member_card_total_times as memberCardTotalTimes " +
+            "FROM member_card_record r " +
+            "LEFT JOIN member_card mc ON r.member_card_id = mc.id AND mc.deleted_at IS NULL " +
+            "WHERE r.member_id = :memberId AND r.deleted_at IS NULL " +
+            "AND (" +
+            "  :status = 'all' " +
+            "  OR (:status = 'active' AND r.status = 'ACTIVE' AND (r.expire_time IS NULL OR r.expire_time > NOW())) " +
+            "  OR (:status = 'expired' AND (r.status != 'ACTIVE' OR (r.expire_time IS NOT NULL AND r.expire_time <= NOW()))) " +
+            ") " +
+            "ORDER BY " +
+            "CASE WHEN r.status = 'ACTIVE' AND r.expire_time IS NOT NULL AND r.expire_time < NOW() + INTERVAL '30 days' AND r.expire_time > NOW() THEN 0 " +
+            "     WHEN r.status = 'ACTIVE' AND (r.expire_time IS NULL OR r.expire_time > NOW()) THEN 1 " +
+            "     ELSE 2 END, " +
+            "r.expire_time ASC")
+    Flux<MemberCardRecord> findCardsByMemberIdWithStatus(Long memberId, String status);
 }

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

@@ -9,6 +9,8 @@ import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 /**
  * 会员卡类型 Repository
  * 
@@ -18,11 +20,23 @@ import reactor.core.publisher.Mono;
 @Repository
 public interface MemberCardRepository extends R2dbcRepository<MemberCard, Long> {
 
+    /**
+     * 根据主键ID查询（未删除的）- 用于前端传递的id
+     */
+    @Query("SELECT * FROM member_card WHERE id = :id AND deleted_at IS NULL")
+    Mono<MemberCard> findByIdAndDeletedAtIsNull(Long id);
+
     /**
      * 根据会员卡ID查询（未删除的）
      */
     Mono<MemberCard> findByMemberCardIdAndDeletedAtIsNull(Long memberCardId);
 
+    /**
+     * 批量查询会员卡（根据 member_card_id 字段）
+     */
+    @Query("SELECT * FROM member_card WHERE deleted_at IS NULL AND member_card_id IN (:memberCardIds)")
+    Flux<MemberCard> findByMemberCardIdIn(List<Long> memberCardIds);
+
     /**
      * 条件查询会员卡列表
      */

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

@@ -0,0 +1,61 @@
+package cn.novalon.gym.manage.member.repository;
+
+import cn.novalon.gym.manage.member.entity.MemberStoredCardRecharge;
+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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 储值卡充值记录 Repository
+ */
+@Repository
+public interface MemberStoredCardRechargeRepository extends R2dbcRepository<MemberStoredCardRecharge, Long> {
+
+    /**
+     * 根据订单号查询充值记录
+     */
+    @Query("SELECT * FROM member_stored_card_recharge WHERE order_no = :orderNo AND deleted_at IS NULL")
+    Mono<MemberStoredCardRecharge> findByOrderNo(String orderNo);
+
+    /**
+     * 查询会员的充值记录列表
+     */
+    @Query("SELECT * FROM member_stored_card_recharge WHERE member_id = :memberId AND deleted_at IS NULL ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
+    Flux<MemberStoredCardRecharge> findByMemberId(Long memberId, int limit, int offset);
+
+    /**
+     * 创建充值记录
+     */
+    @Modifying
+    @Query("INSERT INTO member_stored_card_recharge (member_id, order_no, recharge_amount, bonus_amount, total_amount, pay_amount, status, created_at, updated_at) " +
+            "VALUES (:memberId, :orderNo, :rechargeAmount, :bonusAmount, :totalAmount, :payAmount, 'PENDING', NOW(), NOW())")
+    Mono<Integer> createRechargeRecord(Long memberId, String orderNo, BigDecimal rechargeAmount, BigDecimal bonusAmount, BigDecimal totalAmount, BigDecimal payAmount);
+
+    /**
+     * 更新充值记录为成功
+     */
+    @Modifying
+    @Query("UPDATE member_stored_card_recharge SET status = 'SUCCESS', pay_time = :payTime, updated_at = NOW() " +
+            "WHERE order_no = :orderNo AND deleted_at IS NULL")
+    Mono<Integer> markSuccess(String orderNo, LocalDateTime payTime);
+
+    /**
+     * 更新充值记录为失败
+     */
+    @Modifying
+    @Query("UPDATE member_stored_card_recharge SET status = 'FAILED', updated_at = NOW() " +
+            "WHERE order_no = :orderNo AND deleted_at IS NULL")
+    Mono<Integer> markFailed(String orderNo);
+
+    /**
+     * 查询会员充值记录总数
+     */
+    @Query("SELECT COUNT(*) FROM member_stored_card_recharge WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<Long> countByMemberIdAndDeletedAtIsNull(Long memberId);
+}

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

@@ -0,0 +1,72 @@
+package cn.novalon.gym.manage.member.repository;
+
+import cn.novalon.gym.manage.member.entity.MemberStoredCard;
+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.Mono;
+
+import java.math.BigDecimal;
+
+/**
+ * 储值卡 Repository
+ */
+@Repository
+public interface MemberStoredCardRepository extends R2dbcRepository<MemberStoredCard, Long> {
+
+    /**
+     * 根据会员ID查询储值卡
+     */
+    @Query("SELECT * FROM member_stored_card WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<MemberStoredCard> findByMemberId(Long memberId);
+
+    /**
+     * 根据会员ID查询储值卡（可删除标记）
+     */
+    Mono<MemberStoredCard> findByMemberIdAndDeletedAtIsNull(Long memberId);
+
+    /**
+     * 储值卡充值 - 增加余额
+     */
+    @Modifying
+    @Query("UPDATE member_stored_card SET balance = balance + :addAmount, total_recharge = total_recharge + :addAmount, updated_at = NOW() " +
+            "WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<Integer> rechargeBalance(Long memberId, BigDecimal addAmount);
+
+    /**
+     * 储值卡消费 - 扣减余额
+     */
+    @Modifying
+    @Query("UPDATE member_stored_card SET balance = balance - :deductAmount, total_consume = total_consume + :deductAmount, updated_at = NOW() " +
+            "WHERE member_id = :memberId AND deleted_at IS NULL AND balance >= :deductAmount")
+    Mono<Integer> deductBalance(Long memberId, BigDecimal deductAmount);
+
+    /**
+     * 创建储值卡
+     */
+    @Modifying
+    @Query("INSERT INTO member_stored_card (member_id, balance, total_recharge, total_consume, is_pay_password_set, created_at, updated_at) " +
+            "VALUES (:memberId, 0, 0, 0, FALSE, NOW(), NOW())")
+    Mono<Integer> createStoredCard(Long memberId);
+
+    /**
+     * 设置支付密码
+     */
+    @Modifying
+    @Query("UPDATE member_stored_card SET pay_password = :password, is_pay_password_set = TRUE, updated_at = NOW() " +
+            "WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<Integer> setPayPassword(Long memberId, String password);
+
+    /**
+     * 检查支付密码是否已设置
+     */
+    @Query("SELECT is_pay_password_set FROM member_stored_card WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<Boolean> isPayPasswordSet(Long memberId);
+
+    /**
+     * 获取支付密码
+     */
+    @Query("SELECT pay_password FROM member_stored_card WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<String> getPayPassword(Long memberId);
+}

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

@@ -32,4 +32,20 @@ public interface IMemberCardRecordService {
     Mono<MemberCardRecord> validateStoredCard(Long recordId, Double requiredAmount);
     
     Flux<MemberCardRecord> findExpiredCards();
+    
+    /**
+     * 查询会员的所有卡片（按状态筛选）
+     * @param memberId 会员ID
+     * @param status 状态筛选：all - 所有, active - 有效, expired - 已失效
+     * @return 会员卡记录列表
+     */
+    Flux<MemberCardRecord> findCardsByMemberIdWithStatus(Long memberId, String status);
+
+    /**
+     * 查询会员的主要有效会员卡（只返回一条）
+     * 优先返回临期卡（剩余1-3天），其次返回普通有效卡
+     * @param memberId 会员ID
+     * @return 会员卡记录，如果没有则返回空
+     */
+    Mono<MemberCardRecord> findPrimaryActiveCardByMemberId(Long memberId);
 }

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

@@ -34,11 +34,11 @@ public interface IMemberCardService {
     
     Mono<MemberCardRecord> purchaseCard(Long memberId, Long memberCardId, Long sourceOrderId);
     
-    Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, Integer addDays, Long sourceOrderId);
+    Mono<MemberCardRecord> renewCard(Long recordId, Long memberId, Integer addTimes, Double addAmount, Integer addDays, Long sourceOrderId);
     
-    Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount);
+    Mono<MemberCardRecord> useCard(Long recordId, Long memberId, Integer deductTimes, Double deductAmount);
     
-    Mono<Void> refundCard(Long recordId);
+    Mono<Void> refundCard(Long recordId, Long memberId);
     
     Mono<Integer> processExpiredCards();
 }

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

@@ -0,0 +1,95 @@
+package cn.novalon.gym.manage.member.service;
+
+import cn.novalon.gym.manage.member.entity.MemberStoredCard;
+import cn.novalon.gym.manage.member.entity.MemberStoredCardRecharge;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.math.BigDecimal;
+
+/**
+ * 储值卡 Service接口
+ */
+public interface IMemberStoredCardService {
+
+    /**
+     * 获取会员的储值卡，如果没有则自动创建
+     */
+    Mono<MemberStoredCard> getOrCreateStoredCard(Long memberId);
+
+    /**
+     * 获取会员的储值卡
+     */
+    Mono<MemberStoredCard> getStoredCard(Long memberId);
+
+    /**
+     * 储值卡充值
+     */
+    Mono<Integer> recharge(Long memberId, BigDecimal amount);
+
+    /**
+     * 储值卡消费
+     */
+    Mono<Integer> consume(Long memberId, BigDecimal amount);
+
+    /**
+     * 检查支付密码是否已设置
+     */
+    Mono<Boolean> isPayPasswordSet(Long memberId);
+
+    /**
+     * 设置支付密码
+     */
+    Mono<Integer> setPayPassword(Long memberId, String password);
+
+    /**
+     * 验证支付密码
+     */
+    Mono<Boolean> verifyPayPassword(Long memberId, String password);
+
+    /**
+     * 储值卡支付（验证密码并扣减余额）
+     */
+    Mono<PayResult> payWithStoredCard(Long memberId, String password, BigDecimal amount);
+
+    /**
+     * 查询会员的充值记录列表
+     */
+    Flux<MemberStoredCardRecharge> getRechargeRecords(Long memberId, int page, int size);
+
+    /**
+     * 查询会员充值记录总数
+     */
+    Mono<Long> countRechargeRecords(Long memberId);
+
+    /**
+     * 储值卡支付结果
+     */
+    class PayResult {
+        private boolean success;
+        private String message;
+        private BigDecimal balance;
+
+        public static PayResult success(BigDecimal balance) {
+            PayResult result = new PayResult();
+            result.success = true;
+            result.message = "支付成功";
+            result.balance = balance;
+            return result;
+        }
+
+        public static PayResult fail(String message) {
+            PayResult result = new PayResult();
+            result.success = false;
+            result.message = message;
+            return result;
+        }
+
+        public boolean isSuccess() { return success; }
+        public void setSuccess(boolean success) { this.success = success; }
+        public String getMessage() { return message; }
+        public void setMessage(String message) { this.message = message; }
+        public BigDecimal getBalance() { return balance; }
+        public void setBalance(BigDecimal balance) { this.balance = balance; }
+    }
+}

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

@@ -1,7 +1,9 @@
 package cn.novalon.gym.manage.member.service.impl;
 
+import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
+import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +13,9 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 会员卡记录服务实现
@@ -22,13 +27,17 @@ import java.time.LocalDateTime;
 @Service
 public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
     private final MemberCardRecordRepository memberCardRecordRepository;
+    private final MemberCardRepository memberCardRepository;
     private final RedisUtil redisUtil;
 
     private static final String MEMBER_CARD_RECORD_CACHE_PREFIX = "member:card:record:";
     private static final long CACHE_EXPIRE_SECONDS = 300;
 
-    public MemberCardRecordServiceImpl(MemberCardRecordRepository memberCardRecordRepository, RedisUtil redisUtil) {
+    public MemberCardRecordServiceImpl(MemberCardRecordRepository memberCardRecordRepository,
+                                       MemberCardRepository memberCardRepository,
+                                       RedisUtil redisUtil) {
         this.memberCardRecordRepository = memberCardRecordRepository;
+        this.memberCardRepository = memberCardRepository;
         this.redisUtil = redisUtil;
     }
 
@@ -56,7 +65,44 @@ public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
 
     @Override
     public Flux<MemberCardRecord> findActiveCardsByMemberId(Long memberId) {
-        return memberCardRecordRepository.findActiveCardsByMemberId(memberId);
+        return memberCardRecordRepository.findActiveCardsByMemberId(memberId)
+                // 收集所有记录，然后批量查询会员卡信息
+                .collectList()
+                .flatMapMany(records -> {
+                    if (records.isEmpty()) {
+                        return Flux.empty();
+                    }
+                    // 提取所有 memberCardId（关联的是 member_card.id 字段，即MemberCard的主键）
+                    List<Long> memberCardIds = records.stream()
+                            .map(MemberCardRecord::getMemberCardId)
+                            .filter(Objects::nonNull)
+                            .distinct()
+                            .collect(Collectors.toList());
+
+                    if (memberCardIds.isEmpty()) {
+                        return Flux.fromIterable(records);
+                    }
+
+                    // 批量查询会员卡信息（使用主键id查询，确保查询未删除的记录）
+                    return Flux.fromIterable(memberCardIds)
+                            .flatMap(id -> memberCardRepository.findByIdAndDeletedAtIsNull(id))
+                            .collectMap(MemberCard::getId, mc -> mc)
+                            .map(cardMap -> {
+                                // 填充会员卡信息到每条记录
+                                records.forEach(record -> {
+                                    MemberCard memberCard = cardMap.get(record.getMemberCardId());
+                                    if (memberCard != null) {
+                                        record.setMemberCardName(memberCard.getMemberCardName());
+                                        record.setMemberCardType(memberCard.getMemberCardType());
+                                        record.setMemberCardPrice(memberCard.getMemberCardPrice());
+                                        record.setMemberCardValidityDays(memberCard.getMemberCardValidityDays());
+                                        record.setMemberCardTotalTimes(memberCard.getMemberCardTotalTimes());
+                                    }
+                                });
+                                return records;
+                            })
+                            .flatMapMany(Flux::fromIterable);
+                });
     }
 
     @Override
@@ -116,6 +162,97 @@ public class MemberCardRecordServiceImpl implements IMemberCardRecordService {
         return memberCardRecordRepository.findExpiredCards();
     }
 
+    @Override
+    public Flux<MemberCardRecord> findCardsByMemberIdWithStatus(Long memberId, String status) {
+        return memberCardRecordRepository.findCardsByMemberIdWithStatus(memberId, status)
+                // 收集所有记录，然后批量查询会员卡信息
+                .collectList()
+                .flatMapMany(records -> {
+                    if (records.isEmpty()) {
+                        return Flux.empty();
+                    }
+                    // 提取所有 memberCardId（关联的是 member_card.id 字段，即MemberCard的主键）
+                    List<Long> memberCardIds = records.stream()
+                            .map(MemberCardRecord::getMemberCardId)
+                            .filter(Objects::nonNull)
+                            .distinct()
+                            .collect(Collectors.toList());
+
+                    if (memberCardIds.isEmpty()) {
+                        return Flux.fromIterable(records);
+                    }
+
+                    // 批量查询会员卡信息（使用主键id查询，确保查询未删除的记录）
+                    return Flux.fromIterable(memberCardIds)
+                            .flatMap(id -> memberCardRepository.findByIdAndDeletedAtIsNull(id))
+                            .collectMap(MemberCard::getId, mc -> mc)
+                            .map(cardMap -> {
+                                // 填充会员卡信息到每条记录
+                                records.forEach(record -> {
+                                    MemberCard memberCard = cardMap.get(record.getMemberCardId());
+                                    if (memberCard != null) {
+                                        record.setMemberCardName(memberCard.getMemberCardName());
+                                        record.setMemberCardType(memberCard.getMemberCardType());
+                                        record.setMemberCardPrice(memberCard.getMemberCardPrice());
+                                        record.setMemberCardValidityDays(memberCard.getMemberCardValidityDays());
+                                        record.setMemberCardTotalTimes(memberCard.getMemberCardTotalTimes());
+                                    }
+                                });
+                                return records;
+                            })
+                            .flatMapMany(Flux::fromIterable);
+                });
+    }
+
+    @Override
+    public Mono<MemberCardRecord> findPrimaryActiveCardByMemberId(Long memberId) {
+        LocalDateTime now = LocalDateTime.now();
+        
+        return findCardsByMemberIdWithStatus(memberId, "active")
+                // 过滤掉储值卡
+                .filter(record -> record.getMemberCardType() == null || 
+                        !record.getMemberCardType().equals("STORED_VALUE_CARD"))
+                .collectList()
+                .map(records -> {
+                    if (records.isEmpty()) {
+                        return null;
+                    }
+                    
+                    // 优先找临期卡（剩余1-3天）
+                    MemberCardRecord expiringCard = records.stream()
+                            .filter(record -> {
+                                if (record.getExpireTime() == null) return false;
+                                if (record.getStatus() != null && record.getStatus().equals("USED_UP")) return false;
+                                long days = java.time.Duration.between(now, record.getExpireTime()).toDays();
+                                return days >= 1 && days <= 3;
+                            })
+                            .findFirst()
+                            .orElse(null);
+                    
+                    if (expiringCard != null) {
+                        return expiringCard;
+                    }
+                    
+                    // 再找普通有效卡（剩余>3天）
+                    MemberCardRecord activeCard = records.stream()
+                            .filter(record -> {
+                                if (record.getExpireTime() == null) return true;
+                                if (record.getStatus() != null && record.getStatus().equals("USED_UP")) return false;
+                                long days = java.time.Duration.between(now, record.getExpireTime()).toDays();
+                                return days > 3;
+                            })
+                            .findFirst()
+                            .orElse(null);
+                    
+                    if (activeCard != null) {
+                        return activeCard;
+                    }
+                    
+                    // 最后返回第一张卡
+                    return records.get(0);
+                });
+    }
+
     private void clearRecordCache(Long recordId) {
         String cacheKey = MEMBER_CARD_RECORD_CACHE_PREFIX + recordId;
         redisUtil.delete(cacheKey);

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.member.service.impl;
 
+import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.entity.MemberCardTransaction;
@@ -15,7 +16,6 @@ import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
 import cn.novalon.gym.manage.member.service.IMemberCardTransactionService;
-import cn.novalon.gym.manage.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -124,11 +124,18 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
     @Override
     public Mono<MemberCardRecord> purchaseCard(Long memberId, Long memberCardId, Long sourceOrderId) {
-        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
+        if (memberId == null) {
+            return Mono.error(new RuntimeException("会员ID不能为空"));
+        }
+        if (memberCardId == null) {
+            return Mono.error(new RuntimeException("会员卡类型ID不能为空"));
+        }
+        // 前端传的是数据库主键id，不是业务字段member_card_id
+        return memberCardRepository.findByIdAndDeletedAtIsNull(memberCardId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
                 .flatMap(card -> {
-                    if (card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1) {
-                        return Mono.error(new RuntimeException("该会员卡已禁用"));
+                    if (card.getMemberCardStatus() != null && card.getMemberCardStatus() == 0) {
+                        return Mono.error(new RuntimeException("该会员卡已下架"));
                     }
 
                     MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
@@ -137,12 +144,13 @@ public class MemberCardServiceImpl implements IMemberCardService {
                             memberId.toString(),
                             cardType.name(),
                             Mono.defer(() -> createCardRecord(memberId, memberCardId, sourceOrderId, card))
+                                    // 修改：将 card 对象传递给 createTransaction 以获取购买金额
+                                    .flatMap(record -> createTransactionForPurchase(record, card, TransactionType.PURCHASE, "购买会员卡")
+                                            .thenReturn(record))
+                                    .flatMap(record -> expirationReminderService.scheduleExpirationReminder(record)
+                                            .then(Mono.just(record)))
                     );
-                })
-                .flatMap(record -> createTransaction(record, TransactionType.PURCHASE, "购买会员卡")
-                        .thenReturn(record))
-                .flatMap(record -> expirationReminderService.scheduleExpirationReminder(record)
-                        .then(Mono.just(record)));
+                });
     }
 
     private Mono<MemberCardRecord> createCardRecord(Long memberId, Long memberCardId, 
@@ -161,12 +169,16 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
             switch (cardType) {
                 case TIME_CARD:
-                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
+                    if (card.getMemberCardValidityDays() != null) {
+                        record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
+                    }
                     record.setRemainingTimes(0);
                     record.setRemainingAmount(0.0);
                     break;
                 case COUNT_CARD:
-                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
+                    if (card.getMemberCardValidityDays() != null) {
+                        record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
+                    }
                     record.setRemainingTimes(card.getMemberCardTotalTimes());
                     record.setRemainingAmount(0.0);
                     break;
@@ -191,12 +203,17 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, 
+    public Mono<MemberCardRecord> renewCard(Long recordId, Long memberId, Integer addTimes, Double addAmount,
                                              Integer addDays, Long sourceOrderId) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(originalRecord -> stateMachine.validateTransition(originalRecord, CardEvent.RENEW)
-                        .then(Mono.just(originalRecord)))
+                .flatMap(originalRecord -> {
+                    if (!originalRecord.getMemberId().equals(memberId)) {
+                        return Mono.error(new RuntimeException("无权操作此会员卡"));
+                    }
+                    return stateMachine.validateTransition(originalRecord, CardEvent.RENEW)
+                            .then(Mono.just(originalRecord));
+                })
                 .flatMap(originalRecord -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(originalRecord.getMemberCardId())
                         .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
                         .flatMap(card -> {
@@ -249,11 +266,16 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount) {
+    public Mono<MemberCardRecord> useCard(Long recordId, Long memberId, Integer deductTimes, Double deductAmount) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> stateMachine.validateTransition(record, CardEvent.USE)
-                        .then(Mono.just(record)))
+                .flatMap(record -> {
+                    if (!record.getMemberId().equals(memberId)) {
+                        return Mono.error(new RuntimeException("无权操作此会员卡"));
+                    }
+                    return stateMachine.validateTransition(record, CardEvent.USE)
+                            .then(Mono.just(record));
+                })
                 .flatMap(record -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
                         .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
                         .flatMap(card -> {
@@ -314,19 +336,24 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<Void> refundCard(Long recordId) {
+    public Mono<Void> refundCard(Long recordId, Long memberId) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
-                        .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                        .flatMap(card -> {
-                            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-                            return distributedLockService.executeWithLock(
-                                record.getMemberId().toString(),
-                                cardType.name(),
-                                refundSagaHandler.executeRefund(recordId)
-                            );
-                        }));
+                .flatMap(record -> {
+                    if (!record.getMemberId().equals(memberId)) {
+                        return Mono.error(new RuntimeException("无权操作此会员卡"));
+                    }
+                    return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
+                            .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
+                            .flatMap(card -> {
+                                MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
+                                return distributedLockService.executeWithLock(
+                                    record.getMemberId().toString(),
+                                    cardType.name(),
+                                    refundSagaHandler.executeRefund(recordId)
+                                );
+                            });
+                });
     }
 
     @Override
@@ -341,6 +368,7 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
     private Mono<Void> createTransaction(MemberCardRecord record, TransactionType action, String remark) {
         MemberCardTransaction transaction = MemberCardTransaction.builder()
+                .memberCardRecordId(record.getMemberCardRecordId())
                 .memberId(record.getMemberId())
                 .memberCardId(record.getMemberCardId())
                 .operationType(action.name())
@@ -354,6 +382,25 @@ public class MemberCardServiceImpl implements IMemberCardService {
         return transactionService.createTransaction(transaction);
     }
 
+    /**
+     * 创建购买会员卡的交易记录（记录购买金额为负数，表示支出）
+     */
+    private Mono<Void> createTransactionForPurchase(MemberCardRecord record, MemberCard card, TransactionType action, String remark) {
+        MemberCardTransaction transaction = MemberCardTransaction.builder()
+                .memberCardRecordId(record.getMemberCardRecordId())
+                .memberId(record.getMemberId())
+                .memberCardId(record.getMemberCardId())
+                .operationType(action.name())
+                .changeAmount(card.getMemberCardTotalTimes() != null ? card.getMemberCardTotalTimes() : 0)
+                .changeBalance(card.getMemberCardPrice() != null ? -card.getMemberCardPrice() : 0.0) // 负数表示支出
+                .afterRemainingCount(record.getRemainingTimes())
+                .afterRemainingBalance(record.getRemainingAmount())
+                .remark(remark)
+                .build();
+
+        return transactionService.createTransaction(transaction);
+    }
+
     private void clearCardCache(Long memberCardId) {
         String cacheKey = MEMBER_CARD_CACHE_PREFIX + memberCardId;
         redisUtil.delete(cacheKey);

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

@@ -91,8 +91,19 @@ public class MemberCardTransactionServiceImpl implements IMemberCardTransactionS
 
     @Override
     public Mono<Void> createTransaction(MemberCardTransaction transaction) {
-        return transactionRepository.save(transaction)
-                .then()
+        return transactionRepository.insertTransaction(
+                transaction.getMemberCardRecordId(),
+                transaction.getMemberCardId(),
+                transaction.getMemberId(),
+                transaction.getOperationType(),
+                transaction.getChangeAmount(),
+                transaction.getChangeBalance(),
+                transaction.getAfterRemainingCount(),
+                transaction.getAfterRemainingBalance(),
+                transaction.getRelatedBizType(),
+                transaction.getSourceOrderId(),
+                transaction.getRemark()
+        ).then()
                 .doOnSuccess(v -> log.info("创建会员卡交易记录: memberId={}, cardId={}, type={}",
                         transaction.getMemberId(), transaction.getMemberCardId(), transaction.getOperationType()));
     }

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

@@ -17,6 +17,7 @@ import cn.novalon.gym.manage.member.service.MemberService;
 import cn.novalon.gym.manage.member.util.AesUtil;
 import cn.novalon.gym.manage.member.util.BeanConvertUtil;
 import cn.novalon.gym.manage.member.util.EsSyncUtils;
+import cn.novalon.gym.manage.member.util.WechatPhoneUtil;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.member.vo.MemberCardInfoVO;
 import cn.novalon.gym.manage.member.vo.MemberDetailVO;
@@ -139,7 +140,18 @@ public class MemberServiceImpl implements MemberService {
 
     private MemberInfoVO buildMemberInfoResponse(Member member) {
         String phone = member.getPhone();
-        String maskedPhone = phone != null ? phone.replace(phone.substring(3, 7), "****") : null;
+        String maskedPhone = null;
+        
+        // 先解密手机号，再进行脱敏处理
+        if (phone != null && !phone.isEmpty()) {
+            try {
+                String decryptedPhone = AesUtil.decrypt(phone);
+                maskedPhone = WechatPhoneUtil.maskPhone(decryptedPhone);
+            } catch (Exception e) {
+                log.error("手机号解密失败, memberId: {}", member.getId(), e);
+                maskedPhone = null;
+            }
+        }
 
         GenderEnum genderEnum = GenderEnum.fromCode(member.getGender());
 

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

@@ -0,0 +1,150 @@
+package cn.novalon.gym.manage.member.service.impl;
+
+import cn.novalon.gym.manage.member.entity.MemberStoredCard;
+import cn.novalon.gym.manage.member.entity.MemberStoredCardRecharge;
+import cn.novalon.gym.manage.member.repository.MemberStoredCardRechargeRepository;
+import cn.novalon.gym.manage.member.repository.MemberStoredCardRepository;
+import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.math.BigDecimal;
+
+/**
+ * 储值卡 Service实现
+ */
+@Slf4j
+@Service
+public class MemberStoredCardServiceImpl implements IMemberStoredCardService {
+
+    private final MemberStoredCardRepository memberStoredCardRepository;
+    private final MemberStoredCardRechargeRepository memberStoredCardRechargeRepository;
+    private final BCryptPasswordEncoder passwordEncoder;
+
+    public MemberStoredCardServiceImpl(MemberStoredCardRepository memberStoredCardRepository,
+                                        MemberStoredCardRechargeRepository memberStoredCardRechargeRepository) {
+        this.memberStoredCardRepository = memberStoredCardRepository;
+        this.memberStoredCardRechargeRepository = memberStoredCardRechargeRepository;
+        this.passwordEncoder = new BCryptPasswordEncoder();
+    }
+
+    @Override
+    public Mono<MemberStoredCard> getOrCreateStoredCard(Long memberId) {
+        return memberStoredCardRepository.findByMemberId(memberId)
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.info("[储值卡] 为会员 {} 创建储值卡", memberId);
+                    return memberStoredCardRepository.createStoredCard(memberId)
+                            .then(memberStoredCardRepository.findByMemberId(memberId));
+                }));
+    }
+
+    @Override
+    public Mono<MemberStoredCard> getStoredCard(Long memberId) {
+        return memberStoredCardRepository.findByMemberId(memberId);
+    }
+
+    @Override
+    public Mono<Integer> recharge(Long memberId, BigDecimal amount) {
+        return memberStoredCardRepository.findByMemberId(memberId)
+                .flatMap(card -> memberStoredCardRepository.rechargeBalance(memberId, amount))
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.info("[储值卡] 会员 {} 首次充值，创建储值卡并充值", memberId);
+                    return memberStoredCardRepository.createStoredCard(memberId)
+                            .then(memberStoredCardRepository.rechargeBalance(memberId, amount));
+                }));
+    }
+
+    @Override
+    public Mono<Integer> consume(Long memberId, BigDecimal amount) {
+        return memberStoredCardRepository.deductBalance(memberId, amount);
+    }
+
+    @Override
+    public Mono<Boolean> isPayPasswordSet(Long memberId) {
+        return memberStoredCardRepository.isPayPasswordSet(memberId)
+                .defaultIfEmpty(false);
+    }
+
+    @Override
+    public Mono<Integer> setPayPassword(Long memberId, String password) {
+        // 确保储值卡存在
+        return getOrCreateStoredCard(memberId)
+                .flatMap(card -> {
+                    // BCrypt加密密码
+                    String encodedPassword = passwordEncoder.encode(password);
+                    return memberStoredCardRepository.setPayPassword(memberId, encodedPassword);
+                });
+    }
+
+    @Override
+    public Mono<Boolean> verifyPayPassword(Long memberId, String password) {
+        return memberStoredCardRepository.getPayPassword(memberId)
+                .map(storedPassword -> {
+                    if (storedPassword == null || storedPassword.isEmpty()) {
+                        return false;
+                    }
+                    return passwordEncoder.matches(password, storedPassword);
+                })
+                .defaultIfEmpty(false);
+    }
+
+    @Override
+    public Mono<PayResult> payWithStoredCard(Long memberId, String password, BigDecimal amount) {
+        return memberStoredCardRepository.findByMemberId(memberId)
+                .flatMap(card -> {
+                    // 检查余额是否充足
+                    BigDecimal currentBalance = card.getBalance();
+                    if (currentBalance == null) {
+                        currentBalance = BigDecimal.ZERO;
+                    }
+                    if (currentBalance.compareTo(amount) < 0) {
+                        log.warn("[储值卡支付] 余额不足: memberId={}, balance={}, needAmount={}",
+                                memberId, currentBalance, amount);
+                        return Mono.just(PayResult.fail("余额不足，当前余额：" + currentBalance + "元"));
+                    }
+
+                    // 验证密码
+                    if (card.getPayPassword() == null || card.getPayPassword().isEmpty()) {
+                        log.warn("[储值卡支付] 未设置支付密码: memberId={}", memberId);
+                        return Mono.just(PayResult.fail("请先设置支付密码"));
+                    }
+
+                    if (!passwordEncoder.matches(password, card.getPayPassword())) {
+                        log.warn("[储值卡支付] 密码错误: memberId={}", memberId);
+                        return Mono.just(PayResult.fail("支付密码错误"));
+                    }
+
+                    // 扣减余额
+                    return memberStoredCardRepository.deductBalance(memberId, amount)
+                            .flatMap(rows -> {
+                                if (rows > 0) {
+                                    // 查询最新余额
+                                    return memberStoredCardRepository.findByMemberId(memberId)
+                                            .map(updatedCard -> PayResult.success(
+                                                    updatedCard.getBalance() != null ? updatedCard.getBalance() : BigDecimal.ZERO));
+                                } else {
+                                    log.warn("[储值卡支付] 扣减余额失败: memberId={}, amount={}", memberId, amount);
+                                    return Mono.just(PayResult.fail("支付失败，请稍后重试"));
+                                }
+                            });
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.warn("[储值卡支付] 储值卡不存在: memberId={}", memberId);
+                    return Mono.just(PayResult.fail("储值卡不存在"));
+                }));
+    }
+
+    @Override
+    public Flux<MemberStoredCardRecharge> getRechargeRecords(Long memberId, int page, int size) {
+        int offset = (page - 1) * size;
+        return memberStoredCardRechargeRepository.findByMemberId(memberId, size, offset);
+    }
+
+    @Override
+    public Mono<Long> countRechargeRecords(Long memberId) {
+        return memberStoredCardRechargeRepository.countByMemberIdAndDeletedAtIsNull(memberId);
+    }
+}

gym-manage-api/gym-member/src/main/resources/db/schema.sql

@@ -279,3 +279,24 @@ CREATE INDEX IF NOT EXISTS idx_refund_application_status ON refund_application(s
 
 COMMENT ON TABLE refund_application IS '退款申请表';
 COMMENT ON COLUMN refund_application.status IS '状态：PENDING-待审核, APPROVED-已批准, REJECTED-已拒绝, PROCESSING-处理中, SUCCESS-成功, FAILED-失败';
+
+
+-- ============================================
+-- 7. member_pay_password 表（支付密码表）
+-- ============================================
+CREATE TABLE IF NOT EXISTS member_pay_password (
+    id BIGSERIAL PRIMARY KEY,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    
+    member_id BIGINT NOT NULL UNIQUE,
+    pay_password VARCHAR(100) NOT NULL,
+    is_set BOOLEAN DEFAULT TRUE
+);
+
+CREATE INDEX IF NOT EXISTS idx_member_pay_password_member_id ON member_pay_password(member_id);
+
+COMMENT ON TABLE member_pay_password IS '支付密码表';
+COMMENT ON COLUMN member_pay_password.member_id IS '会员ID';
+COMMENT ON COLUMN member_pay_password.pay_password IS '支付密码（明文存储）';
+COMMENT ON COLUMN member_pay_password.is_set IS '是否已设置支付密码';

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

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

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

@@ -1,4 +1,3 @@
-
 <?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"
@@ -11,85 +10,66 @@
         <version>1.0.0</version>
     </parent>
 
+    <groupId>cn.novalon.gym.manage</groupId>
     <artifactId>gym-payment</artifactId>
     <packaging>jar</packaging>
 
     <name>Gym Payment</name>
-    <description>Payment Module - Integrates Huifu Payment Gateway</description>
+    <description>支付模块 - 支付宝App支付</description>
 
     <dependencies>
+        <!-- Spring Boot WebFlux -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
+        <!-- 通用模块 (含Redis工具类) -->
         <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>
+        <!-- 汇付聚合支付SDK -->
+        <dependency>
+            <groupId>com.huifu.dg.lightning.sdk</groupId>
+            <artifactId>dg-lightning-sdk</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+
+        <!-- 汇付Java SDK (托管/对账用) -->
+        <dependency>
+            <groupId>com.huifu.bspay.sdk</groupId>
+            <artifactId>dg-java-sdk</artifactId>
+            <version>3.0.38</version>
+        </dependency>
+
+        <!-- JSON处理 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Swagger -->
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>2.2.19</version>
+        </dependency>
+	    <dependency>
+		    <groupId>cn.novalon.gym.manage</groupId>
+		    <artifactId>manage-sys</artifactId>
+		    <version>1.0.0</version>
+		    <scope>compile</scope>
+	    </dependency>
+	</dependencies>
 </project>

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/config/AlipayProperties.java

@@ -0,0 +1,57 @@
+package cn.novalon.gym.manage.payment.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付宝配置属性
+ * 沙箱环境配置
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "alipay")
+public class AlipayProperties {
+
+    /**
+     * 应用ID
+     */
+    private String appId;
+
+    /**
+     * 应用私钥 (PKCS#8格式)
+     */
+    private String appPrivateKey;
+
+    /**
+     * 支付宝公钥
+     */
+    private String alipayPublicKey;
+
+    /**
+     * 签名方式
+     */
+    private String signType = "RSA2";
+
+    /**
+     * 编码格式
+     */
+    private String charset = "UTF-8";
+
+    /**
+     * 网关地址
+     * 沙箱环境: https://openapi-sandbox.dl.alipaydev.com/gateway.do
+     * 正式环境: https://openapi.alipay.com/gateway.do
+     */
+    private String gateway;
+
+    /**
+     * 异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 是否沙箱环境
+     */
+    private boolean sandbox = true;
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/config/CorsConfig.java

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

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/config/HuifuPayConfig.java

@@ -1,34 +0,0 @@
-
-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";
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/config/HuifuProperties.java

@@ -0,0 +1,123 @@
+package cn.novalon.gym.manage.payment.config;
+
+import com.huifu.dg.lightning.utils.BasePay;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import jakarta.annotation.PostConstruct;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "huifu")
+@Slf4j
+public class HuifuProperties {
+
+    private String mode = "prod";
+    private String skillSource = "hfps/1.3.0";
+    private ChannelConfig channel;
+    private MerchantConfig merchant;
+    private NotifyConfig notify;
+
+    @Data
+    public static class ChannelConfig {
+        private String sysId;
+        private String productId;
+        private String huifuId;
+        private String rsaPrivateKey;
+        private String rsaPublicKey;
+        private String huifuPublicKey;
+    }
+
+    @Data
+    public static class MerchantConfig {
+        private String sysId;
+        private String productId;
+        private String huifuId;
+        private String rsaPrivateKey;
+        private String rsaPublicKey;
+        private String huifuPublicKey;
+    }
+
+    @Data
+    public static class NotifyConfig {
+        private String url;
+    }
+
+    private volatile boolean sdkInitialized = false;
+
+    @PostConstruct
+    public void initSdk() {
+        try {
+            if ("test".equalsIgnoreCase(mode)) {
+                BasePay.prodMode = BasePay.MODE_TEST;
+                log.info("[Huifu] 聚合支付SDK: 联调环境");
+            } else {
+                BasePay.prodMode = BasePay.MODE_PROD;
+                log.info("[Huifu] 聚合支付SDK: 生产环境");
+            }
+
+            // 优先使用商户配置初始化SDK，确保请求身份与huifu_id匹配
+            if (merchant != null && merchant.getRsaPrivateKey() != null && merchant.getHuifuPublicKey() != null) {
+                com.huifu.dg.lightning.biz.config.MerConfig merConfig = new com.huifu.dg.lightning.biz.config.MerConfig();
+                merConfig.setProductId(merchant.getProductId());
+                merConfig.setSysId(merchant.getSysId());
+                merConfig.setRsaPrivateKey(merchant.getRsaPrivateKey());
+                merConfig.setRsaPublicKey(merchant.getHuifuPublicKey());
+                merConfig.setSkillSource(skillSource);
+
+                BasePay.initWithMerConfig(merConfig);
+                sdkInitialized = true;
+                log.info("[Huifu] 聚合支付SDK初始化完成, 使用商户配置, sysId={}, huifuId={}", 
+                        merchant.getSysId(), merchant.getHuifuId());
+
+                initDgJavaSdk(merchant);
+                return;
+            }
+
+            // 备用：渠道商配置
+            if (channel == null || channel.getRsaPrivateKey() == null || channel.getHuifuPublicKey() == null) {
+                log.warn("[Huifu] 渠道商配置不完整，跳过SDK初始化");
+                return;
+            }
+
+            com.huifu.dg.lightning.biz.config.MerConfig merConfig = new com.huifu.dg.lightning.biz.config.MerConfig();
+            merConfig.setProductId(channel.getProductId());
+            merConfig.setSysId(channel.getSysId());
+            merConfig.setRsaPrivateKey(channel.getRsaPrivateKey());
+            merConfig.setRsaPublicKey(channel.getHuifuPublicKey());
+            merConfig.setSkillSource(skillSource);
+
+            BasePay.initWithMerConfig(merConfig);
+            sdkInitialized = true;
+            log.info("[Huifu] 聚合支付SDK初始化完成, 使用渠道商配置, sysId={}", channel.getSysId());
+        } catch (Exception e) {
+            log.error("[Huifu] 聚合支付SDK初始化失败，支付功能将不可用", e);
+        }
+    }
+
+    public boolean isSdkInitialized() {
+        return sdkInitialized;
+    }
+
+    private void initDgJavaSdk(MerchantConfig config) {
+        try {
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = "test".equalsIgnoreCase(mode) 
+                ? com.huifu.bspay.sdk.opps.core.BasePay.MODE_TEST 
+                : com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(config.getSysId());
+            merConfig.setProductId(config.getProductId());
+            merConfig.setRsaPrivateKey(config.getRsaPrivateKey());
+            merConfig.setRsaPublicKey(config.getHuifuPublicKey());
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+            log.info("[Huifu] dg-java-sdk初始化完成, sysId={}", config.getSysId());
+        } catch (Exception e) {
+            log.error("[Huifu] dg-java-sdk初始化失败", e);
+        }
+    }
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/ApiResponse.java

@@ -0,0 +1,52 @@
+package cn.novalon.gym.manage.payment.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 统一API响应
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApiResponse<T> {
+
+    private int code;
+    private String message;
+    private T data;
+
+    public static <T> ApiResponse<T> success(T data) {
+        return ApiResponse.<T>builder()
+                .code(200)
+                .message("success")
+                .data(data)
+                .build();
+    }
+
+    public static <T> ApiResponse<T> success(String message, T data) {
+        return ApiResponse.<T>builder()
+                .code(200)
+                .message(message)
+                .data(data)
+                .build();
+    }
+
+    public static <T> ApiResponse<T> error(int code, String message) {
+        return ApiResponse.<T>builder()
+                .code(code)
+                .message(message)
+                .data(null)
+                .build();
+    }
+
+    public static <T> ApiResponse<T> error(String message) {
+        return ApiResponse.<T>builder()
+                .code(500)
+                .message(message)
+                .data(null)
+                .build();
+    }
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/CreatePaymentRequest.java

@@ -0,0 +1,61 @@
+package cn.novalon.gym.manage.payment.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 创建支付请求DTO
+ */
+@Data
+@Schema(description = "创建支付请求")
+public class CreatePaymentRequest {
+
+    @Schema(description = "会员ID")
+    private Long memberId;
+    
+    @Schema(description = "会员ID(简写)")
+    private Long mid;
+
+    @Schema(description = "订单类型: MEMBER_CARD-会员卡, GROUP_COURSE-团课, GOODS-商品")
+    private String orderType;
+
+    @Schema(description = "商品描述")
+    private String goodsDesc;
+
+    @Schema(description = "交易金额(单位:分)")
+    private String transAmt;
+
+    @Schema(description = "交易类型: ALIPAY-支付宝, WECHAT-微信")
+    private String tradeType;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "账户号")
+    private String acctId;
+
+    @Schema(description = "过期时间(yyyyMMddHHmmss)")
+    private String timeExpire;
+
+    @Schema(description = "延迟入账标识")
+    private String delayAcctFlag;
+
+    @Schema(description = "手续费标识")
+    private Integer feeFlag;
+
+    @Schema(description = "禁用支付方式")
+    private String limitPayType;
+
+    @Schema(description = "渠道号")
+    private String channelNo;
+
+    @Schema(description = "支付场景")
+    private String payScene;
+
+    @Schema(description = "异步通知URL")
+    private String notifyUrl;
+    
+    public Long getEffectiveMemberId() {
+        return mid != null ? mid : memberId;
+    }
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/PaymentResponse.java

@@ -0,0 +1,63 @@
+package cn.novalon.gym.manage.payment.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 支付响应DTO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "支付响应")
+public class PaymentResponse {
+
+    @Schema(description = "订单ID")
+    private String orderId;
+
+    @Schema(description = "支付状态: PENDING-待支付, SUCCESS-成功, FAIL-失败, CLOSED-关闭")
+    private String status;
+
+    @Schema(description = "支付链接(App支付返回 scheme)")
+    private String payUrl;
+
+    @Schema(description = "二维码链接 (扫码支付)")
+    private String qrCode;
+
+    @Schema(description = "完整支付信息")
+    private String payInfo;
+
+    @Schema(description = "H5支付链接")
+    private String h5PayUrl;
+
+    @Schema(description = "错误码")
+    private String errorCode;
+
+    @Schema(description = "错误消息")
+    private String errorMsg;
+
+    @Schema(description = "交易金额(分)")
+    private String transAmt;
+
+    @Schema(description = "商品描述")
+    private String goodsDesc;
+
+    @Schema(description = "交易类型")
+    private String tradeType;
+
+    @Schema(description = "支付成功时间")
+    private String payTime;
+
+    @Schema(description = "汇付全局流水号(hf_seq_id)")
+    private String hfSeqId;
+
+    @Schema(description = "汇付方订单号(party_order_id)")
+    private String partyOrderId;
+
+    @Schema(description = "汇付商户订单号(req_seq_id) - 用于查询支付状态")
+    private String merchantOrderId;
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/request/PaymentCreateRequest.java

@@ -1,58 +0,0 @@
-
-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;
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/response/PaymentCreateResponse.java

@@ -1,28 +0,0 @@
-
-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;
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/response/PaymentQueryResponse.java

@@ -1,30 +0,0 @@
-
-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;
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/dto/response/PaymentRefundResponse.java

@@ -1,22 +0,0 @@
-
-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;
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/entity/PaymentOrder.java

@@ -0,0 +1,105 @@
+package cn.novalon.gym.manage.payment.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("payment_order")
+public class PaymentOrder implements Persistable<Long> {
+
+    @Id
+    private Long id;
+
+    @Column("order_no")
+    private String orderNo;
+
+    @Column("member_id")
+    private Long memberId;
+
+    @Column("order_type")
+    private String orderType;
+
+    @Column("goods_desc")
+    private String goodsDesc;
+
+    @Column("trans_amt")
+    private BigDecimal transAmt;
+
+    @Column("trade_type")
+    private String tradeType;
+
+    @Column("pay_status")
+    private String payStatus;
+
+    @Column("huifu_id")
+    private String huifuId;
+
+    @Column("req_seq_id")
+    private String reqSeqId;
+
+    @Column("req_date")
+    private String reqDate;
+
+    @Column("hf_seq_id")
+    private String hfSeqId;
+
+    @Column("party_order_id")
+    private String partyOrderId;
+
+    @Column("pay_info")
+    private String payInfo;
+
+    @Column("qr_code")
+    private String qrCode;
+
+    @Column("pay_url")
+    private String payUrl;
+
+    @Column("remark")
+    private String remark;
+
+    @Column("notify_url")
+    private String notifyUrl;
+
+    @Column("pay_time")
+    private LocalDateTime payTime;
+
+    @Column("expire_time")
+    private LocalDateTime expireTime;
+
+    @Column("error_code")
+    private String errorCode;
+
+    @Column("error_msg")
+    private String errorMsg;
+
+    @CreatedDate
+    @Column("created_at")
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column("updated_at")
+    private LocalDateTime updatedAt;
+
+    @Column("deleted_at")
+    private LocalDateTime deletedAt;
+
+    @Override
+    public boolean isNew() {
+        return createdAt == null;
+    }
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/handler/PaymentHandler.java

@@ -1,8 +1,9 @@
-
 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 cn.novalon.gym.manage.payment.dto.ApiResponse;
+import cn.novalon.gym.manage.payment.dto.CreatePaymentRequest;
+import cn.novalon.gym.manage.payment.service.PaymentService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -16,63 +17,231 @@ import java.util.Map;
 
 @Slf4j
 @Component
-@Tag(name = "支付管理", description = "斗拱聚合支付相关操作")
+@Tag(name = "支付管理", description = "支付宝App支付接口")
 public class PaymentHandler {
 
-    private final IPaymentService paymentService;
+    private final PaymentService paymentService;
+    private final AuthUtil authUtil;
 
-    public PaymentHandler(IPaymentService paymentService) {
+    public PaymentHandler(PaymentService paymentService, AuthUtil authUtil) {
         this.paymentService = paymentService;
+        this.authUtil = authUtil;
     }
 
-    @Operation(summary = "创建支付", description = "创建支付订单，支持微信、支付宝等多种支付方式")
+    @Operation(summary = "创建支付订单", description = "创建支付宝App支付订单")
     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())));
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return request.bodyToMono(CreatePaymentRequest.class)
+                .flatMap(createReq -> {
+                    log.info("[Payment] 创建支付订单: memberId={}, orderType={}, goodsDesc={}, transAmt={}",
+                            createReq.getEffectiveMemberId(), createReq.getOrderType(), createReq.getGoodsDesc(), createReq.getTransAmt());
+
+                    return paymentService.alipayAppPay(memberId, createReq)
+                            .flatMap(result -> {
+                                if ("FAIL".equals(result.getStatus())) {
+                                    return ServerResponse.ok()
+                                            .bodyValue(ApiResponse.error(result.getErrorMsg()));
+                                }
+                                return ServerResponse.ok()
+                                        .bodyValue(ApiResponse.success(result));
+                            });
+                })
+                .onErrorResume(e -> {
+                    log.error("[Payment] 创建支付订单异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("创建支付订单失败: " + e.getMessage()));
+                });
     }
 
-    @Operation(summary = "查询支付状态", description = "根据订单号查询支付状态")
-    public Mono<ServerResponse> queryPayment(ServerRequest request) {
+    @Operation(summary = "创建扫码支付订单", description = "创建支付宝扫码支付订单，返回二维码链接")
+    public Mono<ServerResponse> createQrCodePayment(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return request.bodyToMono(CreatePaymentRequest.class)
+                .flatMap(createReq -> {
+                    log.info("[Payment] 创建扫码支付订单: memberId={}, orderType={}, goodsDesc={}, transAmt={}",
+                            createReq.getEffectiveMemberId(), createReq.getOrderType(), createReq.getGoodsDesc(), createReq.getTransAmt());
+
+                    return paymentService.alipayQrCodePay(memberId, createReq)
+                            .flatMap(result -> {
+                                if ("FAIL".equals(result.getStatus())) {
+                                    return ServerResponse.ok()
+                                            .bodyValue(ApiResponse.error(result.getErrorMsg()));
+                                }
+                                return ServerResponse.ok()
+                                        .bodyValue(ApiResponse.success(result));
+                            });
+                })
+                .onErrorResume(e -> {
+                    log.error("[Payment] 创建扫码支付订单异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("创建扫码支付订单失败: " + e.getMessage()));
+                });
+    }
+
+    @Operation(summary = "查询支付状态", description = "查询支付订单状态")
+    public Mono<ServerResponse> getPaymentStatus(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
         String orderId = request.pathVariable("orderId");
-        return paymentService.queryPayment(orderId)
-                .flatMap(response -> ServerResponse.ok().bodyValue(response))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse(e.getMessage())));
+        log.info("[Payment] 查询支付状态: orderId={}", orderId);
+
+        return paymentService.getPaymentStatus(memberId, orderId)
+                .flatMap(result -> ServerResponse.ok().bodyValue(ApiResponse.success(result)))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 查询支付状态异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("查询支付状态失败: " + e.getMessage()));
+                });
     }
 
-    @Operation(summary = "退款", description = "根据订单号发起退款")
+    @Operation(summary = "汇付异步通知", description = "接收汇付异步回调通知")
+    public Mono<ServerResponse> huifuNotify(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        String respData = request.queryParam("resp_data").orElse(null);
+        String sign = request.queryParam("sign").orElse(null);
+
+        log.info("[Payment] 收到汇付异步通知: resp_data={}, sign={}", respData, sign);
+
+        Map<String, String> notifyParams = new HashMap<>();
+        notifyParams.put("resp_data", respData);
+        notifyParams.put("sign", sign);
+
+        return paymentService.handleAlipayNotify(notifyParams)
+                .flatMap(result -> ServerResponse.ok().bodyValue(result))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 处理异步通知异常", e);
+                    return ServerResponse.ok().bodyValue("FAIL");
+                });
+    }
+
+    @Operation(summary = "申请退款", description = "申请支付退款")
     public Mono<ServerResponse> refundPayment(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(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);
+                    log.info("[Payment] 申请退款: orderId={}, refundAmt={}", orderId, refundAmt);
+
+                    return paymentService.refund(memberId, orderId, refundAmt)
+                            .flatMap(success -> {
+                                if (success) {
+                                    return ServerResponse.ok()
+                                            .bodyValue(ApiResponse.success("退款申请成功"));
+                                } else {
+                                    return ServerResponse.ok()
+                                            .bodyValue(ApiResponse.error("退款申请失败"));
+                                }
+                            });
                 })
-                .flatMap(response -> ServerResponse.ok().bodyValue(response))
-                .onErrorResume(e -> ServerResponse.badRequest().bodyValue(buildErrorResponse("退款失败: " + e.getMessage())));
+                .onErrorResume(e -> {
+                    log.error("[Payment] 退款异常: orderId={}", orderId, e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("退款失败: " + 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())));
+    @Operation(summary = "查询所有交易记录", description = "查询所有未删除的支付订单记录")
+    public Mono<ServerResponse> getAllPaymentOrders(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        log.info("[Payment] 查询所有交易记录");
+
+        return paymentService.getAllPaymentOrders(memberId)
+                .collectList()
+                .flatMap(orders -> ServerResponse.ok()
+                        .bodyValue(ApiResponse.success(orders)))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 查询所有交易记录异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("查询失败: " + 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;
+    @Operation(summary = "查询斗拱交易列表", description = "查询斗拱商户端的交易记录列表")
+    public Mono<ServerResponse> queryHuifuTradeList(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        String beginDate = request.queryParam("beginDate").orElse(null);
+        String endDate = request.queryParam("endDate").orElse(null);
+
+        log.info("[Payment] 查询斗拱交易列表: beginDate={}, endDate={}", beginDate, endDate);
+
+        return paymentService.queryHuifuTradeList(memberId, beginDate, endDate)
+                .flatMap(result -> ServerResponse.ok()
+                        .bodyValue(ApiResponse.success(result)))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 查询斗拱交易列表异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("查询失败: " + e.getMessage()));
+                });
     }
 
-    private Map<String, Object> buildSuccessResponse(String message) {
-        Map<String, Object> response = new HashMap<>();
-        response.put("success", true);
-        response.put("message", message);
-        return response;
+    @Operation(summary = "按订单号查询斗拱交易", description = "通过商户订单号或汇付流水号查询单笔交易记录")
+    public Mono<ServerResponse> queryHuifuTradeByOrderId(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        String outOrdId = request.queryParam("outOrdId").orElse(null);
+        String hfSeqId = request.queryParam("hfSeqId").orElse(null);
+
+        log.info("[Payment] 查询斗拱交易: outOrdId={}, hfSeqId={}", outOrdId, hfSeqId);
+
+        if (outOrdId == null || outOrdId.isEmpty()) {
+            return ServerResponse.ok()
+                    .bodyValue(ApiResponse.error("订单号不能为空"));
+        }
+
+        return paymentService.queryHuifuTradeByOrderId(memberId, outOrdId, hfSeqId)
+                .flatMap(result -> ServerResponse.ok()
+                        .bodyValue(ApiResponse.success(result)))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 查询斗拱交易异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("查询失败: " + e.getMessage()));
+                });
+    }
+
+    @Operation(summary = "查询未支付订单", description = "查询会员指定类型的未支付订单")
+    public Mono<ServerResponse> getPendingOrder(ServerRequest request) {
+        Long memberId = Long.valueOf(request.pathVariable("memberId"));
+        String orderType = request.queryParam("orderType").orElse(null);
+
+        log.info("[Payment] 查询未支付订单: memberId={}, orderType={}", memberId, orderType);
+
+        if (orderType == null || orderType.isEmpty()) {
+            return ServerResponse.ok()
+                    .bodyValue(ApiResponse.error("订单类型不能为空"));
+        }
+
+        return paymentService.getPendingOrder(memberId, orderType)
+                .flatMap(order -> ServerResponse.ok()
+                        .bodyValue(ApiResponse.success(order)))
+                .switchIfEmpty(Mono.defer(() -> ServerResponse.ok()
+                        .bodyValue(ApiResponse.success(null))))
+                .onErrorResume(e -> {
+                    log.error("[Payment] 查询未支付订单异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("查询失败: " + e.getMessage()));
+                });
+    }
+
+    @Operation(summary = "关闭订单", description = "关闭指定的待支付订单")
+    public Mono<ServerResponse> closeOrder(ServerRequest request) {
+        Long memberId = authUtil.getMemberIdOrThrow(request);
+        String orderId = request.pathVariable("orderId");
+        log.info("[Payment] 关闭订单: orderId={}", orderId);
+
+        return paymentService.closeOrder(memberId, orderId)
+                .flatMap(success -> {
+                    if (success) {
+                        return ServerResponse.ok()
+                                .bodyValue(ApiResponse.success("订单关闭成功"));
+                    } else {
+                        return ServerResponse.ok()
+                                .bodyValue(ApiResponse.error("订单关闭失败"));
+                    }
+                })
+                .onErrorResume(e -> {
+                    log.error("[Payment] 关闭订单异常", e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("关闭失败: " + e.getMessage()));
+                });
     }
 }

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/handler/PaymentScheduledHandler.java

@@ -0,0 +1,45 @@
+package cn.novalon.gym.manage.payment.handler;
+
+import cn.novalon.gym.manage.payment.repository.PaymentOrderRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class PaymentScheduledHandler {
+
+    private final PaymentOrderRepository paymentOrderRepository;
+
+    private static final int BATCH_SIZE = 100;
+
+    @Scheduled(fixedRate = 60000)
+    public void closeExpiredOrders() {
+        log.info("[Payment] 开始执行超时订单关闭任务");
+
+        LocalDateTime now = LocalDateTime.now();
+
+        paymentOrderRepository.findExpiredOrders(now, BATCH_SIZE)
+                .flatMap(order -> {
+                    log.info("[Payment] 关闭超时订单, orderNo={}, expireTime={}", order.getOrderNo(), order.getExpireTime());
+                    return paymentOrderRepository.closeExpiredOrder(order.getId())
+                            .doOnSuccess(rows -> {
+                                if (rows != null && rows > 0) {
+                                    log.info("[Payment] 超时订单已关闭, orderNo={}", order.getOrderNo());
+                                }
+                            })
+                            .onErrorResume(e -> {
+                                log.error("[Payment] 关闭超时订单失败, orderNo={}", order.getOrderNo(), e);
+                                return Mono.empty();
+                            });
+                })
+                .then()
+                .doOnSuccess(v -> log.info("[Payment] 超时订单关闭任务完成"))
+                .subscribe();
+    }
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/repository/PaymentOrderRepository.java

@@ -0,0 +1,41 @@
+package cn.novalon.gym.manage.payment.repository;
+
+import cn.novalon.gym.manage.payment.entity.PaymentOrder;
+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 PaymentOrderRepository extends R2dbcRepository<PaymentOrder, Long> {
+
+    Mono<PaymentOrder> findByOrderNo(String orderNo);
+
+    Mono<PaymentOrder> findByReqSeqId(String reqSeqId);
+
+    @Query("SELECT * FROM payment_order WHERE member_id = :memberId AND order_type = :orderType AND pay_status = 'PENDING' AND deleted_at IS NULL ORDER BY created_at DESC LIMIT 1")
+    Mono<PaymentOrder> findLatestPendingOrder(Long memberId, String orderType);
+
+    @Query("SELECT * FROM payment_order WHERE pay_status = 'PENDING' AND expire_time < :now AND deleted_at IS NULL LIMIT :limit")
+    Flux<PaymentOrder> findExpiredOrders(LocalDateTime now, int limit);
+
+    @Modifying
+    @Query("UPDATE payment_order SET pay_status = :status, updated_at = NOW() WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateStatus(Long id, String status);
+
+    @Modifying
+    @Query("UPDATE payment_order SET pay_status = 'CLOSED', error_code = 'TIMEOUT', error_msg = '订单超时自动关闭', updated_at = NOW() WHERE id = :id AND pay_status = 'PENDING' AND deleted_at IS NULL")
+    Mono<Integer> closeExpiredOrder(Long id);
+
+    @Modifying
+    @Query("UPDATE payment_order SET pay_status = 'SUCCESS', hf_seq_id = :hfSeqId, pay_time = NOW(), updated_at = NOW() WHERE id = :id AND pay_status = 'PENDING' AND deleted_at IS NULL")
+    Mono<Integer> markPaid(Long id, String hfSeqId);
+
+    Flux<PaymentOrder> findAllByDeletedAtIsNull();
+
+    Flux<PaymentOrder> findByMemberIdAndDeletedAtIsNull(Long memberId);
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/service/IPaymentService.java

@@ -1,19 +0,0 @@
-
-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);
-}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/service/PaymentNotifyService.java

@@ -0,0 +1,9 @@
+package cn.novalon.gym.manage.payment.service;
+
+import reactor.core.publisher.Mono;
+
+public interface PaymentNotifyService {
+
+    Mono<Void> notifyPaymentStatus(String orderNo, String status,Long memberId);
+
+}

gym-manage-api/gym-payment/src/main/java/cn/novalon/gym/manage/payment/service/PaymentService.java

@@ -0,0 +1,33 @@
+package cn.novalon.gym.manage.payment.service;
+
+import cn.novalon.gym.manage.payment.dto.CreatePaymentRequest;
+import cn.novalon.gym.manage.payment.dto.PaymentResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+public interface PaymentService {
+
+    Mono<PaymentResponse> createPayment(Long memberId, CreatePaymentRequest request);
+
+    Mono<PaymentResponse> getPaymentStatus(Long memberId, String orderId);
+
+    Mono<PaymentResponse> alipayAppPay(Long memberId, CreatePaymentRequest request);
+
+    Mono<PaymentResponse> alipayQrCodePay(Long memberId, CreatePaymentRequest request);
+
+    Mono<String> handleAlipayNotify(Map<String, String> params);
+
+    Mono<Boolean> refund(Long memberId, String orderId, String refundAmt);
+
+    Flux<PaymentResponse> getAllPaymentOrders(Long memberId);
+
+    Mono<Map<String, Object>> queryHuifuTradeList(Long memberId, String beginDate, String endDate);
+
+    Mono<Map<String, Object>> queryHuifuTradeByOrderId(Long memberId, String outOrdId, String hfSeqId);
+
+    Mono<PaymentResponse> getPendingOrder(Long memberId, String orderType);
+
+    Mono<Boolean> closeOrder(Long memberId, String orderId);
+}

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

@@ -1 +0,0 @@
-cn.novalon.gym.manage.payment.config.HuifuPayConfig

gym-manage-api/gym-payment/src/test/java/ListAllQueryApis.java

@@ -0,0 +1,77 @@
+import com.huifu.bspay.sdk.opps.core.request.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListAllQueryApis {
+    public static void main(String[] args) {
+        System.out.println("=== 查找所有查询相关的请求类及字段 ===\n");
+        
+        List<Class<?>> queryClasses = new ArrayList<>();
+        
+        try {
+            Package pkg = V2TradePaymentScanpayQueryRequest.class.getPackage();
+            String pkgName = pkg.getName();
+            System.out.println("Package: " + pkgName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        Class<?>[] classes = {
+            V2TradePaymentScanpayQueryRequest.class,
+            V2TradeCheckFilequeryRequest.class,
+            V2TradeTransstatQueryRequest.class,
+            V2TradeSettleCollectionDetailQueryRequest.class,
+            V2TradeBatchtranslogQueryRequest.class,
+        };
+        
+        for (Class<?> clazz : classes) {
+            System.out.println("\n=== " + clazz.getSimpleName() + " ===");
+            System.out.println("functionCode: " + getFunctionCode(clazz));
+            System.out.println("所有setter方法:");
+            listSetters(clazz);
+        }
+    }
+    
+    private static String getFunctionCode(Class<?> clazz) {
+        try {
+            Object instance = clazz.getDeclaredConstructor().newInstance();
+            Field functionCodeField = clazz.getSuperclass().getDeclaredField("functionCode");
+            functionCodeField.setAccessible(true);
+            return String.valueOf(functionCodeField.get(instance));
+        } catch (Exception e) {
+            try {
+                Field functionCodeField = clazz.getDeclaredField("functionCode");
+                functionCodeField.setAccessible(true);
+                Object instance = clazz.getDeclaredConstructor().newInstance();
+                return String.valueOf(functionCodeField.get(instance));
+            } catch (Exception e2) {
+                return "unknown";
+            }
+        }
+    }
+    
+    private static void listSetters(Class<?> clazz) {
+        Method[] methods = clazz.getMethods();
+        List<String> setters = new ArrayList<>();
+        for (Method m : methods) {
+            if (m.getName().startsWith("set") && !m.getName().equals("setClass")) {
+                StringBuilder sb = new StringBuilder("  ");
+                sb.append(m.getName());
+                sb.append("(");
+                Class<?>[] params = m.getParameterTypes();
+                for (int i = 0; i < params.length; i++) {
+                    if (i > 0) sb.append(", ");
+                    sb.append(params[i].getSimpleName());
+                }
+                sb.append(")");
+                setters.add(sb.toString());
+            }
+        }
+        java.util.Collections.sort(setters);
+        for (String s : setters) {
+            System.out.println(s);
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestBatchtranslogQuery.java

@@ -0,0 +1,71 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.Set;
+
+public class TestBatchtranslogQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== V2TradeBatchtranslogQuery 批量交易日志查询测试 ==========");
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String weekAgo = java.time.LocalDate.now().minusDays(7).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            try {
+                V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+                request.setHuifuId(huifuId);
+                request.setBeginDate(weekAgo);
+                request.setEndDate(today);
+
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+                System.out.println();
+
+                Map<String, Object> response = BasePayClient.request(request, false);
+
+                System.out.println("响应: " + JSON.toJSONString(response, true));
+                System.out.println();
+
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                System.out.println("resp_code: " + respCode);
+                System.out.println("resp_desc: " + response.getOrDefault("resp_desc", ""));
+
+                System.out.println();
+                System.out.println("所有字段:");
+                Set<String> keys = response.keySet();
+                for (String key : keys) {
+                    System.out.println("  " + key);
+                }
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestBatchtranslogQuery2.java

@@ -0,0 +1,87 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.Set;
+
+public class TestBatchtranslogQuery2 {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== V2TradeBatchtranslogQuery 批量交易日志查询测试 ==========");
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String daysAgo30 = java.time.LocalDate.now().minusDays(30).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String daysAgo7 = java.time.LocalDate.now().minusDays(7).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String daysAgo5 = java.time.LocalDate.now().minusDays(5).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            System.out.println("测试1: 近30天");
+            testQuery(huifuId, daysAgo30, today);
+
+            System.out.println();
+            System.out.println("测试2: 近7天");
+            testQuery(huifuId, daysAgo7, today);
+
+            System.out.println();
+            System.out.println("测试3: 近5天");
+            testQuery(huifuId, daysAgo5, today);
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void testQuery(String huifuId, String beginDate, String endDate) {
+        try {
+            V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+            request.setHuifuId(huifuId);
+            request.setBeginDate(beginDate);
+            request.setEndDate(endDate);
+
+            System.out.println("  beginDate=" + beginDate + ", endDate=" + endDate);
+
+            Map<String, Object> response = BasePayClient.request(request, false);
+
+            String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+            String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+            System.out.println("  resp_code: " + respCode);
+            System.out.println("  resp_desc: " + respDesc);
+            System.out.println("  result_count: " + response.get("result_count"));
+            System.out.println("  page_num: " + response.get("page_num"));
+            System.out.println("  page_size: " + response.get("page_size"));
+
+            if ("00000000".equals(respCode)) {
+                System.out.println("  *** 查询成功！ ***");
+                Object transList = response.get("trans_log_result_list");
+                if (transList != null) {
+                    System.out.println("  交易列表: " + JSON.toJSONString(transList, true));
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("  调用失败: " + e.getMessage());
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestBatchtranslogQuery3.java

@@ -0,0 +1,78 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestBatchtranslogQuery3 {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== V2TradeBatchtranslogQuery 测试 ==========");
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String daysAgo90 = java.time.LocalDate.now().minusDays(90).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String daysAgo30 = java.time.LocalDate.now().minusDays(30).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            System.out.println("测试1: 近90天 (跨度90天)");
+            testQuery(huifuId, daysAgo90, today);
+
+            System.out.println();
+            System.out.println("测试2: 近30天 (跨度30天)");
+            testQuery(huifuId, daysAgo30, today);
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void testQuery(String huifuId, String beginDate, String endDate) {
+        try {
+            V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+            request.setHuifuId(huifuId);
+            request.setBeginDate(beginDate);
+            request.setEndDate(endDate);
+
+            System.out.println("  beginDate=" + beginDate + ", endDate=" + endDate);
+
+            Map<String, Object> response = BasePayClient.request(request, false);
+
+            String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+            String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+            System.out.println("  resp_code: " + respCode);
+            System.out.println("  resp_desc: " + respDesc);
+            System.out.println("  result_count: " + response.get("result_count"));
+
+            if ("00000000".equals(respCode)) {
+                System.out.println("  *** 查询成功！ ***");
+                Object transList = response.get("trans_log_result_list");
+                if (transList != null) {
+                    System.out.println("  交易列表: " + JSON.toJSONString(transList, true));
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("  调用失败: " + e.getMessage());
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestChannelQuery.java

@@ -0,0 +1,123 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeSettleCollectionDetailQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+
+public class TestChannelQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "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";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7PYy64gcO1Y44ntGFRdHzDJy6KnNoMLB6H5ZyCvqB2m2Bvzx18TMCjwevt5A4XF0ke9HfXRvZOL8TOaHdeiSbXWVBEpNsbQr0612U41cN688uHk4ShtoYuvSAbT0SuQULPh90BthzBrxrIuduex7qISk4d4mKvfM+tMTBQPWJc2au2yfTpisZPlKS5jg5xUCxG4UIze/xC4I92rVyVfziMm19Tzh1EXq4Hm1nXmRejgE2o2Hi/wu8Et6hj5UjZzPu3DPvzDN4AP372DP6EREYrVGYiD9qDqxx63jDqlGsdKmENXPp27gUqXX4vGD5xn0lOSXMHUQ5NUcXzdGbpWBBwIDAQAB";
+            String sysId = "6666000207573586";
+            String productId = "XLSISV";
+            String huifuId = "6666000207573586";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 渠道商ID查询测试 ==========");
+            System.out.println("渠道商huifuId: " + huifuId);
+            System.out.println();
+
+            String[] dates = {"20260620", "20260621", "20260622", "20260623", "20260624", "20260625", "20260626"};
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+
+            System.out.println("========== 1. 对账文件查询 ==========");
+            for (String date : dates) {
+                for (String billType : billTypes) {
+                    try {
+                        V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        request.setReqSeqId(SequenceTools.getReqSeqId32());
+                        request.setHuifuId(huifuId);
+                        request.setFileDate(date);
+
+                        Map<String, Object> extendInfoMap = new HashMap<>();
+                        extendInfoMap.put("bill_type", billType);
+                        request.setExtendInfo(extendInfoMap);
+
+                        Map<String, Object> response = BasePayClient.request(request, false);
+
+                        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                        
+                        boolean hasData = response.containsKey("file_details") || response.containsKey("file_list") 
+                            || response.containsKey("download_url") || response.containsKey("bill_list");
+                        
+                        if (hasData || !"00000000".equals(respCode)) {
+                            System.out.println("date=" + date + ", billType=" + billType + ": resp_code=" + respCode + ", resp_desc=" + respDesc + ", hasData=" + hasData);
+                            if (hasData) {
+                                System.out.println("  完整响应: " + JSON.toJSONString(response, true));
+                            }
+                        }
+                    } catch (Exception e) {
+                        System.out.println("date=" + date + ", billType=" + billType + ": 失败 - " + e.getMessage());
+                    }
+                }
+            }
+
+            System.out.println();
+            System.out.println("========== 2. 批量交易日志查询 ==========");
+            try {
+                V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+                request.setHuifuId(huifuId);
+                request.setBeginDate("20260620");
+                request.setEndDate("20260626");
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                String resultCount = String.valueOf(response.getOrDefault("result_count", ""));
+                
+                System.out.println("resp_code=" + respCode + ", resp_desc=" + respDesc + ", result_count=" + resultCount);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 3. 结算汇总明细查询 ==========");
+            try {
+                V2TradeSettleCollectionDetailQueryRequest request = new V2TradeSettleCollectionDetailQueryRequest();
+                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                request.setReqSeqId(SequenceTools.getReqSeqId32());
+                request.setBeginDate("20260620");
+                request.setEndDate("20260626");
+                request.setInHuifuId(huifuId);
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                String totalCount = String.valueOf(response.getOrDefault("total_count", ""));
+                
+                System.out.println("resp_code=" + respCode + ", resp_desc=" + respDesc + ", total_count=" + totalCount);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestCheckFileQuery.java

@@ -0,0 +1,73 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+
+public class TestCheckFileQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 对账单查询测试 ==========");
+            System.out.println("商户号: " + huifuId);
+            System.out.println();
+
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+            String[] dates = {"20260624", "20260625", "20260626"};
+
+            for (String date : dates) {
+                for (String billType : billTypes) {
+                    try {
+                        System.out.println("--- 查询: date=" + date + ", billType=" + billType + " ---");
+                        
+                        V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        request.setReqSeqId(SequenceTools.getReqSeqId32());
+                        request.setHuifuId(huifuId);
+                        request.setFileDate(date);
+
+                        Map<String, Object> extendInfoMap = new HashMap<>();
+                        extendInfoMap.put("bill_type", billType);
+                        request.setExtendInfo(extendInfoMap);
+
+                        Map<String, Object> response = BasePayClient.request(request, false);
+
+                        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                        System.out.println("响应码: " + respCode);
+                        System.out.println("响应描述: " + respDesc);
+                        System.out.println("完整响应: " + JSON.toJSONString(response, true));
+                        System.out.println();
+                    } catch (Exception e) {
+                        System.out.println("调用失败: " + e.getMessage());
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestCreateRequest.java

@@ -0,0 +1,13 @@
+import com.huifu.dg.lightning.models.payment.TradePaymentCreateRequest;
+
+public class TestCreateRequest {
+    public static void main(String[] args) {
+        System.out.println("=== TradePaymentCreateRequest 方法列表 ===");
+        java.lang.reflect.Method[] methods = TradePaymentCreateRequest.class.getMethods();
+        for (java.lang.reflect.Method m : methods) {
+            if (m.getName().startsWith("set") || m.getName().startsWith("get")) {
+                System.out.println("  " + m.getName());
+            }
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestCreateResponse.java

@@ -0,0 +1,14 @@
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestCreateResponse {
+    public static void main(String[] args) {
+        String sampleResponse = "{\"resp_code\":\"00000000\",\"resp_desc\":\"成功\",\"pay_url\":\"https://qr.alipay.com/bax06073aogec1i3hnxm25ca\",\"hf_seq_id\":\"002900TOP1B260626063214P375ac139c1e00000\",\"party_order_id\":\"03212606262353456318391\",\"trans_amt\":\"0.01\",\"goods_desc\":\"测试商品\"}";
+        Map<String, Object> response = JSON.parseObject(sampleResponse, Map.class);
+        
+        System.out.println("=== 汇付创建支付响应字段 ===");
+        for (Map.Entry<String, Object> entry : response.entrySet()) {
+            System.out.println("  " + entry.getKey() + ": " + entry.getValue());
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestMerchantOrderQuery.java

@@ -0,0 +1,101 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradePaymentScanpayQueryRequest;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestMerchantOrderQuery {
+    
+    public static void main(String[] args) {
+        try {
+            String merchantPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String merchantPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String merchantSysId = "6666000207581039";
+            String merchantHuifuId = "6666000207581039";
+            String productId = "XLSISV";
+            String skillSource = "hfps/1.3.0";
+            
+            String merchantOrderId = "20260626063214992n7xcukl8mp4cbx";
+            String hfSeqId = "002900TOP1B260626063214P375ac139c1e00000";
+            String channelHuifuId = "6666000207573586";
+            String queryDate = "20260626";
+            
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(merchantSysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(merchantPrivateKey);
+            merConfig.setRsaPublicKey(merchantPublicKey);
+            merConfig.setSkillSource(skillSource);
+            
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+            
+            System.out.println("========== 1. 使用商户ID + org_req_seq_id 查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(merchantHuifuId);
+                request.setOrgReqSeqId(merchantOrderId);
+                request.setOrgReqDate(queryDate);
+                
+                System.out.println("请求参数: huifuId=" + merchantHuifuId + ", orgReqSeqId=" + merchantOrderId + ", orgReqDate=" + queryDate);
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+            
+            System.out.println("\n========== 2. 使用商户ID + org_hf_seq_id 查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(merchantHuifuId);
+                request.setOrgHfSeqId(hfSeqId);
+                request.setOrgReqDate(queryDate);
+                
+                System.out.println("请求参数: huifuId=" + merchantHuifuId + ", orgHfSeqId=" + hfSeqId + ", orgReqDate=" + queryDate);
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+            
+            System.out.println("\n========== 3. 使用渠道商ID + org_req_seq_id 查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(channelHuifuId);
+                request.setOrgReqSeqId(merchantOrderId);
+                request.setOrgReqDate(queryDate);
+                
+                System.out.println("请求参数: huifuId=" + channelHuifuId + ", orgReqSeqId=" + merchantOrderId + ", orgReqDate=" + queryDate);
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestMoreDates.java

@@ -0,0 +1,100 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+
+public class TestMoreDates {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 测试更早日期的对账文件查询 ==========");
+            
+            String[] dates = {"20260620", "20260621", "20260622", "20260623", "20260624"};
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+            
+            for (String date : dates) {
+                for (String billType : billTypes) {
+                    try {
+                        System.out.println("--- 查询: date=" + date + ", billType=" + billType + " ---");
+                        
+                        V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        request.setReqSeqId(SequenceTools.getReqSeqId32());
+                        request.setHuifuId(huifuId);
+                        request.setFileDate(date);
+
+                        Map<String, Object> extendInfoMap = new HashMap<>();
+                        extendInfoMap.put("bill_type", billType);
+                        request.setExtendInfo(extendInfoMap);
+
+                        Map<String, Object> response = BasePayClient.request(request, false);
+
+                        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                        
+                        System.out.println("  响应码: " + respCode + ", 描述: " + respDesc);
+                        
+                        if ("00000000".equals(respCode)) {
+                            boolean hasData = false;
+                            String[] keys = {"file_details", "file_list", "task_details", "bill_list", "download_url", "file_name"};
+                            for (String key : keys) {
+                                Object val = response.get(key);
+                                if (val != null && !"null".equals(String.valueOf(val)) && !String.valueOf(val).isEmpty()) {
+                                    System.out.println("  " + key + ": " + JSON.toJSONString(val));
+                                    hasData = true;
+                                }
+                            }
+                            if (!hasData) {
+                                System.out.println("  (无明细数据)");
+                            }
+                        }
+                        System.out.println();
+                    } catch (Exception e) {
+                        System.out.println("  调用失败: " + e.getMessage());
+                    }
+                }
+            }
+            
+            System.out.println();
+            System.out.println("========== 测试批量交易日志查询 (更早日期范围) ==========");
+            try {
+                V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+                request.setHuifuId(huifuId);
+                request.setBeginDate("20260601");
+                request.setEndDate("20260626");
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                System.out.println("响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+            
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestOtherQueryApis.java

@@ -0,0 +1,88 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeSettleCollectionDetailQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestOtherQueryApis {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String yesterday = "20260625";
+            
+            System.out.println("========== 1. 批量交易日志查询 (V2TradeBatchtranslogQueryRequest) ==========");
+            try {
+                V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
+                request.setHuifuId(huifuId);
+                request.setBeginDate(yesterday);
+                request.setEndDate(today);
+                
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+                System.out.println();
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+            
+            System.out.println();
+            System.out.println("========== 2. 结算汇总明细查询 (V2TradeSettleCollectionDetailQueryRequest) ==========");
+            try {
+                V2TradeSettleCollectionDetailQueryRequest request = new V2TradeSettleCollectionDetailQueryRequest();
+                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                request.setReqSeqId(SequenceTools.getReqSeqId32());
+                request.setBeginDate(yesterday);
+                request.setEndDate(today);
+                request.setInHuifuId(huifuId);
+                
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+                System.out.println();
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+            
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestQueryRequest.java

@@ -0,0 +1,22 @@
+import com.huifu.dg.lightning.models.payment.TradePaymentScanpayQueryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradePaymentScanpayQueryRequest;
+
+public class TestQueryRequest {
+    public static void main(String[] args) {
+        System.out.println("=== V4 TradePaymentScanpayQueryRequest 方法列表 ===");
+        java.lang.reflect.Method[] methods4 = TradePaymentScanpayQueryRequest.class.getMethods();
+        for (java.lang.reflect.Method m : methods4) {
+            if (m.getName().startsWith("set") || m.getName().startsWith("get")) {
+                System.out.println("  " + m.getName());
+            }
+        }
+        
+        System.out.println("\n=== V2 V2TradePaymentScanpayQueryRequest 方法列表 ===");
+        java.lang.reflect.Method[] methods2 = V2TradePaymentScanpayQueryRequest.class.getMethods();
+        for (java.lang.reflect.Method m : methods2) {
+            if (m.getName().startsWith("set") || m.getName().startsWith("get")) {
+                System.out.println("  " + m.getName());
+            }
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestQueryWithOrgFields.java

@@ -0,0 +1,86 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradePaymentScanpayQueryRequest;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestQueryWithOrgFields {
+    public static void main(String[] args) {
+        try {
+            String merchantPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String merchantPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String merchantSysId = "6666000207581039";
+            String merchantHuifuId = "6666000207581039";
+            String productId = "XLSISV";
+            String skillSource = "hfps/1.3.0";
+
+            String outOrdId = "20260626063214992n7xcukl8mp4cbx";
+            String hfSeqId = "002900TOP1B260626063214P375ac139c1e00000";
+
+            System.out.println("========== 测试单笔交易查询（使用org字段）==========");
+            System.out.println("商户订单号: " + outOrdId);
+            System.out.println("汇付流水号: " + hfSeqId);
+            System.out.println();
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(merchantSysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(merchantPrivateKey);
+            merConfig.setRsaPublicKey(merchantPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 1. 使用 org_hf_seq_id 查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(merchantHuifuId);
+                request.setOrgHfSeqId(hfSeqId);
+                request.setOrgReqDate("20260626");
+                
+                System.out.println("请求参数: huifuId=" + merchantHuifuId + ", orgHfSeqId=" + hfSeqId + ", orgReqDate=20260626");
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 2. 使用 org_req_seq_id + org_req_date 查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(merchantHuifuId);
+                request.setOrgReqSeqId(outOrdId);
+                request.setOrgReqDate("20260626");
+                
+                System.out.println("请求参数: huifuId=" + merchantHuifuId + ", orgReqSeqId=" + outOrdId + ", orgReqDate=20260626");
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestQueryWithRealOrder.java

@@ -0,0 +1,77 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradePaymentScanpayQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestQueryWithRealOrder {
+    public static void main(String[] args) {
+        try {
+            String merchantPrivateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String merchantPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String merchantSysId = "6666000207581039";
+            String merchantHuifuId = "6666000207581039";
+            String productId = "XLSISV";
+            String skillSource = "hfps/1.3.0";
+
+            String outOrdId = "20260626063214992n7xcukl8mp4cbx";
+            String hfSeqId = "002900TOP1B260626063214P375ac139c1e00000";
+
+            System.out.println("========== 测试单笔交易查询 ==========");
+            System.out.println("商户订单号: " + outOrdId);
+            System.out.println("汇付流水号: " + hfSeqId);
+            System.out.println();
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(merchantSysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(merchantPrivateKey);
+            merConfig.setRsaPublicKey(merchantPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 1. V2 扫码支付查询 - 按商户订单号查询 ==========");
+            try {
+                V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+                request.setHuifuId(merchantHuifuId);
+                request.setOutOrdId(outOrdId);
+                
+                System.out.println("请求参数: huifuId=" + merchantHuifuId + ", outOrdId=" + outOrdId);
+                
+                Map<String, Object> response = BasePayClient.request(request, false);
+                
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 2. V2TradePaymentScanpayQueryRequest 所有方法 ==========");
+            try {
+                java.lang.reflect.Method[] methods = V2TradePaymentScanpayQueryRequest.class.getMethods();
+                for (java.lang.reflect.Method m : methods) {
+                    if (m.getName().startsWith("set") || m.getName().startsWith("get")) {
+                        System.out.println("  " + m.getName());
+                    }
+                }
+            } catch (Exception e) {
+                System.out.println("获取方法失败: " + e.getMessage());
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestReconciliationDetail.java

@@ -0,0 +1,101 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+
+public class TestReconciliationDetail {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 斗拱对账单查询 - 详细响应分析 ==========");
+            System.out.println();
+
+            String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            
+            System.out.println("测试日期: " + yesterday);
+            System.out.println();
+
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL", "FEE_BILL", "REFUND_BILL"};
+
+            for (String billType : billTypes) {
+                System.out.println("--------------------------------------------------");
+                System.out.println("账单类型: " + billType);
+                System.out.println("--------------------------------------------------");
+                try {
+                    V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                    request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                    request.setReqSeqId(SequenceTools.getReqSeqId32());
+                    request.setHuifuId(huifuId);
+                    request.setFileDate(yesterday);
+
+                    Map<String, Object> extendInfoMap = new HashMap<>();
+                    extendInfoMap.put("bill_type", billType);
+                    request.setExtendInfo(extendInfoMap);
+
+                    Map<String, Object> response = BasePayClient.request(request, false);
+
+                    String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                    String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                    System.out.println("resp_code: " + respCode);
+                    System.out.println("resp_desc: " + respDesc);
+                    System.out.println();
+                    System.out.println("所有响应字段:");
+                    Set<String> keys = response.keySet();
+                    for (String key : keys) {
+                        Object value = response.get(key);
+                        String valueStr = value != null ? value.toString() : "null";
+                        if (valueStr.length() > 100) {
+                            valueStr = valueStr.substring(0, 100) + "...";
+                        }
+                        System.out.println("  " + key + " = " + valueStr);
+                    }
+                    System.out.println();
+
+                    if ("00000000".equals(respCode)) {
+                        Object fileDetails = response.get("file_details");
+                        if (fileDetails != null) {
+                            System.out.println("*** 找到 file_details！ ***");
+                            System.out.println("file_details 类型: " + fileDetails.getClass().getName());
+                            System.out.println("file_details 内容: " + JSON.toJSONString(fileDetails, true));
+                            return;
+                        }
+                        Object taskDetails = response.get("task_details");
+                        if (taskDetails != null) {
+                            System.out.println("*** 找到 task_details！ ***");
+                            System.out.println("task_details 内容: " + JSON.toJSONString(taskDetails, true));
+                        }
+                    }
+                } catch (Exception e) {
+                    System.out.println("调用失败: " + e.getMessage());
+                }
+                System.out.println();
+            }
+
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestReconciliationProd.java

@@ -0,0 +1,91 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+
+public class TestReconciliationProd {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 斗拱官方交易对账单查询测试（生产环境）==========");
+            System.out.println("环境: 生产环境");
+            System.out.println("商户号: " + huifuId);
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String dayBeforeYesterday = java.time.LocalDate.now().minusDays(2).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            
+            String[] testDates = {today, yesterday, dayBeforeYesterday};
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+
+            for (String testDate : testDates) {
+                for (String billType : billTypes) {
+                    System.out.println("--------------------------------------------------");
+                    System.out.println("测试日期: " + testDate + ", 账单类型: " + billType);
+                    System.out.println("--------------------------------------------------");
+                    try {
+                        V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        request.setReqSeqId(SequenceTools.getReqSeqId32());
+                        request.setHuifuId(huifuId);
+                        request.setFileDate(testDate);
+
+                        Map<String, Object> extendInfoMap = new HashMap<>();
+                        extendInfoMap.put("bill_type", billType);
+                        request.setExtendInfo(extendInfoMap);
+
+                        System.out.println("请求参数: " + JSON.toJSONString(request));
+
+                        Map<String, Object> response = BasePayClient.request(request, false);
+
+                        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                        System.out.println("响应码: " + respCode);
+                        System.out.println("响应描述: " + respDesc);
+                        System.out.println("完整响应: " + JSON.toJSONString(response, true));
+
+                        if ("00000000".equals(respCode)) {
+                            System.out.println("*** 查询成功！ ***");
+                            Object fileDetails = response.get("file_details");
+                            if (fileDetails != null && !"null".equals(String.valueOf(fileDetails))) {
+                                System.out.println("*** 找到对账单文件！ ***");
+                                return;
+                            }
+                        }
+                        System.out.println();
+                    } catch (Exception e) {
+                        System.out.println("调用失败: " + e.getMessage());
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestSettlementQuery.java

@@ -0,0 +1,58 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeSettleCollectionDetailQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestSettlementQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 测试结算汇总明细查询（生产环境）==========");
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String weekAgo = java.time.LocalDate.now().minusDays(7).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            System.out.println("----- 结算汇总明细查询 -----");
+            try {
+                V2TradeSettleCollectionDetailQueryRequest request = new V2TradeSettleCollectionDetailQueryRequest();
+                request.setReqDate(today);
+                request.setReqSeqId(SequenceTools.getReqSeqId32());
+                request.setBeginDate(weekAgo);
+                request.setEndDate(today);
+                request.setInHuifuId(huifuId);
+
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+                Map<String, Object> response = BasePayClient.request(request, false);
+                System.out.println("响应: " + JSON.toJSONString(response, true));
+            } catch (Exception e) {
+                System.out.println("查询失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestSingleQuery.java

@@ -0,0 +1,48 @@
+import com.huifu.dg.lightning.factory.Factory;
+import com.huifu.dg.lightning.biz.client.CommonPayClient;
+import com.huifu.dg.lightning.models.payment.TradePaymentScanpayQueryRequest;
+import com.huifu.dg.lightning.utils.BasePay;
+import com.huifu.dg.lightning.biz.config.MerConfig;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestSingleQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            MerConfig merConfig = new MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            BasePay.prodMode = BasePay.MODE_PROD;
+            BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== V4 单笔交易查询测试 ==========");
+
+            CommonPayClient client = Factory.Payment.Common();
+
+            TradePaymentScanpayQueryRequest queryRequest = new TradePaymentScanpayQueryRequest();
+            queryRequest.setReqDate("20260626");
+            queryRequest.setReqSeqId(com.huifu.dg.lightning.utils.SequenceTools.getReqSeqId32());
+            queryRequest.setHuifuId(huifuId);
+            queryRequest.setOutOrdId("20260626063214982n7cuxk8mp4cbbx");
+
+            Map<String, Object> response = client.query(queryRequest);
+
+            System.out.println("查询响应:");
+            System.out.println(JSON.toJSONString(response, true));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestTransstat.java

@@ -0,0 +1,71 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeTransstatQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestTransstat {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 交易状态查询测试 ==========");
+            System.out.println("商户号: " + huifuId);
+            System.out.println();
+
+            try {
+                V2TradeTransstatQueryRequest request = new V2TradeTransstatQueryRequest();
+                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                request.setHuifuId(huifuId);
+                request.setPageNo("1");
+                request.setPageSize("20");
+
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+                System.out.println();
+
+                Map<String, Object> response = BasePayClient.request(request, false);
+
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+
+                if ("00000000".equals(respCode)) {
+                    System.out.println();
+                    System.out.println("*** 查询成功！ ***");
+                    Object transDetails = response.get("trans_details");
+                    if (transDetails != null) {
+                        System.out.println("trans_details: " + transDetails);
+                    }
+                }
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestTransstatQuery.java

@@ -0,0 +1,66 @@
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeTransstatQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestTransstatQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 斗拱官方交易状态查询测试（生产环境）==========");
+            System.out.println("环境: 生产环境");
+            System.out.println("商户号: " + huifuId);
+            System.out.println();
+
+            try {
+                V2TradeTransstatQueryRequest request = new V2TradeTransstatQueryRequest();
+                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                request.setHuifuId(huifuId);
+                request.setPageNo("1");
+                request.setPageSize("10");
+
+                System.out.println("请求参数: " + JSON.toJSONString(request));
+
+                Map<String, Object> response = BasePayClient.request(request, false);
+
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                System.out.println("响应码: " + respCode);
+                System.out.println("响应描述: " + respDesc);
+                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+
+                if ("00000000".equals(respCode)) {
+                    System.out.println("*** 查询成功！ ***");
+                }
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/TestV4SingleQuery.java

@@ -0,0 +1,74 @@
+import com.huifu.dg.lightning.factory.Factory;
+import com.huifu.dg.lightning.biz.client.CommonPayClient;
+import com.huifu.dg.lightning.models.payment.TradePaymentScanpayQueryRequest;
+import com.huifu.dg.lightning.utils.BasePay;
+import com.huifu.dg.lightning.biz.config.MerConfig;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+
+public class TestV4SingleQuery {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            MerConfig merConfig = new MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            BasePay.prodMode = BasePay.MODE_PROD;
+            BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== V4 闪电支付单笔查询测试（生产环境）==========");
+            System.out.println();
+
+            try {
+                CommonPayClient client = Factory.Payment.Common();
+
+                TradePaymentScanpayQueryRequest queryRequest = new TradePaymentScanpayQueryRequest();
+                queryRequest.setReqDate("20260626");
+                queryRequest.setReqSeqId(com.huifu.dg.lightning.utils.SequenceTools.getReqSeqId32());
+                queryRequest.setHuifuId(huifuId);
+                queryRequest.setOutOrdId("PAY20260626110000test001");
+
+                System.out.println("查询请求: outOrdId=PAY20260626110000test001");
+                System.out.println();
+
+                Map<String, Object> response = client.query(queryRequest);
+
+                System.out.println("查询响应:");
+                System.out.println(JSON.toJSONString(response, true));
+
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                System.out.println();
+                System.out.println("resp_code: " + respCode);
+                System.out.println("resp_desc: " + response.getOrDefault("resp_desc", ""));
+
+                if ("00000000".equals(respCode)) {
+                    System.out.println("*** 查询成功！ ***");
+                } else if ("00000100".equals(respCode)) {
+                    System.out.println("*** 交易处理中 ***");
+                } else {
+                    System.out.println("*** 查询失败或交易不存在 ***");
+                }
+
+            } catch (Exception e) {
+                System.out.println("调用失败: " + e.getMessage());
+                e.printStackTrace();
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/gym-payment/src/test/java/cn/novalon/gym/manage/payment/CheckTransstatFields.java

@@ -0,0 +1,50 @@
+package cn.novalon.gym.manage.payment;
+
+import com.huifu.bspay.sdk.opps.core.request.V2TradeTransstatQueryRequest;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
+import com.alibaba.fastjson.JSON;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class CheckTransstatFields {
+    public static void main(String[] args) {
+        System.out.println("========== V2TradeTransstatQueryRequest 字段 ==========");
+        Field[] fields = V2TradeTransstatQueryRequest.class.getDeclaredFields();
+        for (Field f : fields) {
+            System.out.println("  " + f.getName() + " : " + f.getType().getSimpleName());
+        }
+        
+        System.out.println("\n========== V2TradeTransstatQueryRequest 方法 ==========");
+        Method[] methods = V2TradeTransstatQueryRequest.class.getDeclaredMethods();
+        for (Method m : methods) {
+            if (m.getName().startsWith("set") || m.getName().startsWith("get")) {
+                System.out.println("  " + m.getName() + " : " + m.getReturnType().getSimpleName());
+            }
+        }
+        
+        System.out.println("\n========== V2TradeTransstatQueryRequest 父类字段 ==========");
+        Field[] superFields = V2TradeTransstatQueryRequest.class.getSuperclass().getDeclaredFields();
+        for (Field f : superFields) {
+            System.out.println("  " + f.getName() + " : " + f.getType().getSimpleName());
+        }
+        
+        System.out.println("\n========== V2TradeBatchtranslogQueryRequest 字段 ==========");
+        Field[] fields2 = V2TradeBatchtranslogQueryRequest.class.getDeclaredFields();
+        for (Field f : fields2) {
+            System.out.println("  " + f.getName() + " : " + f.getType().getSimpleName());
+        }
+        
+        System.out.println("\n========== 测试构造 V2TradeTransstatQueryRequest ==========");
+        V2TradeTransstatQueryRequest req = new V2TradeTransstatQueryRequest();
+        req.setReqDate("20260626");
+        req.setHuifuId("6666000207581039");
+        req.setPageNo("1");
+        req.setPageSize("50");
+        java.util.Map<String, Object> extendInfo = new java.util.HashMap<>();
+        extendInfo.put("begin_date", "20260625");
+        extendInfo.put("end_date", "20260626");
+        extendInfo.put("trade_type", "A_NATIVE");
+        req.setExtendInfo(extendInfo);
+        System.out.println(JSON.toJSONString(req, true));
+    }
+}

gym-manage-api/gym-payment/src/test/java/cn/novalon/gym/manage/payment/TestReconciliation.java

@@ -0,0 +1,101 @@
+package cn.novalon.gym.manage.payment;
+
+import com.huifu.bspay.sdk.opps.client.BasePayClient;
+import com.huifu.bspay.sdk.opps.core.request.V2TradeCheckFilequeryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.alibaba.fastjson.JSON;
+import java.util.Map;
+import java.util.HashMap;
+
+public class TestReconciliation {
+    public static void main(String[] args) {
+        try {
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+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=";
+            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
+            String sysId = "6666000207581039";
+            String productId = "XLSISV";
+            String huifuId = "6666000207581039";
+            String skillSource = "hfps/1.3.0";
+
+            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
+            merConfig.setSysId(sysId);
+            merConfig.setProductId(productId);
+            merConfig.setRsaPrivateKey(privateKey);
+            merConfig.setRsaPublicKey(huifuPublicKey);
+            merConfig.setSkillSource(skillSource);
+
+            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_TEST;
+            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
+
+            System.out.println("========== 斗拱官方交易对账单查询测试 ==========");
+            System.out.println("环境: 测试环境");
+            System.out.println("商户号: " + huifuId);
+            System.out.println();
+
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            String dayBeforeYesterday = java.time.LocalDate.now().minusDays(2).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            
+            String[] testDates = {today, yesterday, dayBeforeYesterday};
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+
+            for (String testDate : testDates) {
+                for (String billType : billTypes) {
+                    System.out.println("--------------------------------------------------");
+                    System.out.println("测试日期: " + testDate + ", 账单类型: " + billType);
+                    System.out.println("--------------------------------------------------");
+                    try {
+                        V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        request.setReqSeqId(SequenceTools.getReqSeqId32());
+                        request.setHuifuId(huifuId);
+                        request.setFileDate(testDate);
+
+                        Map<String, Object> extendInfoMap = new HashMap<>();
+                        extendInfoMap.put("bill_type", billType);
+                        request.setExtendInfo(extendInfoMap);
+
+                        System.out.println("请求参数: " + JSON.toJSONString(request));
+
+                        Map<String, Object> response = BasePayClient.request(request, false);
+
+                        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+                        Object fileDetails = response.get("file_details");
+                        Object taskDetails = response.get("task_details");
+
+                        System.out.println("响应码: " + respCode);
+                        System.out.println("响应描述: " + respDesc);
+                        
+                        if (fileDetails != null) {
+                            System.out.println("文件明细: " + JSON.toJSONString(fileDetails, true));
+                        }
+                        if (taskDetails != null) {
+                            System.out.println("任务明细: " + JSON.toJSONString(taskDetails, true));
+                        }
+
+                        if ("00000000".equals(respCode)) {
+                            System.out.println("*** 查询成功！ ***");
+                            if (fileDetails != null && !"null".equals(String.valueOf(fileDetails))) {
+                                System.out.println("*** 找到对账单文件！ ***");
+                                System.out.println("完整响应: " + JSON.toJSONString(response, true));
+                                return;
+                            }
+                        }
+                        System.out.println();
+                    } catch (Exception e) {
+                        System.out.println("调用失败: " + e.getMessage());
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            System.out.println();
+            System.out.println("========== 测试结束 ==========");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

gym-manage-api/info/6666000208197943.txt

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