移除流程中的支付相关和会员卡相关

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

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;
@@ -52,32 +52,24 @@ public class CheckServiceImpl implements ICheckInService {
 
     @Override
     public Mono<QRCodeVo> getQRCode(Long memberId) {
-        log.info("开始查询会员信息, memberId: {}", memberId);
+        log.info("开始生成会员签到二维码, memberId: {}", memberId);
         
-        return findValidMemberCard(memberId)
-                .flatMap(cardRecord -> {
-                    log.info("会员信息查询完成, memberCardRecordId: {}", cardRecord.getMemberCardRecordId());
-                    
-                    log.info("开始生成二维码");
-                    String qrContent = QRRedisKey.generateQrcodeContent();
-                    Map<String, Object> redisMap = new HashMap<>();
-                    redisMap.put("qrContent", qrContent);
-                    redisMap.put("isUsed", false);
-                    redisMap.put("memberId", memberId);
-                    redisMap.put("memberCardRecordId", cardRecord.getMemberCardRecordId());
+        String qrContent = QRRedisKey.generateQrcodeContent();
+        Map<String, Object> redisMap = new HashMap<>();
+        redisMap.put("qrContent", qrContent);
+        redisMap.put("isUsed", false);
+        redisMap.put("memberId", memberId);
 
-                    return redisUtil.setWithExpire(
-                                    RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
-                                    redisMap,
-                                    getSecondsUntilEndOfDay()
-                            )
-                            .then(Mono.fromSupplier(() -> {
-                                String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
-                                        BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
-                                return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
-                            }));
-                })
-                .switchIfEmpty(Mono.error(new RuntimeException("该会员没有可用的会员卡")));
+        return redisUtil.setWithExpire(
+                        RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
+                        redisMap,
+                        getSecondsUntilEndOfDay()
+                )
+                .then(Mono.fromSupplier(() -> {
+                    String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
+                            BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
+                    return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
+                }));
     }
 
     @Override
@@ -113,9 +105,10 @@ public class CheckServiceImpl implements ICheckInService {
                             }
                             log.info("二维码匹配成功，memberId: {}", memberId);
 
-                            Long memberCardRecordId = ((Number) map.get("memberCardRecordId")).longValue();
+                        Long memberCardRecordId = map.get("memberCardRecordId") != null 
+                                ? ((Number) map.get("memberCardRecordId")).longValue() : null;
 
-                            return processCheckIn(memberId, memberCardRecordId, map, qrContent);
+                        return processCheckIn(memberId, memberCardRecordId, map, qrContent);
                         } else {
                             MyWebSocketHandler.sendFailure(qrContent, "二维码无效");
                             return Mono.error(new RuntimeException("二维码无效"));
@@ -145,54 +138,23 @@ public class CheckServiceImpl implements ICheckInService {
         LocalDateTime now = LocalDateTime.now();
         
         // 发送实时进度通知
-        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_CARD", "正在验证会员卡...");
-        
-        return memberCardRecordRepository.findById(memberCardRecordId)
-                .switchIfEmpty(Mono.defer(() -> {
-                    MyWebSocketHandler.sendFailure(qrContent, "会员卡记录不存在");
-                    return Mono.error(new RuntimeException("会员卡记录不存在"));
-                }))
-                .flatMap(cardRecord -> {
-                    if (!"ACTIVE".equals(cardRecord.getStatus().name())) {
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡状态不正确");
-                        return Mono.error(new RuntimeException("会员卡状态不正确"));
-                    }
+        MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "正在检查预约信息...");
+
+        // 检查是否有需要签到的团课预约
+        return validateBooking(memberId, now)
+                .then(Mono.defer(() -> {
+                    redisMap.put("isUsed", true);
+                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
                     
-                    if (cardRecord.getExpireTime() != null && cardRecord.getExpireTime().isBefore(now)) {
-                        MyWebSocketHandler.sendFailure(qrContent, "会员卡已过期");
-                        return Mono.error(new RuntimeException("会员卡已过期"));
-                    }
-
-                    // 发送实时进度通知
-                    MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
-
-                    // 检查是否有需要签到的团课预约
-                    return validateBooking(memberId, now)
-                            .then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
-                                    .switchIfEmpty(Mono.defer(() -> {
-                                        MyWebSocketHandler.sendFailure(qrContent, "会员卡类型不存在");
-                                        return Mono.error(new RuntimeException("会员卡类型不存在"));
-                                    }))
-                                    .flatMap(card -> {
-                                        // 发送实时进度通知
-                                        MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
-                                        
-                                        return deductCardUsage(cardRecord, card)
-                                                .flatMap(updatedRecord -> {
-                                                    redisMap.put("isUsed", true);
-                                                    redisMap.put("checkInTime", now.format(DATE_FORMATTER));
-                                                    
-                                                    return saveSignInRecord(memberId, cardRecord.getMemberCardRecordId(), card.getMemberCardId())
-                                                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
-                                                            .then(Mono.defer(() -> {
-                                                                String successMsg = buildSuccessResponse(now);
-                                                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
-                                                                log.info("签到成功, memberId: {}, cardRecordId: {}", memberId, memberCardRecordId);
-                                                                return Mono.just(successMsg);
-                                                            }));
-                                                });
-                                    }));
-                });
+                    return saveSignInRecord(memberId, null, null)
+                            .then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
+                            .then(Mono.defer(() -> {
+                                String successMsg = buildSuccessResponse(now);
+                                MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
+                                log.info("签到成功, memberId: {}", memberId);
+                                return Mono.just(successMsg);
+                            }));
+                }));
     }
 
     /**

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

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

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

@@ -67,7 +67,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>5.2.5</version>
+        </dependency>
+
+        <!-- Fix commons-compress version for POI compatibility -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
         </dependency>
 
         <!-- Gym Modules -->

gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/DataStatistics.java

@@ -59,6 +59,12 @@ public class DataStatistics {
         public static final String WEEK = "WEEK";
         /** 月统计 */
         public static final String MONTH = "MONTH";
+        /** 近30天 */
+        public static final String LAST_30_DAYS = "LAST_30_DAYS";
+        /** 近90天 */
+        public static final String LAST_90_DAYS = "LAST_90_DAYS";
+        /** 今年 */
+        public static final String YEAR = "YEAR";
 
         private PeriodType() {}
     }

gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/impl/DataStatisticsServiceImpl.java

@@ -458,13 +458,16 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
         String periodType = query.getPeriodType();
 
         if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
-            // 周统计：本周一
             return today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay();
         } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
-            // 月统计：本月第一天
             return today.withDayOfMonth(1).atStartOfDay();
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
+            return today.minusDays(29).atStartOfDay();
+        } else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
+            return today.minusDays(89).atStartOfDay();
+        } else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            return today.withDayOfYear(1).atStartOfDay();
         } else {
-            // 日统计：当天零点
             return today.atStartOfDay();
         }
     }
@@ -478,13 +481,14 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
         String periodType = query.getPeriodType();
 
         if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
-            // 周统计：本周日 23:59:59
             return today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)).atTime(23, 59, 59);
         } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
-            // 月统计：本月最后一天 23:59:59
             return today.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)
+                || DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)
+                || DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            return LocalDateTime.now();
         } else {
-            // 日统计：当前时间
             return LocalDateTime.now();
         }
     }
@@ -503,6 +507,15 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
         } else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
             startTime = date.withDayOfMonth(1).atStartOfDay();
             endTime = date.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
+            startTime = date.minusDays(29).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
+            startTime = date.minusDays(89).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
+        } else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
+            startTime = date.withDayOfYear(1).atStartOfDay();
+            endTime = date.atTime(23, 59, 59);
         } else {
             startTime = date.atStartOfDay();
             endTime = date.plusDays(1).atStartOfDay();

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

@@ -93,6 +93,21 @@
             <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>
+        -->
+        
+        <!-- 文件管理模块（统一文件存储） -->
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>manage-file</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -61,6 +61,12 @@ public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookin
      */
     Mono<Long> countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
 
+    /**
+     * 统计会员取消的预约次数
+     */
+    @org.springframework.data.r2dbc.repository.Query("SELECT COUNT(*) FROM group_course_booking WHERE member_id = :memberId AND status = '1' AND deleted_at IS NULL")
+    Mono<Long> countCancelledByMemberId(Long memberId);
+
     /**
      * 查询会员是否有时间冲突的预约（状态为已预约且未取消）
      * 时间冲突条件：新课程的开始时间 < 已预约课程的结束时间 且 新课程的结束时间 > 已预约课程的开始时间

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.dao;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
 import org.springframework.data.domain.Sort;
@@ -40,6 +41,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 +54,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,8 +160,8 @@ 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.setQrCodePath(row.get("qr_code_path", String.class));
             entity.setCreateBy(row.get("create_by", String.class));
             entity.setUpdateBy(row.get("update_by", String.class));
             entity.setCreatedAt(row.get("created_at", LocalDateTime.class));
@@ -173,6 +179,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");
@@ -221,4 +228,99 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
 
         return spec.map((row, meta) -> row.get(0, Long.class)).one();
     }
+
+    /**
+     * 分页查询团课（支持 keyword 和 status 过滤）
+     */
+    default Flux<GroupCourseEntity> findByPageFiltered(DatabaseClient databaseClient, PageRequest pageRequest) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            conditions.add("course_name ILIKE :keyword");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            conditions.add("status = :status");
+        }
+
+        if (!conditions.isEmpty()) {
+            sql.append(" AND ").append(String.join(" AND ", conditions));
+        }
+
+        String sort = pageRequest.getSort() != null ? pageRequest.getSort() : "id";
+        String order = "desc".equalsIgnoreCase(pageRequest.getOrder()) ? "DESC" : "ASC";
+        sql.append(" ORDER BY ").append(sort).append(" ").append(order);
+
+        int size = pageRequest.getSize();
+        if (size < 1) size = 10;
+        if (size > 100) size = 100;
+        int offset = pageRequest.getPage() * size;
+        sql.append(" LIMIT :limit OFFSET :offset");
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            spec = spec.bind("keyword", "%" + pageRequest.getKeyword() + "%");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            spec = spec.bind("status", pageRequest.getStatus());
+        }
+        spec = spec.bind("limit", size);
+        spec = spec.bind("offset", offset);
+
+        return spec.map((row, meta) -> {
+            GroupCourseEntity entity = new GroupCourseEntity();
+            entity.setId(row.get("id", Long.class));
+            entity.setCourseName(row.get("course_name", String.class));
+            entity.setCoachId(row.get("coach_id", Long.class));
+            entity.setCourseType(row.get("course_type", Long.class));
+            entity.setStartTime(row.get("start_time", LocalDateTime.class));
+            entity.setEndTime(row.get("end_time", LocalDateTime.class));
+            entity.setMaxMembers(row.get("max_members", Integer.class));
+            entity.setCurrentMembers(row.get("current_members", Integer.class));
+            String statusStr = row.get("status", String.class);
+            entity.setStatus(statusStr != null ? Long.parseLong(statusStr) : null);
+            entity.setLocation(row.get("location", String.class));
+            entity.setCoverImage(row.get("cover_image", String.class));
+            entity.setDescription(row.get("description", String.class));
+            entity.setStoredValueAmount(row.get("stored_value_amount", java.math.BigDecimal.class));
+            entity.setQrCodePath(row.get("qr_code_path", String.class));
+            entity.setCreateBy(row.get("create_by", String.class));
+            entity.setUpdateBy(row.get("update_by", String.class));
+            entity.setCreatedAt(row.get("created_at", LocalDateTime.class));
+            entity.setUpdatedAt(row.get("updated_at", LocalDateTime.class));
+            entity.setDeletedAt(row.get("deleted_at", LocalDateTime.class));
+            return entity;
+        }).all();
+    }
+
+    /**
+     * 分页查询团课总数（支持 keyword 和 status 过滤）
+     */
+    default Mono<Long> countByPageFiltered(DatabaseClient databaseClient, PageRequest pageRequest) {
+        StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL");
+        List<String> conditions = new ArrayList<>();
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            conditions.add("course_name ILIKE :keyword");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            conditions.add("status = :status");
+        }
+
+        if (!conditions.isEmpty()) {
+            sql.append(" AND ").append(String.join(" AND ", conditions));
+        }
+
+        DatabaseClient.GenericExecuteSpec spec = databaseClient.sql(sql.toString());
+
+        if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) {
+            spec = spec.bind("keyword", "%" + pageRequest.getKeyword() + "%");
+        }
+        if (pageRequest.getStatus() != null && !pageRequest.getStatus().isEmpty()) {
+            spec = spec.bind("status", pageRequest.getStatus());
+        }
+
+        return spec.map((row, meta) -> row.get(0, Long.class)).one();
+    }
 }

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

@@ -9,11 +9,13 @@ import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
 import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
+import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -34,6 +36,7 @@ public class BookingSagaHandler {
     private final IGroupCourseBookingRepository bookingRepository;
     private final IGroupCourseRepository courseRepository;
     private final IMemberCardRecordService memberCardRecordService;
+    private final IMemberStoredCardService memberStoredCardService;
     private final MemberCardRepository memberCardRepository;
     private final GroupCourseRedisService redisService;
 
@@ -44,10 +47,10 @@ public class BookingSagaHandler {
      *
      * 步骤：
      * 1. 保存预约记录
-     * 2. 扣减会员卡权益
+     * 2. 扣减储值卡余额（储值卡类型）
      * 3. 更新课程当前人数
      */
-    public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId) {
+    public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId, BigDecimal storedValueAmount) {
         List<SagaStep> steps = new ArrayList<>();
         List<SagaStep> rollbackSteps = new ArrayList<>();
 
@@ -60,11 +63,11 @@ public class BookingSagaHandler {
         steps.add(step1);
         rollbackSteps.add(0, step1);
 
-        // 步骤2：扣减会员卡权益（根据卡类型决定扣除次数还是金额）
+        // 步骤2：扣减权益（根据卡类型）
         SagaStep step2 = new SagaStep(
-                "扣减会员卡权益",
-                deductCardUsageByCardType(booking.getMemberId(), recordId),
-                Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId))
+                "扣减权益",
+                deductCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount),
+                Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount))
         );
         steps.add(step2);
         rollbackSteps.add(0, step2);
@@ -94,7 +97,7 @@ public class BookingSagaHandler {
     /**
      * 根据会员卡类型扣减权益
      */
-    private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId) {
+    private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
         return memberCardRecordService.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
                 .flatMap(record -> {
@@ -109,14 +112,13 @@ 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);
+                                        return deductStoredCardBalance(memberId, storedValueAmount);
                                     case TIME_CARD:
-                                        // 时长卡不扣除，但需验证有效期
-                                        return validateTimeCard(record);
+                                        // 时长卡验证有效期后，仍须从储值卡扣款
+                                        return validateTimeCard(record)
+                                                .then(deductStoredCardBalance(memberId, storedValueAmount));
                                     default:
                                         return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
                                 }
@@ -153,11 +155,10 @@ public class BookingSagaHandler {
     /**
      * 根据会员卡类型恢复权益
      */
-    private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId) {
+    private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
         return memberCardRecordService.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
                 .flatMap(record -> {
-                    // 验证会员卡归属（memberId为null时跳过验证）
                     if (memberId != null && !record.getMemberId().equals(memberId)) {
                         return Mono.error(new RuntimeException("会员卡不归属当前用户"));
                     }
@@ -168,11 +169,29 @@ public class BookingSagaHandler {
 
                                 switch (cardType) {
                                     case COUNT_CARD:
-                                        return restoreCardUsage(recordId, 1, 0.0);
-                                    case STORED_VALUE_CARD:
-                                        return restoreCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
-                                    case TIME_CARD:
                                         return Mono.empty();
+                                    case STORED_VALUE_CARD:
+                                        // 返还储值卡余额（回滚时全额返还）
+                                        BigDecimal amount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+                                        return memberStoredCardService.recharge(memberId, amount)
+                                                .flatMap(rows -> {
+                                                    if (rows > 0) {
+                                                        log.info("储值卡回滚返还成功: memberId={}, amount={}", memberId, amount);
+                                                        return Mono.empty();
+                                                    }
+                                                    return Mono.empty();
+                                                });
+                                    case TIME_CARD:
+                                        // 时长卡回滚时也返还储值卡
+                                        BigDecimal timeAmount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+                                        return memberStoredCardService.recharge(memberId, timeAmount)
+                                                .flatMap(rows -> {
+                                                    if (rows > 0) {
+                                                        log.info("储值卡回滚返还成功(时长卡): memberId={}, amount={}", memberId, timeAmount);
+                                                        return Mono.empty();
+                                                    }
+                                                    return Mono.empty();
+                                                });
                                     default:
                                         return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
                                 }
@@ -183,7 +202,7 @@ public class BookingSagaHandler {
     /**
      * 执行取消预约事务
      */
-    public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId) {
+    public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId, BigDecimal storedValueAmount, long cancelCount) {
         List<SagaStep> steps = new ArrayList<>();
         List<SagaStep> rollbackSteps = new ArrayList<>();
 
@@ -196,11 +215,12 @@ public class BookingSagaHandler {
         steps.add(step1);
         rollbackSteps.add(0, step1);
 
-        // 步骤2：恢复会员卡权益
+        // 步骤2：返还储值卡余额（含手续费逻辑）
         SagaStep step2 = new SagaStep(
-                "恢复会员卡权益",
-                restoreCardUsageByCardType(memberId, recordId),
-                Mono.defer(() -> deductCardUsageByCardType(memberId, recordId))
+                "返还储值卡余额",
+                refundStoredCardWithFee(memberId, storedValueAmount, cancelCount),
+                // 回滚时重新扣减
+                Mono.defer(() -> deductCardUsageByCardType(memberId, recordId, storedValueAmount))
         );
         steps.add(step2);
         rollbackSteps.add(0, step2);
@@ -252,54 +272,32 @@ public class BookingSagaHandler {
         return bookingRepository.deleteById(bookingId);
     }
 
-    private Mono<Void> deductCardUsage(Long recordId, Integer deductTimes, Double deductAmount) {
-        if (deductTimes == 0 && deductAmount == 0.0) {
-            return Mono.empty();
-        }
-
-        return memberCardRecordService.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> {
-                    cn.novalon.gym.manage.member.enums.MemberCardRecordStatus status = record.getStatus();
-                    if (status != cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE) {
-                        return Mono.error(new RuntimeException("会员卡状态无效，当前状态: " + (status != null ? status.getDesc() : "未知")));
+    /**
+     * 从储值卡扣减余额
+     */
+    private Mono<Void> deductStoredCardBalance(Long memberId, BigDecimal storedValueAmount) {
+        BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
+                ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+        return memberStoredCardService.consume(memberId, amount)
+                .flatMap(rows -> {
+                    if (rows == 0) {
+                        return Mono.error(new RuntimeException("储值卡扣减失败，余额不足"));
                     }
-                    java.time.LocalDateTime expireTime = record.getExpireTime();
-                    if (expireTime != null && expireTime.isBefore(java.time.LocalDateTime.now())) {
-                        return Mono.error(new RuntimeException("会员卡已过期"));
-                    }
-                    if (record.getRemainingTimes() != null && deductTimes > 0 && record.getRemainingTimes() < deductTimes) {
-                        return Mono.error(new RuntimeException("会员卡剩余次数不足，当前剩余: " + record.getRemainingTimes() + "次"));
-                    }
-                    if (record.getRemainingAmount() != null && deductAmount > 0 && record.getRemainingAmount() < deductAmount) {
-                        return Mono.error(new RuntimeException("会员卡余额不足，当前剩余: " + record.getRemainingAmount()));
-                    }
-                    return memberCardRecordService.deductUsage(recordId, deductTimes, deductAmount)
-                            .flatMap(rows -> {
-                                if (rows == 0) {
-                                    return Mono.error(new RuntimeException("扣减会员卡权益失败，请重试"));
-                                }
-                                return Mono.empty();
-                            });
+                    log.info("储值卡扣减成功: memberId={}, amount={}", memberId, amount);
+                    return Mono.empty();
                 });
     }
 
-    private Mono<Void> restoreCardUsage(Long recordId, Integer addTimes, Double addAmount) {
-        if (addTimes == 0 && addAmount == 0.0) {
-            return Mono.empty();
-        }
-
-        return memberCardRecordService.findById(recordId)
-                .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
-                .flatMap(record -> {
-                    // 使用当前记录的过期时间，避免清空过期时间
-                    return memberCardRecordService.renewCard(recordId, addTimes, addAmount, record.getExpireTime())
-                            .flatMap(rows -> {
-                                if (rows == 0) {
-                                    return Mono.error(new RuntimeException("恢复会员卡权益失败，请重试"));
-                                }
-                                return Mono.empty();
-                            });
+    /**
+     * 返还储值卡余额（含手续费逻辑，仅用于取消预约）
+     */
+    private Mono<Void> refundStoredCardWithFee(Long memberId, BigDecimal storedValueAmount, long cancelCount) {
+        BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
+                ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
+        return memberStoredCardService.refundBalanceWithFee(memberId, amount, cancelCount)
+                .flatMap(refundedAmount -> {
+                    log.info("储值卡退款成功(含手续费): memberId={}, cancelCount={}, 退款金额={}", memberId, cancelCount, refundedAmount);
+                    return Mono.empty();
                 });
     }
 

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.handler;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import cn.novalon.gym.manage.groupcourse.service.ICourseLabelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,6 +30,13 @@ public class CourseLabelHandler {
                 .body(courseLabelService.findAll(), CourseLabel.class);
     }
 
+    @Operation(summary = "分页查询标签", description = "支持按关键词筛选并分页查询标签")
+    public Mono<ServerResponse> getLabelsByPage(ServerRequest request) {
+        return request.bodyToMono(PageRequest.class)
+                .flatMap(pageRequest -> courseLabelService.findByPage(pageRequest)
+                        .flatMap(response -> ServerResponse.ok().bodyValue(response)));
+    }
+
     @Operation(summary = "根据ID获取标签", description = "根据ID获取标签详情")
     public Mono<ServerResponse> getLabelById(ServerRequest request) {
         Long id = Long.valueOf(request.pathVariable("id"));
@@ -147,17 +155,17 @@ public class CourseLabelHandler {
         return request.bodyToMono(Map.class)
                 .flatMap(body -> {
                     @SuppressWarnings("unchecked")
-                    List<Integer> labelIdsInt = (List<Integer>) body.get("labelIds");
-                    
-                    if (labelIdsInt == null || labelIdsInt.isEmpty()) {
+                    List<?> rawIds = (List<?>) body.get("labelIds");
+
+                    if (rawIds == null || rawIds.isEmpty()) {
                         Map<String, Object> error = new HashMap<>();
                         error.put("success", false);
                         error.put("message", "labelIds不能为空");
                         return ServerResponse.badRequest().bodyValue(error);
                     }
-                    
-                    List<Long> labelIds = labelIdsInt.stream()
-                            .map(Integer::longValue)
+
+                    List<Long> labelIds = rawIds.stream()
+                            .map(id -> Long.valueOf(String.valueOf(id)))
                             .collect(java.util.stream.Collectors.toList());
                     
                     return courseLabelService.addLabelsToType(typeId, labelIds)

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

@@ -42,15 +42,11 @@ public class GroupCourseBookingHandler {
                     if (body.get("memberId") == null) {
                         return buildErrorResponse("请提供会员ID");
                     }
-                    if (body.get("memberCardRecordId") == null) {
-                        return buildErrorResponse("请提供会员卡记录ID");
-                    }
 
-                    Long courseId = ((Number) body.get("courseId")).longValue();
-                    Long memberId = ((Number) body.get("memberId")).longValue();
-                    Long memberCardRecordId = ((Number) body.get("memberCardRecordId")).longValue();
+                    Long courseId = toLong(body.get("courseId"), "courseId");
+                    Long memberId = toLong(body.get("memberId"), "memberId");
 
-                    return bookingService.bookCourse(courseId, memberId, memberCardRecordId)
+                    return bookingService.bookCourse(courseId, memberId)
                             .flatMap(booking -> {
                                 Map<String, Object> response = new HashMap<>();
                                 response.put("success", true);
@@ -76,7 +72,7 @@ public class GroupCourseBookingHandler {
 
         return request.bodyToMono(Map.class)
                 .flatMap(body -> {
-                    Long memberId = ((Number) body.get("memberId")).longValue();
+                    Long memberId = toLong(body.get("memberId"), "memberId");
 
                     return bookingService.cancelBooking(bookingId, memberId)
                             .flatMap(booking -> {
@@ -129,6 +125,19 @@ public class GroupCourseBookingHandler {
                 .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class);
     }
 
+    /**
+     * 安全转换为 Long，支持 Number 和 String 类型
+     */
+    private Long toLong(Object value, String fieldName) {
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        if (value instanceof String) {
+            return Long.valueOf((String) value);
+        }
+        throw new IllegalArgumentException("参数 " + fieldName + " 类型不正确");
+    }
+
     /**
      * 构建错误响应
      */

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.handler;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -134,4 +135,12 @@ public class GroupCourseTypeHandler {
                     return ServerResponse.badRequest().bodyValue(response);
                 });
     }
+
+    @Operation(summary = "分页查询团课类型", description = "支持按关键词、分类筛选并分页查询团课类型")
+    public Mono<ServerResponse> getGroupCourseTypesByPage(ServerRequest request) {
+        return request.bodyToMono(PageRequest.class)
+                .flatMap(pageRequest -> groupCourseTypeService.findByPage(pageRequest)
+                        .flatMap(response -> ServerResponse.ok().bodyValue(response))
+                );
+    }
 }

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

@@ -1,5 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.initializer;
 
+import cn.novalon.gym.manage.file.core.service.ISysFileService;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
@@ -10,15 +11,12 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * 项目启动时补全缺失的团课二维码
- * 遍历所有未删除的团课，对qrCodePath为空的课程生成二维码并上传至阿里云OSS
+ * 遍历所有未删除的团课，对qrCodePath为空的课程生成二维码并通过统一文件服务保存
  */
 @Component
 public class QrCodeInitializer implements CommandLineRunner {
@@ -27,11 +25,14 @@ public class QrCodeInitializer implements CommandLineRunner {
     
     private final IGroupCourseRepository groupCourseRepository;
     private final ObjectMapper objectMapper;
+    private final ISysFileService fileService;
     
     public QrCodeInitializer(IGroupCourseRepository groupCourseRepository,
-                             ObjectMapper objectMapper) {
+                             ObjectMapper objectMapper,
+                             ISysFileService fileService) {
         this.groupCourseRepository = groupCourseRepository;
         this.objectMapper = objectMapper;
+        this.fileService = fileService;
     }
     
     @Override
@@ -58,20 +59,22 @@ public class QrCodeInitializer implements CommandLineRunner {
                         
                         String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
                         
-                        // 生成二维码并上传到阿里云OSS
-                        String uuid = UUID.randomUUID().toString().replace("-", "");
-                        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-                        String fileName = "qr_" + uuid + "_" + timestamp + ".png";
-                        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent, fileName);
-                        
-                        course.setQrCodePath(ossUrl);
-                        
-                        // 更新数据库
-                        return groupCourseRepository.update(course)
-                                .doOnSuccess(updated -> logger.info("团课二维码补全成功 - id={}, name={}, ossUrl={}", 
-                                        updated.getId(), updated.getCourseName(), ossUrl))
-                                .doOnError(error -> logger.error("团课二维码补全失败(更新DB) - id={}, name={}, error: {}", 
-                                        course.getId(), course.getCourseName(), error.getMessage()));
+                        // 生成二维码字节数组，通过统一文件服务保存
+                        return Mono.fromCallable(() -> QRCodeUtil.generateQrCodeBytes(jsonContent))
+                                .flatMap(qrCodeBytes -> {
+                                    String fileName = "qrcode_" + course.getId() + ".png";
+                                    return fileService.saveBytes(qrCodeBytes, fileName, "image/png", "system");
+                                })
+                                .flatMap(sysFile -> {
+                                    String qrCodeUrl = "/api/files/" + sysFile.getId() + "/preview";
+                                    course.setQrCodePath(qrCodeUrl);
+                                    
+                                    return groupCourseRepository.update(course)
+                                            .doOnSuccess(updated -> logger.info("团课二维码补全成功 - id={}, name={}, url={}", 
+                                                    updated.getId(), updated.getCourseName(), qrCodeUrl))
+                                            .doOnError(error -> logger.error("团课二维码补全失败(更新DB) - id={}, name={}, error: {}", 
+                                                    course.getId(), course.getCourseName(), error.getMessage()));
+                                });
                     } catch (Exception e) {
                         logger.error("团课二维码补全失败(生成) - id={}, name={}, error: {}", 
                                 course.getId(), course.getCourseName(), e.getMessage(), e);

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,4 +31,6 @@ public interface ICourseLabelRepository {
     Mono<Void> removeLabelFromType(Long typeId, Long labelId);
 
     Mono<Void> clearLabelsFromType(Long typeId);
+
+    Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest);
 }

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

@@ -89,4 +89,11 @@ public interface IGroupCourseBookingRepository {
      * @return 更新记录数
      */
     Mono<Integer> updateToAbsent(Long bookingId);
+
+    /**
+     * 统计会员取消的预约次数
+     * @param memberId 会员ID
+     * @return 取消次数
+     */
+    Mono<Long> countCancelledByMemberId(Long memberId);
 }

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -25,4 +27,6 @@ public interface IGroupCourseTypeRepository {
     Mono<GroupCourseType> update(GroupCourseType groupCourseType);
 
     Mono<Void> deleteById(Long id);
+
+    Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest);
 }

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository.impl;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.CourseLabelDao;
 import cn.novalon.gym.manage.groupcourse.dao.CourseTypeLabelDao;
@@ -9,12 +11,17 @@ import cn.novalon.gym.manage.groupcourse.entity.CourseTypeLabelEntity;
 import cn.novalon.gym.manage.groupcourse.repository.ICourseLabelRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.query.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Repository
@@ -26,12 +33,14 @@ public class CourseLabelRepository implements ICourseLabelRepository {
     private final CourseLabelDao courseLabelDao;
     private final CourseTypeLabelDao courseTypeLabelDao;
     private final GroupCourseConverter converter;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
 
     public CourseLabelRepository(CourseLabelDao courseLabelDao, CourseTypeLabelDao courseTypeLabelDao, 
-                                  GroupCourseConverter converter) {
+                                  GroupCourseConverter converter, R2dbcEntityTemplate r2dbcEntityTemplate) {
         this.courseLabelDao = courseLabelDao;
         this.courseTypeLabelDao = courseTypeLabelDao;
         this.converter = converter;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
     }
 
     @Override
@@ -158,4 +167,41 @@ public class CourseLabelRepository implements ICourseLabelRepository {
         }
         return entity;
     }
+
+    @Override
+    public Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String sort = pageRequest.getSort();
+        String order = pageRequest.getOrder();
+        String keyword = pageRequest.getKeyword();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        List<Criteria> criteriaList = new ArrayList<>();
+        criteriaList.add(Criteria.where("deleted_at").isNull());
+        if (keyword != null && !keyword.isEmpty()) {
+            criteriaList.add(Criteria.where("label_name").like("%" + keyword + "%").ignoreCase(true));
+        }
+
+        Criteria criteria = criteriaList.isEmpty() ? Criteria.empty() : Criteria.from(criteriaList);
+        Query query = Query.query(criteria).with(org.springframework.data.domain.PageRequest.of(page, size, sortObj));
+
+        return r2dbcEntityTemplate.select(CourseLabelEntity.class)
+                .matching(query)
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(Query.query(criteria), CourseLabelEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<CourseLabel> list = tuple.getT1().stream()
+                            .map(this::toCourseLabel)
+                            .toList();
+                    return new PageResponse<>(list, totalPages, total, page, size);
+                });
+    }
 }

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

@@ -112,4 +112,9 @@ public class GroupCourseBookingRepository implements IGroupCourseBookingReposito
         java.time.LocalDateTime now = java.time.LocalDateTime.now();
         return groupCourseBookingDao.updateToAbsent(bookingId, now);
     }
+
+    @Override
+    public Mono<Long> countCancelledByMemberId(Long memberId) {
+        return groupCourseBookingDao.countCancelledByMemberId(memberId);
+    }
 }

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

@@ -97,37 +97,19 @@ public class GroupCourseRepository implements IGroupCourseRepository {
     public Mono<PageResponse<GroupCourse>> findByPageAndNotDeleted(PageRequest pageRequest) {
         int page = pageRequest.getPage();
         int size = pageRequest.getSize();
-        String sort = pageRequest.getSort();
-        String order = pageRequest.getOrder();
 
-        Sort sortObj = Sort.unsorted();
-        if (sort != null && !sort.isEmpty()) {
-            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
-        }
-
-        org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj);
-
-        return groupCourseDao.findAllByDeletedAtIsNull(sortObj)
-                .collectList()
-                .zipWith(groupCourseDao.findAllByDeletedAtIsNull().count())
-                .map(tuple -> {
-                    List<GroupCourseEntity> allEntities = tuple.getT1();
-                    long total = tuple.getT2();
-                    
-                    int fromIndex = page * size;
-                    int toIndex = Math.min(fromIndex + size, allEntities.size());
-                    
-                    List<GroupCourse> courseList;
-                    if (fromIndex < allEntities.size()) {
-                        courseList = allEntities.subList(fromIndex, toIndex).stream()
-                                .map(groupCourseConverter::toDomain)
-                                .toList();
-                    } else {
-                        courseList = List.of();
+        return groupCourseDao.countByPageFiltered(r2dbcEntityTemplate.getDatabaseClient(), pageRequest)
+                .flatMap(total -> {
+                    if (total == 0) {
+                        return Mono.just(new PageResponse<>(List.of(), 0, 0L, page, size));
                     }
-                    
-                    int totalPages = (int) Math.ceil((double) total / size);
-                    return new PageResponse<>(courseList, totalPages, total, page, size);
+                    return groupCourseDao.findByPageFiltered(r2dbcEntityTemplate.getDatabaseClient(), pageRequest)
+                            .map(groupCourseConverter::toDomain)
+                            .collectList()
+                            .map(courseList -> {
+                                int totalPages = (int) Math.ceil((double) total / size);
+                                return new PageResponse<>(courseList, totalPages, total, page, size);
+                            });
                 });
     }
 

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.repository.impl;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter;
 import cn.novalon.gym.manage.groupcourse.dao.GroupCourseTypeDao;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
@@ -7,12 +9,18 @@ import cn.novalon.gym.manage.groupcourse.entity.GroupCourseTypeEntity;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.data.relational.core.query.Criteria;
+import org.springframework.data.relational.core.query.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Repository
 @Transactional
@@ -22,10 +30,13 @@ public class GroupCourseTypeRepository implements IGroupCourseTypeRepository {
 
     private final GroupCourseTypeDao groupCourseTypeDao;
     private final GroupCourseConverter converter;
+    private final R2dbcEntityTemplate r2dbcEntityTemplate;
 
-    public GroupCourseTypeRepository(GroupCourseTypeDao groupCourseTypeDao, GroupCourseConverter converter) {
+    public GroupCourseTypeRepository(GroupCourseTypeDao groupCourseTypeDao, GroupCourseConverter converter,
+                                      R2dbcEntityTemplate r2dbcEntityTemplate) {
         this.groupCourseTypeDao = groupCourseTypeDao;
         this.converter = converter;
+        this.r2dbcEntityTemplate = r2dbcEntityTemplate;
     }
 
     @Override
@@ -129,4 +140,46 @@ public class GroupCourseTypeRepository implements IGroupCourseTypeRepository {
         return groupCourseTypeDao.softDelete(id, LocalDateTime.now())
                 .then();
     }
+
+    @Override
+    public Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest) {
+        int page = pageRequest.getPage();
+        int size = pageRequest.getSize();
+        String order = pageRequest.getOrder();
+        String sort = pageRequest.getSort();
+        String keyword = pageRequest.getKeyword();
+        String category = pageRequest.getCategory();
+
+        Sort sortObj = Sort.unsorted();
+        if (sort != null && !sort.isEmpty()) {
+            sortObj = Sort.by(Sort.Direction.fromString(order), sort);
+        }
+
+        // Build dynamic criteria
+        List<Criteria> criteriaList = new ArrayList<>();
+        criteriaList.add(Criteria.where("deleted_at").isNull());
+        if (keyword != null && !keyword.isEmpty()) {
+            criteriaList.add(Criteria.where("type_name").like("%" + keyword + "%").ignoreCase(true));
+        }
+        if (category != null && !category.isEmpty()) {
+            criteriaList.add(Criteria.where("category").is(category));
+        }
+
+        Criteria criteria = criteriaList.isEmpty() ? Criteria.empty() : Criteria.from(criteriaList);
+        Query query = Query.query(criteria).with(org.springframework.data.domain.PageRequest.of(page, size, sortObj));
+
+        return r2dbcEntityTemplate.select(GroupCourseTypeEntity.class)
+                .matching(query)
+                .all()
+                .collectList()
+                .zipWith(r2dbcEntityTemplate.count(Query.query(criteria), GroupCourseTypeEntity.class))
+                .map(tuple -> {
+                    long total = tuple.getT2();
+                    int totalPages = (int) Math.ceil((double) total / size);
+                    List<GroupCourseType> list = tuple.getT1().stream()
+                            .map(converter::toGroupCourseType)
+                            .toList();
+                    return new PageResponse<>(list, totalPages, total, page, size);
+                });
+    }
 }

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

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

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -27,4 +29,6 @@ public interface ICourseLabelService {
     Mono<Void> removeLabelFromType(Long typeId, Long labelId);
 
     Mono<Void> clearLabelsFromType(Long typeId);
+
+    Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest);
 }

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

@@ -17,10 +17,9 @@ public interface IGroupCourseBookingService {
      *
      * @param courseId 团课ID
      * @param memberId 会员ID
-     * @param memberCardRecordId 会员卡记录ID
      * @return 预约记录
      */
-    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardRecordId);
+    Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId);
 
     /**
      * 取消预约

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,4 +31,6 @@ public interface IGroupCourseTypeService {
      * @return 分类名称列表
      */
     Flux<String> findCategories();
+
+    Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest);
 }

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

@@ -1,5 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service.impl;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.domain.CourseLabel;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
@@ -109,4 +111,12 @@ public class CourseLabelService implements ICourseLabelService {
                 .doOnSuccess(v -> logger.info("清空类型标签成功 - typeId={}", typeId))
                 .doOnError(error -> logger.error("清空类型标签失败 - typeId={}, error: {}", typeId, error.getMessage()));
     }
+
+    @Override
+    public Mono<PageResponse<CourseLabel>> findByPage(PageRequest pageRequest) {
+        return courseLabelRepository.findByPage(pageRequest)
+                .doOnSuccess(result -> logger.info("分页查询标签成功 - page={}, size={}, total={}",
+                        pageRequest.getPage(), pageRequest.getSize(), result.getTotalElements()))
+                .doOnError(error -> logger.error("分页查询标签失败 - error: {}", error.getMessage()));
+    }
 }

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

@@ -3,7 +3,6 @@ package cn.novalon.gym.manage.groupcourse.service.impl;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
 import cn.novalon.gym.manage.groupcourse.event.BookingReminderEventPublisher;
-import cn.novalon.gym.manage.groupcourse.handler.BookingSagaHandler;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
@@ -25,7 +24,6 @@ import java.util.UUID;
  * - 取消预约需在课程开始前至少2小时
  * - 每节课最多20人
  * - 预约成功后发送提醒
- * - 预约成功后扣减权益
  * 
  * 技术要点：
  * - 使用Redis缓存团课信息
@@ -44,7 +42,6 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
     private final IGroupCourseRepository courseRepository;
     private final GroupCourseRedisService redisService;
     private final BookingReminderEventPublisher bookingReminderEventPublisher;
-    private final BookingSagaHandler bookingSagaHandler;
 
     // 预约提前时间限制（分钟）
     private static final long BOOKING_MIN_ADVANCE_MINUTES = 30;
@@ -54,18 +51,16 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
     public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository,
                                      IGroupCourseRepository courseRepository,
                                      GroupCourseRedisService redisService,
-                                     BookingReminderEventPublisher bookingReminderEventPublisher,
-                                     BookingSagaHandler bookingSagaHandler) {
+                                     BookingReminderEventPublisher bookingReminderEventPublisher) {
         this.bookingRepository = bookingRepository;
         this.courseRepository = courseRepository;
         this.redisService = redisService;
         this.bookingReminderEventPublisher = bookingReminderEventPublisher;
-        this.bookingSagaHandler = bookingSagaHandler;
     }
 
     @Override
-    public Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId, Long memberCardRecordId) {
-        logger.info("开始预约团课：courseId={}, memberId={}, memberCardRecordId={}", courseId, memberId, memberCardRecordId);
+    public Mono<GroupCourseBooking> bookCourse(Long courseId, Long memberId) {
+        logger.info("开始预约团课：courseId={}, memberId={}", courseId, memberId);
 
         // 生成唯一请求ID用于分布式锁
         String requestId = UUID.randomUUID().toString();
@@ -81,14 +76,14 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                     return getCourseWithCache(courseId)
                             .flatMap(course -> {
                                 // 3. 验证课程状态
-                                Long status = course.getStatus();
-                                if (status == null || status != 0L) {
+                                Long courseStatus = course.getStatus();
+                                if (courseStatus == null || courseStatus != 0L) {
                                     String errorMessage;
-                                    if (status == null) {
+                                    if (courseStatus == null) {
                                         errorMessage = "课程状态异常";
-                                    } else if (status == 1L) {
+                                    } else if (courseStatus == 1L) {
                                         errorMessage = "课程已取消，无法预约";
-                                    } else if (status == 2L) {
+                                    } else if (courseStatus == 2L) {
                                         errorMessage = "课程已结束，无法预约";
                                     } else {
                                         errorMessage = "课程状态不可预约";
@@ -131,56 +126,61 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
 
                                             // 7. 验证是否已预约
                                             return bookingRepository.findValidBooking(courseId, memberId)
-                                                    .flatMap(existingBooking -> {
-                                                        return releaseLockAndError(courseId, requestId, "您已预约该课程");
-                                                    })
+                                                    .flatMap(existingBooking -> 
+                                                        releaseLockAndError(courseId, requestId, "您已预约该课程")
+                                                    )
                                                     .switchIfEmpty(
-                                                        // 8. 使用Redis原子操作验证课程人数是否已满
-                                                        validateAndIncrementBookingCount(courseId, course.getMaxMembers())
-                                                            .flatMap(countValid -> {
-                                                                if (countValid > course.getMaxMembers()) {
-                                                                    return releaseLockAndError(courseId, requestId, "课程已满");
-                                                                }
+                                                        // 8. 创建预约记录
+                                                        Mono.defer(() -> {
+                                                            GroupCourseBooking booking = new GroupCourseBooking();
+                                                            booking.setCourseId(courseId);
+                                                            booking.setMemberId(memberId);
+                                                            booking.setBookingTime(LocalDateTime.now());
+                                                            booking.setStatus("0"); // 0-已预约
 
-                                                                // 9. 创建预约记录
-                                                                GroupCourseBooking booking = new GroupCourseBooking();
-                                                                booking.setCourseId(courseId);
-                                                                booking.setMemberId(memberId);
-                                                                booking.setMemberCardRecordId(memberCardRecordId);
-                                                                booking.setBookingTime(LocalDateTime.now());
-                                                                booking.setStatus("0"); // 0-已预约
+                                                            // 添加课程信息到预约记录
+                                                            booking.setCourseName(course.getCourseName());
+                                                            booking.setCourseStartTime(course.getStartTime());
+                                                            booking.setCourseEndTime(course.getEndTime());
+                                                            booking.setLocation(course.getLocation());
 
-                                                                // 添加课程信息到预约记录
-                                                                booking.setCourseName(course.getCourseName());
-                                                                booking.setCourseStartTime(course.getStartTime());
-                                                                booking.setCourseEndTime(course.getEndTime());
-                                                                booking.setLocation(course.getLocation());
-
-                                                                // 10. 使用Saga事务执行预约（包含权益扣减）
-                                                                return bookingSagaHandler.executeBooking(booking, memberCardRecordId)
-                                                                    .flatMap(savedBooking -> {
-                                                                        // 11. 释放锁
-                                                                        return redisService.releaseLock(courseId, requestId)
-                                                                            .then(Mono.just(savedBooking));
-                                                                    })
-                                                                    .doOnSuccess(savedBooking -> {
-                                                                        logger.info("预约成功：bookingId={}, courseId={}, memberId={}",
-                                                                                savedBooking.getId(), courseId, memberId);
-                                                                        // 发布预约成功事件
-                                                                        bookingReminderEventPublisher.publishBookingSuccessEvent(
-                                                                                savedBooking.getId(),
-                                                                                savedBooking.getMemberId(),
-                                                                                savedBooking.getCourseName(),
-                                                                                savedBooking.getCourseStartTime().toString()
-                                                                        );
-                                                                    })
-                                                                    .doOnError(error -> {
-                                                                        // 回滚Redis计数
-                                                                        redisService.decrementBookingCount(courseId).subscribe();
-                                                                        logger.error("预约失败：courseId={}, memberId={}, error={}",
-                                                                                courseId, memberId, error.getMessage());
-                                                                    });
-                                                            })
+                                                            // 9. 保存预约记录
+                                                            return bookingRepository.save(booking)
+                                                                .flatMap(saved -> {
+                                                                    if (saved.getId() == null) {
+                                                                        return Mono.error(new RuntimeException("保存预约记录失败"));
+                                                                    }
+                                                                    // 10. 更新课程当前人数
+                                                                    return courseRepository.updateCurrentMembers(courseId, 1)
+                                                                        .flatMap(updatedCourse -> {
+                                                                            // 11. 更新Redis预约计数
+                                                                            return redisService.incrementBookingCount(courseId)
+                                                                                .flatMap(count -> {
+                                                                                    // 12. 释放锁
+                                                                                    return redisService.releaseLock(courseId, requestId)
+                                                                                        .then(Mono.just(saved));
+                                                                                });
+                                                                        })
+                                                                        .doOnSuccess(savedBooking -> {
+                                                                            logger.info("预约成功：bookingId={}, courseId={}, memberId={}",
+                                                                                    saved.getId(), courseId, memberId);
+                                                                            // 发布预约成功事件
+                                                                            bookingReminderEventPublisher.publishBookingSuccessEvent(
+                                                                                    saved.getId(),
+                                                                                    saved.getMemberId(),
+                                                                                    saved.getCourseName(),
+                                                                                    saved.getCourseStartTime().toString()
+                                                                            );
+                                                                        })
+                                                                        .doOnError(error -> {
+                                                                            // 失败时回滚Redis计数和课程人数
+                                                                            redisService.decrementBookingCount(courseId).subscribe();
+                                                                            courseRepository.updateCurrentMembers(courseId, -1).subscribe();
+                                                                            logger.error("预约失败：courseId={}, memberId={}, error={}",
+                                                                                    courseId, memberId, error.getMessage());
+                                                                        });
+                                                                });
+                                                        })
                                                     );
                                         });
                             })
@@ -208,29 +208,6 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                 );
     }
 
-    /**
-     * 验证并增加预约人数（使用Redis原子操作）
-     */
-    private Mono<Integer> validateAndIncrementBookingCount(Long courseId, Integer maxMembers) {
-        // 先获取当前Redis中的预约计数
-        return redisService.getBookingCount(courseId)
-                .flatMap(currentCount -> {
-                    // 如果Redis中计数为0，可能是首次访问，需要从数据库同步
-                    if (currentCount == 0) {
-                        // 从数据库查询实际预约人数
-                        return bookingRepository.countValidBookings(courseId)
-                                .flatMap(dbCount -> {
-                                    // 将数据库中的实际预约人数同步到Redis
-                                    return redisService.setBookingCount(courseId, dbCount.intValue())
-                                            .then(Mono.just(dbCount.intValue()));
-                                });
-                    }
-                    return Mono.just(currentCount);
-                })
-                // 递增预约计数
-                .flatMap(count -> redisService.incrementBookingCount(courseId).map(Long::intValue));
-    }
-
     /**
      * 释放锁并返回错误
      */
@@ -290,26 +267,37 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
                                             "需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消");
                                 }
 
-                                // 5. 使用Saga事务执行取消预约（包含权益恢复）
-                                return bookingSagaHandler.executeCancelBooking(bookingId, booking.getCourseId(), booking.getMemberCardRecordId(), memberId)
-                                    .flatMap(updatedBooking -> {
-                                        // 6. 释放锁
-                                        return redisService.releaseLock(bookingId, requestId)
-                                            .then(Mono.just(updatedBooking));
-                                    })
-                                    .doOnSuccess(updatedBooking -> {
-                                        logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId);
-                                        // 发布预约取消事件
-                                        bookingReminderEventPublisher.publishBookingCancelEvent(
-                                                updatedBooking.getId(),
-                                                updatedBooking.getMemberId(),
-                                                updatedBooking.getCourseName()
-                                        );
-                                    })
-                                    .doOnError(error -> {
-                                        logger.error("取消预约失败：bookingId={}, memberId={}, error={}",
-                                                bookingId, memberId, error.getMessage());
-                                    });
+                                // 5. 更新预约状态为已取消
+                                return bookingRepository.updateStatus(bookingId, "1")
+                                        .flatMap(rows -> {
+                                            if (rows == 0) {
+                                                return Mono.error(new RuntimeException("更新预约状态失败"));
+                                            }
+                                            // 6. 减少课程当前人数
+                                            return courseRepository.updateCurrentMembers(booking.getCourseId(), -1)
+                                                .flatMap(updatedCourse -> {
+                                                    // 7. 更新Redis预约计数
+                                                    return redisService.decrementBookingCount(booking.getCourseId())
+                                                        .flatMap(count -> {
+                                                            // 8. 释放锁
+                                                            return redisService.releaseLock(bookingId, requestId)
+                                                                .then(bookingRepository.findById(bookingId));
+                                                        });
+                                                })
+                                                .doOnSuccess(updatedBooking -> {
+                                                    logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId);
+                                                    // 发布预约取消事件
+                                                    bookingReminderEventPublisher.publishBookingCancelEvent(
+                                                            updatedBooking.getId(),
+                                                            updatedBooking.getMemberId(),
+                                                            updatedBooking.getCourseName()
+                                                    );
+                                                })
+                                                .doOnError(error -> {
+                                                    logger.error("取消预约失败：bookingId={}, memberId={}, error={}",
+                                                            bookingId, memberId, error.getMessage());
+                                                });
+                                        });
                             })
                             .onErrorResume(error -> {
                                 redisService.releaseLock(bookingId, requestId).subscribe();

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

@@ -19,6 +19,7 @@ import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
 import cn.novalon.gym.manage.groupcourse.util.QRCodeUtil;
+import cn.novalon.gym.manage.file.core.service.ISysFileService;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.entity.MemberCardRecord;
 import cn.novalon.gym.manage.member.enums.MemberCardType;
@@ -51,6 +52,7 @@ public class GroupCourseService implements IGroupCourseService {
     private final ObjectMapper objectMapper;
     private final GroupCourseStateMachine stateMachine;
     private final DatabaseClient databaseClient;
+    private final ISysFileService fileService;
     
     private static final String CACHE_KEY_PREFIX = "group_course:page:";
     private static final String CACHE_KEY_ID_PREFIX = "group_course:id:";
@@ -68,7 +70,8 @@ public class GroupCourseService implements IGroupCourseService {
                               RedisUtil redisUtil,
                               ObjectMapper objectMapper,
                               GroupCourseStateMachine stateMachine,
-                              DatabaseClient databaseClient){
+                              DatabaseClient databaseClient,
+                              ISysFileService fileService){
         this.groupCourseRepository = groupCourseRepository;
         this.bookingRepository = bookingRepository;
         this.groupCourseTypeRepository = groupCourseTypeRepository;
@@ -79,6 +82,7 @@ public class GroupCourseService implements IGroupCourseService {
         this.objectMapper = objectMapper;
         this.stateMachine = stateMachine;
         this.databaseClient = databaseClient;
+        this.fileService = fileService;
     }
 
     @Override
@@ -155,7 +159,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());
@@ -225,8 +228,9 @@ public class GroupCourseService implements IGroupCourseService {
         String sort = pageRequest.getSort();
         String order = pageRequest.getOrder();
         String keyword = pageRequest.getKeyword() != null ? pageRequest.getKeyword() : "";
+        String status = pageRequest.getStatus() != null ? pageRequest.getStatus() : "";
         
-        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword;
+        String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword + ":" + status;
 
         return redisUtil.get(cacheKey, String.class)
                 .flatMap(cachedJson -> {
@@ -288,15 +292,21 @@ public class GroupCourseService implements IGroupCourseService {
                         
                         String jsonContent = objectMapper.writeValueAsString(qrCodeContent);
                         
-                        // 生成二维码并上传到阿里云OSS
-                        String qrCodeUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
-                        course.setQrCodePath(qrCodeUrl);
-                        
-                        logger.info("团课二维码上传到OSS成功 - id={}, qrCodeUrl={}", course.getId(), qrCodeUrl);
-                        
-                        // 更新团课信息，保存二维码路径
-                        return groupCourseRepository.update(course)
-                                .doOnSuccess(updatedCourse -> logger.info("团课创建成功 - id={}, name={}", updatedCourse.getId(), updatedCourse.getCourseName()));
+                        // 生成二维码字节数组，通过统一文件服务保存
+                        return Mono.fromCallable(() -> QRCodeUtil.generateQrCodeBytes(jsonContent))
+                                .flatMap(qrCodeBytes -> {
+                                    String fileName = "qrcode_" + course.getId() + ".png";
+                                    return fileService.saveBytes(qrCodeBytes, fileName, "image/png", "system");
+                                })
+                                .flatMap(sysFile -> {
+                                    String qrCodeUrl = "/api/files/" + sysFile.getId() + "/preview";
+                                    course.setQrCodePath(qrCodeUrl);
+                                    
+                                    logger.info("团课二维码已保存 - id={}, fileId={}, url={}", course.getId(), sysFile.getId(), qrCodeUrl);
+                                    
+                                    return groupCourseRepository.update(course)
+                                            .doOnSuccess(updatedCourse -> logger.info("团课创建成功 - id={}, name={}", updatedCourse.getId(), updatedCourse.getCourseName()));
+                                });
                     } catch (Exception e) {
                         logger.error("团课二维码生成失败 - id={}, error: {}", course.getId(), e.getMessage(), e);
                         // 即使二维码生成失败，也返回成功创建的团课
@@ -342,9 +352,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 +407,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 +422,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 +439,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 +453,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）
@@ -510,29 +514,14 @@ public class GroupCourseService implements IGroupCourseService {
                         return Mono.error(new RuntimeException("课程已满员，无法签到"));
                     }
                     
-                    // 校验5：用户今日是否已到店签到（直接查询sign_in_record表）
-                    LocalDateTime todayStart = LocalDateTime.now().toLocalDate().atStartOfDay();
-                    LocalDateTime todayEnd = todayStart.plusDays(1);
-                    return databaseClient.sql("SELECT sign_in_status FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false ORDER BY sign_in_time DESC LIMIT 1")
-                            .bind("memberId", memberId)
-                            .bind("startTime", todayStart)
-                            .bind("endTime", todayEnd)
-                            .map(row -> row.get("sign_in_status", String.class))
-                            .one()
-                            .switchIfEmpty(Mono.error(new RuntimeException("请先完成到店签到")))
-                            .flatMap(status -> {
-                                if (!"SUCCESS".equals(status)) {
-                                    return Mono.error(new RuntimeException("到店签到未成功，请重新签到"));
-                                }
-                                // 校验6：用户已预约此课程（有效预约，状态为0-已预约）
-                                return bookingRepository.findValidBooking(courseId, memberId)
-                                        .switchIfEmpty(Mono.error(new RuntimeException("您未预约此课程，无法签到")))
-                                        .flatMap(booking -> {
-                                            return groupCourseRepository.updateCurrentMembers(courseId, 1)
-                                                    .flatMap(updatedCourse -> {
-                                                        return bookingRepository.updateStatus(booking.getId(), "2")
-                                                                .thenReturn(updatedCourse);
-                                                    });
+                    // 校验5：用户已预约此课程（有效预约，状态为0-已预约）
+                    return bookingRepository.findValidBooking(courseId, memberId)
+                            .switchIfEmpty(Mono.error(new RuntimeException("您未预约此团课")))
+                            .flatMap(booking -> {
+                                return groupCourseRepository.updateCurrentMembers(courseId, 1)
+                                        .flatMap(updatedCourse -> {
+                                            return bookingRepository.updateStatus(booking.getId(), "2")
+                                                    .thenReturn(updatedCourse);
                                         });
                             });
                 })
@@ -543,14 +532,15 @@ public class GroupCourseService implements IGroupCourseService {
 
     @Override
     public Mono<Void> delete(Long id) {
-        // 先查询课程状态，只有已取消的课程才能删除
+        // 只有已取消或已结束的课程才能删除
         return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
                 .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
                 .flatMap(course -> {
-                    // 检查课程状态是否为已取消（状态码1）
-                    if (course.getStatus() == null || !course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
-                        return Mono.error(new RuntimeException("只有已取消的课程才能删除，当前状态: " + 
-                                (course.getStatus() != null ? course.getStatus() : "未知")));
+                    // 检查课程状态是否为已取消（状态码1）或已结束（状态码2）
+                    Long status = course.getStatus();
+                    if (status == null || (!status.equals(CourseStatus.CANCELLED.getValue()) && !status.equals(CourseStatus.ENDED.getValue()))) {
+                        return Mono.error(new RuntimeException("只有已取消或已结束的课程才能删除，当前状态: " + 
+                                (status != null ? status : "未知")));
                     }
                     
                     // 删除课程

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

@@ -1,6 +1,9 @@
 package cn.novalon.gym.manage.groupcourse.service.impl;
 
+import cn.novalon.gym.manage.common.dto.PageRequest;
+import cn.novalon.gym.manage.common.dto.PageResponse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
+import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
 import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseTypeRepository;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
 import org.slf4j.Logger;
@@ -9,18 +12,18 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Service
 public class GroupCourseTypeService implements IGroupCourseTypeService {
 
     private static final Logger logger = LoggerFactory.getLogger(GroupCourseTypeService.class);
 
     private final IGroupCourseTypeRepository groupCourseTypeRepository;
+    private final IGroupCourseRepository groupCourseRepository;
 
-    public GroupCourseTypeService(IGroupCourseTypeRepository groupCourseTypeRepository) {
+    public GroupCourseTypeService(IGroupCourseTypeRepository groupCourseTypeRepository,
+                                  IGroupCourseRepository groupCourseRepository) {
         this.groupCourseTypeRepository = groupCourseTypeRepository;
+        this.groupCourseRepository = groupCourseRepository;
     }
 
     @Override
@@ -71,9 +74,17 @@ public class GroupCourseTypeService implements IGroupCourseTypeService {
 
     @Override
     public Mono<Void> delete(Long id) {
-        return groupCourseTypeRepository.deleteById(id)
-                .doOnSuccess(v -> logger.info("团课类型删除成功 - id={}", id))
-                .doOnError(error -> logger.error("团课类型删除失败 - id={}, error: {}", id, error.getMessage()));
+        // 检查是否有团课依赖该类型
+        return groupCourseRepository.findByCourseType(id)
+                .hasElements()
+                .flatMap(hasDependents -> {
+                    if (hasDependents) {
+                        return Mono.<Void>error(new RuntimeException("该类型下存在团课，无法删除"));
+                    }
+                    return groupCourseTypeRepository.deleteById(id)
+                            .doOnSuccess(v -> logger.info("团课类型删除成功 - id={}", id))
+                            .doOnError(error -> logger.error("团课类型删除失败 - id={}, error: {}", id, error.getMessage()));
+                });
     }
 
     @Override
@@ -83,4 +94,12 @@ public class GroupCourseTypeService implements IGroupCourseTypeService {
                 .filter(category -> category != null && !category.isEmpty())
                 .distinct();
     }
+
+    @Override
+    public Mono<PageResponse<GroupCourseType>> findByPage(PageRequest pageRequest) {
+        return groupCourseTypeRepository.findByPage(pageRequest)
+                .doOnSuccess(result -> logger.info("分页查询团课类型成功 - page={}, size={}, total={}",
+                        pageRequest.getPage(), pageRequest.getSize(), result.getTotalElements()))
+                .doOnError(error -> logger.error("分页查询团课类型失败 - error: {}", error.getMessage()));
+    }
 }

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

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

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

@@ -10,46 +10,33 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * 二维码生成工具类
+ * 生成二维码的字节数组，由调用方统一通过文件服务保存
  */
 public class QRCodeUtil {
     
     private static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
     
-    // 二维码默认保存路径（本地临时路径）
-    private static final String DEFAULT_SAVE_PATH = "D:\\Games\\exmp\\image";
-    
     // 二维码尺寸
     private static final int QR_CODE_WIDTH = 300;
     private static final int QR_CODE_HEIGHT = 300;
     
     /**
-     * 生成二维码并保存到指定路径
+     * 生成二维码图片的字节数组
      * 
      * @param content 二维码内容
-     * @param savePath 保存路径
-     * @param fileName 文件名（不含扩展名）
-     * @return 生成的二维码文件完整路径
+     * @return PNG格式的二维码图片字节数组
      */
-    public static String generateQRCode(String content, String savePath, String fileName) {
+    public static byte[] generateQrCodeBytes(String content) {
         try {
-            Path directory = Paths.get(savePath);
-            if (!Files.exists(directory)) {
-                Files.createDirectories(directory);
-                logger.info("创建二维码保存目录: {}", savePath);
-            }
-            
             Map<EncodeHintType, Object> hints = new HashMap<>();
             hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
             hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
@@ -58,99 +45,21 @@ public class QRCodeUtil {
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
             
-            String filePath = Paths.get(savePath, fileName + ".png").toString();
-            Path path = Paths.get(filePath);
+            BufferedImage image = MatrixToImageWriter.toBufferedImage(bitMatrix);
             
-            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
-            logger.info("二维码生成成功: {}", filePath);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(image, "PNG", baos);
+            byte[] bytes = baos.toByteArray();
+            baos.close();
             
-            return filePath;
+            logger.info("二维码字节数组生成成功, size={} bytes", bytes.length);
+            return bytes;
         } catch (WriterException e) {
             logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
             throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
         } catch (IOException e) {
-            logger.error("二维码保存失败 - IOException: {}", e.getMessage(), e);
-            throw new RuntimeException("二维码保存失败: " + e.getMessage(), e);
-        }
-    }
-    
-    /**
-     * 生成二维码并保存到默认路径
-     * 文件名格式: UUID + 创建时间
-     * 
-     * @param content 二维码内容
-     * @return 生成的二维码文件完整路径
-     */
-    public static String generateQRCode(String content) {
-        String uuid = UUID.randomUUID().toString().replace("-", "");
-        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-        String fileName = uuid + "_" + timestamp;
-        
-        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
-    }
-    
-    /**
-     * 生成二维码并保存到默认路径，使用自定义文件名
-     * 
-     * @param content 二维码内容
-     * @param fileName 文件名（不含扩展名）
-     * @return 生成的二维码文件完整路径
-     */
-    public static String generateQRCodeWithFileName(String content, String fileName) {
-        return generateQRCode(content, DEFAULT_SAVE_PATH, fileName);
-    }
-    
-    /**
-     * 生成二维码并上传到阿里云OSS
-     * 文件名格式: UUID + 创建时间
-     * 
-     * @param content 二维码内容
-     * @return 阿里云OSS访问地址
-     */
-    public static String generateQRCodeAndUploadToOSS(String content) {
-        String uuid = UUID.randomUUID().toString().replace("-", "");
-        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-        String fileName = uuid + "_" + timestamp + ".png";
-        
-        return generateQRCodeAndUploadToOSS(content, fileName);
-    }
-    
-    /**
-     * 生成二维码并上传到阿里云OSS
-     * 
-     * @param content 二维码内容
-     * @param fileName 文件名（含扩展名）
-     * @return 阿里云OSS访问地址
-     */
-    public static String generateQRCodeAndUploadToOSS(String content, String fileName) {
-        try {
-            Path tempDir = Files.createTempDirectory("qrcode_temp");
-            String tempFilePath = tempDir.resolve(fileName).toString();
-            
-            Map<EncodeHintType, Object> hints = new HashMap<>();
-            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
-            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-            hints.put(EncodeHintType.MARGIN, 1);
-            
-            QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, QR_CODE_WIDTH, QR_CODE_HEIGHT, hints);
-            
-            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", Paths.get(tempFilePath));
-            logger.info("二维码临时文件生成成功: {}", tempFilePath);
-            
-            String ossUrl = OSSUtil.uploadToOSS(tempFilePath, fileName);
-            
-            Files.deleteIfExists(Paths.get(tempFilePath));
-            Files.deleteIfExists(tempDir);
-            logger.info("临时文件已删除: {}", tempFilePath);
-            
-            return ossUrl;
-        } catch (WriterException e) {
-            logger.error("二维码生成失败 - WriterException: {}", e.getMessage(), e);
-            throw new RuntimeException("二维码生成失败: " + e.getMessage(), e);
-        } catch (IOException e) {
-            logger.error("二维码处理失败 - IOException: {}", e.getMessage(), e);
-            throw new RuntimeException("二维码处理失败: " + e.getMessage(), e);
+            logger.error("二维码输出失败 - IOException: {}", e.getMessage(), e);
+            throw new RuntimeException("二维码输出失败: " + e.getMessage(), e);
         }
     }
 }

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

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

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

@@ -1,9 +1,6 @@
 package cn.novalon.gym.manage.groupcourse.util;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import java.nio.file.Path;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -12,60 +9,41 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 class QRCodeUtilTest {
 
-    @TempDir
-    Path tempDir;
-
     @Test
-    void testGenerateQRCode() {
+    void testGenerateQrCodeBytes() {
         String content = "测试二维码内容";
-        String qrCodePath = QRCodeUtil.generateQRCode(content);
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(content);
         
-        assertNotNull(qrCodePath, "二维码路径不应为空");
-        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
-        assertTrue(qrCodePath.contains("D:\\Games\\exmp\\image"), "二维码应保存到指定路径");
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "二维码字节数组应包含数据");
         
-        System.out.println("生成的二维码路径: " + qrCodePath);
+        System.out.println("生成的二维码字节大小: " + bytes.length + " bytes");
     }
 
     @Test
-    void testGenerateQRCodeWithCustomPath() {
-        String content = "自定义路径测试";
-        String customPath = tempDir.toString();
-        String fileName = "test_qrcode";
+    void testGenerateQrCodeBytesWithJsonContent() {
+        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-07-14T10:00:00\"}";
         
-        String qrCodePath = QRCodeUtil.generateQRCode(content, customPath, fileName);
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(jsonContent);
         
-        assertNotNull(qrCodePath, "二维码路径不应为空");
-        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
-        assertTrue(qrCodePath.contains(fileName), "二维码文件名应包含指定名称");
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "二维码字节数组应包含数据");
         
-        System.out.println("生成的二维码路径: " + qrCodePath);
+        System.out.println("JSON内容二维码字节大小: " + bytes.length + " bytes");
     }
 
     @Test
-    void testGenerateQRCodeWithJsonContent() {
-        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
+    void testGenerateQrCodeBytesWithLongContent() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 100; i++) {
+            sb.append("这是第").append(i).append("行测试数据\n");
+        }
         
-        String qrCodePath = QRCodeUtil.generateQRCode(jsonContent);
+        byte[] bytes = QRCodeUtil.generateQrCodeBytes(sb.toString());
         
-        assertNotNull(qrCodePath, "二维码路径不应为空");
-        assertTrue(qrCodePath.endsWith(".png"), "二维码文件应为PNG格式");
+        assertNotNull(bytes, "二维码字节数组不应为空");
+        assertTrue(bytes.length > 0, "长内容二维码应正常生成");
         
-        System.out.println("JSON内容二维码路径: " + qrCodePath);
+        System.out.println("长内容二维码字节大小: " + bytes.length + " bytes");
     }
-
-    @Test
-    void testGenerateQRCodeAndUploadToOSS() {
-        String jsonContent = "{\"id\":1,\"courseName\":\"瑜伽课\",\"coachId\":100,\"startTime\":\"2026-06-18T10:00:00\"}";
-        
-        String ossUrl = QRCodeUtil.generateQRCodeAndUploadToOSS(jsonContent);
-        
-        assertNotNull(ossUrl, "OSS访问地址不应为空");
-        assertTrue(ossUrl.startsWith("https://"), "OSS访问地址应为HTTPS");
-        assertTrue(ossUrl.contains("ycc-filesaver.oss-cn-beijing.aliyuncs.com"), "OSS访问地址应包含正确的域名");
-        assertTrue(ossUrl.contains("/qrcode/"), "OSS访问地址应包含qrcode目录");
-        assertTrue(ossUrl.endsWith(".png"), "OSS访问地址应为PNG格式");
-        
-        System.out.println("上传到OSS的二维码地址: " + ossUrl);
-    }
-}
+}

gym-manage-api/gym-member/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/config/WechatProperties.java

@@ -16,6 +16,9 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "wechat")
 public class WechatProperties {
 
+    // Mock模式：true=使用模拟数据，false=调用真实微信API
+    private Boolean mockEnabled;
+
     // 小程序配置
     private MiniApp miniapp = new MiniApp();
 

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());
@@ -63,13 +63,24 @@ public class MemberCardHandler {
     @Operation(summary = "更新会员卡类型", description = "更新会员卡类型信息")
     public Mono<ServerResponse> updateMemberCard(ServerRequest request) {
         Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(MemberCard.class)
-                .flatMap(card -> {
-                    card.setMemberCardId(id);
-                    return memberCardService.save(card);
+        return memberCardService.findByMemberCardIdAndDeletedAtIsNull(id)
+                .switchIfEmpty(Mono.error(new RuntimeException("会员卡不存在: " + id)))
+                .zipWith(request.bodyToMono(MemberCard.class))
+                .flatMap(tuple -> {
+                    MemberCard existing = tuple.getT1();
+                    MemberCard body = tuple.getT2();
+                    // 仅更新非 null 字段，避免 null 覆盖已有值
+                    if (body.getMemberCardName() != null) existing.setMemberCardName(body.getMemberCardName());
+                    if (body.getMemberCardType() != null) existing.setMemberCardType(body.getMemberCardType());
+                    if (body.getMemberCardPrice() != null) existing.setMemberCardPrice(body.getMemberCardPrice());
+                    if (body.getMemberCardValidityDays() != null) existing.setMemberCardValidityDays(body.getMemberCardValidityDays());
+                    if (body.getMemberCardTotalTimes() != null) existing.setMemberCardTotalTimes(body.getMemberCardTotalTimes());
+                    if (body.getMemberCardAmount() != null) existing.setMemberCardAmount(body.getMemberCardAmount());
+                    if (body.getMemberCardStatus() != null) existing.setMemberCardStatus(body.getMemberCardStatus());
+                    if (body.getExtraConfig() != null) existing.setExtraConfig(body.getExtraConfig());
+                    return memberCardService.save(existing);
                 })
-                .flatMap(updated -> ServerResponse.ok().bodyValue(updated))
-                .switchIfEmpty(ServerResponse.notFound().build());
+                .flatMap(updated -> ServerResponse.ok().bodyValue(updated));
     }
 
     @Operation(summary = "删除会员卡类型", description = "逻辑删除会员卡类型")
@@ -97,29 +108,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/MemberHandler.java

@@ -155,8 +155,8 @@ public class MemberHandler {
                             String decryptedPhone = AesUtil.decrypt(detail.getPhone());
                             detail.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
                         } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", detail.getId(), e);
-                            detail.setPhone(null);
+                            log.warn("手机号解密失败(可能为明文存储), memberId: {}", detail.getId());
+                            detail.setPhone(WechatPhoneUtil.maskPhone(detail.getPhone()));
                         }
                     }
                     return ServerResponse.ok()
@@ -204,8 +204,8 @@ public class MemberHandler {
                             String decryptedPhone = AesUtil.decrypt(member.getPhone());
                             member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
                         } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", member.getId(), e);
-                            member.setPhone(null);
+                            log.warn("手机号解密失败(可能为明文存储), memberId: {}", member.getId());
+                            member.setPhone(WechatPhoneUtil.maskPhone(member.getPhone()));
                         }
                     }
                     return member;
@@ -222,11 +222,13 @@ public class MemberHandler {
 
         int pageNum = NumberUtils.toInt(request.queryParam("pageNum").orElse("1"), 1);
         int pageSize = NumberUtils.toInt(request.queryParam("pageSize").orElse("10"), 10);
+        String sortField = request.queryParam("sortField").orElse(null);
+        String sortOrder = request.queryParam("sortOrder").orElse(null);
 
-        log.info("前台查看会员列表, adminId: {}, pageNum: {}, pageSize: {}", adminId, pageNum, pageSize);
-        // TODO: 补充签到记录
+        log.info("前台查看会员列表, adminId: {}, pageNum: {}, pageSize: {}, sortField: {}, sortOrder: {}",
+                adminId, pageNum, pageSize, sortField, sortOrder);
 
-        return memberService.findAll(pageNum, pageSize)
+        return memberService.findAll(pageNum, pageSize, sortField, sortOrder)
                 .map(member -> {
                     // 解密手机号
                     if (member.getPhone() != null && !member.getPhone().isEmpty()) {
@@ -234,8 +236,8 @@ public class MemberHandler {
                             String decryptedPhone = AesUtil.decrypt(member.getPhone());
                             member.setPhone(WechatPhoneUtil.maskPhone(decryptedPhone));
                         } catch (Exception e) {
-                            log.error("手机号解密失败, memberId: {}", member.getId(), e);
-                            member.setPhone(null);
+                            log.warn("手机号解密失败(可能为明文存储), memberId: {}", member.getId());
+                            member.setPhone(WechatPhoneUtil.maskPhone(member.getPhone()));
                         }
                     }
                     return member;

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);
 
     /**
@@ -101,9 +110,56 @@ public interface MemberCardRecordRepository extends R2dbcRepository<MemberCardRe
     @Query("SELECT * FROM member_card_record WHERE status = 'ACTIVE' AND expire_time < NOW() AND deleted_at IS NULL LIMIT 500")
     Flux<MemberCardRecord> findExpiredCards();
 
+    /**
+     * 根据支付订单ID查询会员卡记录（用于幂等性检查）
+     */
+    @Query("SELECT * FROM member_card_record WHERE source_order_id = :sourceOrderId AND deleted_at IS NULL")
+    Mono<MemberCardRecord> findBySourceOrderId(Long sourceOrderId);
+
+    /**
+     * 查询会员在指定时间后购买的同类活跃卡（防前端重复调用）
+     */
+    @Query("SELECT * FROM member_card_record WHERE member_id = :memberId AND member_card_id = :memberCardId AND status = 'ACTIVE' AND deleted_at IS NULL AND purchase_time > :since ORDER BY purchase_time DESC LIMIT 1")
+    Mono<MemberCardRecord> findRecentActivePurchase(Long memberId, Long memberCardId, LocalDateTime since);
+
     /**
      * 查询所有有效记录
      */
     @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);
+
     /**
      * 条件查询会员卡列表
      */
@@ -32,7 +46,7 @@ public interface MemberCardRepository extends R2dbcRepository<MemberCard, Long>
             "AND (:type IS NULL OR member_card_type = :type) " +
             "AND (:minPrice IS NULL OR member_card_price >= :minPrice) " +
             "AND (:maxPrice IS NULL OR member_card_price <= :maxPrice) " +
-            "ORDER BY created_at DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
+            "ORDER BY id ASC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
     Flux<MemberCard> findWithConditions(Integer status, String name, String type,
                                         Double minPrice, Double maxPrice, Pageable pageable);
 

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,80 @@
+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 + :addAmount, updated_at = NOW() " +
+            "WHERE member_id = :memberId AND deleted_at IS NULL")
+    Mono<Integer> refundBalance(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,106 @@
+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);
+
+    /**
+     * 储值卡返还（取消预约退款，仅增加余额不修改充值总额）
+     */
+    Mono<PayResult> refundToStoredCard(Long memberId, String password, BigDecimal amount, long cancelCount);
+
+    /**
+     * 储值卡返还（内部调用，无需密码，含手续费逻辑）
+     * @return 实际返还金额
+     */
+    Mono<BigDecimal> refundBalanceWithFee(Long memberId, BigDecimal amount, long cancelCount);
+
+    /**
+     * 查询会员的充值记录列表
+     */
+    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/MemberService.java

@@ -58,7 +58,7 @@ public interface MemberService {
      * @param pageSize 页大小
      * @return 所有会员信息
      */
-    Flux<Member> findAll(Integer pageNum, Integer pageSize);
+    Flux<Member> findAll(Integer pageNum, Integer pageSize, String sortField, String sortOrder);
 
     /**
      * 前台管理端获取会员详情（含会员卡信息）

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()
+                .flatMap(records -> {
+                    if (records.isEmpty()) {
+                        return Mono.empty();
+                    }
+                    
+                    // 优先找临期卡（剩余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 Mono.just(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 Mono.just(activeCard);
+                    }
+                    
+                    // 最后返回第一张卡
+                    return Mono.just(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;
@@ -44,6 +44,7 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
     private static final String MEMBER_CARD_CACHE_PREFIX = "member:card:";
     private static final long CACHE_EXPIRE_SECONDS = 300;
+    private static final long DUPLICATE_WINDOW_SECONDS = 10;
 
     public MemberCardServiceImpl(MemberCardRepository memberCardRepository,
                                  MemberCardRecordRepository recordRepository,
@@ -124,11 +125,42 @@ 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不能为空"));
+        }
+
+        // 快速路径：幂等性检查，同一笔支付订单已创建过记录则直接返回
+        if (sourceOrderId != null) {
+            return recordRepository.findBySourceOrderId(sourceOrderId)
+                    .flatMap(existingRecord -> {
+                        log.info("支付订单已生成会员卡记录，幂等返回: sourceOrderId={}, memberCardRecordId={}",
+                                sourceOrderId, existingRecord.getMemberCardRecordId());
+                        return Mono.just(existingRecord);
+                    })
+                    .switchIfEmpty(Mono.defer(() -> doPurchaseCard(memberId, memberCardId, sourceOrderId)));
+        }
+
+        // sourceOrderId为null（前端直接调用）：检查10秒内是否已有同类卡，防前端重复调用
+        LocalDateTime since = LocalDateTime.now().minusSeconds(DUPLICATE_WINDOW_SECONDS);
+        return recordRepository.findRecentActivePurchase(memberId, memberCardId, since)
+                .flatMap(existingRecord -> {
+                    log.info("前端重复购买检测命中: memberId={}, memberCardId={}, memberCardRecordId={}, purchaseTime={}",
+                            memberId, memberCardId, existingRecord.getMemberCardRecordId(), existingRecord.getPurchaseTime());
+                    return Mono.just(existingRecord);
+                })
+                .switchIfEmpty(Mono.defer(() -> doPurchaseCard(memberId, memberCardId, sourceOrderId)));
+    }
+
+    private Mono<MemberCardRecord> doPurchaseCard(Long memberId, Long memberCardId, Long sourceOrderId) {
+        // 前端传的是数据库主键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());
@@ -136,13 +168,25 @@ public class MemberCardServiceImpl implements IMemberCardService {
                     return distributedLockService.executeWithLock(
                             memberId.toString(),
                             cardType.name(),
-                            Mono.defer(() -> createCardRecord(memberId, memberCardId, sourceOrderId, card))
+                            Mono.defer(() -> {
+                                // 持锁后再次检查幂等，防止并发请求同时通过外层检查
+                                if (sourceOrderId != null) {
+                                    return recordRepository.findBySourceOrderId(sourceOrderId)
+                                            .flatMap(existingRecord -> {
+                                                log.info("持锁幂等检查命中: sourceOrderId={}, memberCardRecordId={}",
+                                                        sourceOrderId, existingRecord.getMemberCardRecordId());
+                                                return Mono.just(existingRecord);
+                                            })
+                                            .switchIfEmpty(Mono.defer(() -> createCardRecord(memberId, memberCardId, sourceOrderId, card)));
+                                }
+                                return createCardRecord(memberId, memberCardId, sourceOrderId, card);
+                            })
+                                    .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 +205,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 +239,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 +302,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 +372,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 +404,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 +418,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;
@@ -25,6 +26,7 @@ import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -139,7 +141,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());
 
@@ -218,13 +231,31 @@ public class MemberServiceImpl implements MemberService {
         );
     }
 
+    /** 合法的排序字段白名单，key=前端传值, value=数据库字段名 */
+    private static final java.util.Map<String, String> ALLOWED_SORT_FIELDS = java.util.Map.of(
+            "createdAt", "created_at",
+            "memberNo", "member_no",
+            "gender", "gender",
+            "id", "id"
+    );
+
     @Override
-    public Flux<Member> findAll(Integer pageNum, Integer pageSize) {
-        log.info("查询所有会员列表, pageNum: {}, pageSize: {}", pageNum, pageSize);
+    public Flux<Member> findAll(Integer pageNum, Integer pageSize, String sortField, String sortOrder) {
+        log.info("查询所有会员列表, pageNum: {}, pageSize: {}, sortField: {}, sortOrder: {}",
+                pageNum, pageSize, sortField, sortOrder);
+
+        // 排序方向：desc(默认) / asc
+        Sort.Direction direction = "asc".equalsIgnoreCase(sortOrder)
+                ? Sort.Direction.ASC : Sort.Direction.DESC;
+
+        // 排序字段白名单校验，不在白名单中则使用默认排序
+        String dbField = (sortField != null && ALLOWED_SORT_FIELDS.containsKey(sortField))
+                ? ALLOWED_SORT_FIELDS.get(sortField) : "created_at";
 
         Pageable pageable = PageRequest.of(
                 pageNum - 1,
-                pageSize
+                pageSize,
+                Sort.by(direction, dbField)
         );
 
         return memberRepository.findAllBy(pageable);
@@ -237,50 +268,51 @@ public class MemberServiceImpl implements MemberService {
         String cacheKey = MEMBER_DETAIL_CACHE_PREFIX + memberId;
 
         return redisUtil.get(cacheKey, MemberDetailVO.class)
-                .flatMap(cached -> {
-                    if (cached != null) {
-                        log.debug("从缓存获取会员详情, memberId: {}", memberId);
-                        return Mono.just(cached);
-                    }
-                    return memberRepository.findById(memberId)
-                            .zipWith(
-                                    memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
-                                            .collectList(),
-                                    (baseInfo, cardList) -> {
-                                        MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
+                .filter(cached -> cached != null)
+                .switchIfEmpty(Mono.defer(() ->
+                        memberRepository.findById(memberId)
+                                .switchIfEmpty(Mono.error(() -> {
+                                    log.error("会员不存在: memberId={}", memberId);
+                                    throw new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                                }))
+                                .zipWith(
+                                        memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
+                                                .collectList(),
+                                        (baseInfo, cardList) -> {
+                                            MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
 
-                                        GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
-                                        memberDetailVO.setGenderDesc(genderEnum.getDesc());
+                                            GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
+                                            memberDetailVO.setGenderDesc(genderEnum.getDesc());
 
-                                        List<MemberCardInfoVO> enrichedCards = cardList.stream()
-                                                .peek(vo -> {
-                                                    if (vo.getMemberCardType() != null) {
-                                                        try {
-                                                            MemberCardType cardType = MemberCardType.valueOf(vo.getMemberCardType());
-                                                            vo.setMemberCardTypeDesc(cardType.getDesc());
-                                                        } catch (IllegalArgumentException e) {
-                                                            vo.setMemberCardTypeDesc(vo.getMemberCardType());
+                                            List<MemberCardInfoVO> enrichedCards = cardList.stream()
+                                                    .peek(vo -> {
+                                                        if (vo.getMemberCardType() != null) {
+                                                            try {
+                                                                MemberCardType cardType = MemberCardType.valueOf(vo.getMemberCardType());
+                                                                vo.setMemberCardTypeDesc(cardType.getDesc());
+                                                            } catch (IllegalArgumentException e) {
+                                                                vo.setMemberCardTypeDesc(vo.getMemberCardType());
+                                                            }
                                                         }
-                                                    }
-                                                    if (vo.getMemberCardStatus() != null) {
-                                                        vo.setMemberCardStatusDesc(vo.getMemberCardStatus() == 1 ? "上架" : "下架");
-                                                    }
-                                                })
-                                                .collect(Collectors.toList());
-                                        memberDetailVO.setMemberCards(enrichedCards);
+                                                        if (vo.getMemberCardStatus() != null) {
+                                                            vo.setMemberCardStatusDesc(vo.getMemberCardStatus() == 1 ? "上架" : "下架");
+                                                        }
+                                                    })
+                                                    .collect(Collectors.toList());
+                                            memberDetailVO.setMemberCards(enrichedCards);
 
-                                        long activeCount = enrichedCards.stream()
-                                                .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
-                                                .count();
-                                        memberDetailVO.setActiveCardCount((int) activeCount);
-                                        memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
+                                            long activeCount = enrichedCards.stream()
+                                                    .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
+                                                    .count();
+                                            memberDetailVO.setActiveCardCount((int) activeCount);
+                                            memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
 
-                                        return memberDetailVO;
-                                    }
-                            )
-                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
-                                    .then(Mono.just(vo)));
-                });
+                                            return memberDetailVO;
+                                        }
+                                )
+                                .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                                        .then(Mono.just(vo)))
+                ));
     }
 
 

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

@@ -0,0 +1,236 @@
+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 cn.novalon.gym.manage.sys.core.service.ISysConfigService;
+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 ISysConfigService sysConfigService;
+    private final BCryptPasswordEncoder passwordEncoder;
+
+    public MemberStoredCardServiceImpl(MemberStoredCardRepository memberStoredCardRepository,
+                                        MemberStoredCardRechargeRepository memberStoredCardRechargeRepository,
+                                        ISysConfigService sysConfigService) {
+        this.memberStoredCardRepository = memberStoredCardRepository;
+        this.memberStoredCardRechargeRepository = memberStoredCardRechargeRepository;
+        this.sysConfigService = sysConfigService;
+        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 Mono<PayResult> refundToStoredCard(Long memberId, String password, BigDecimal amount, long cancelCount) {
+        // 从系统配置读取免手续费次数阈值，默认3次
+        Mono<Long> freeLimitMono = sysConfigService.getConfigValue("group_course.cancel_free_limit")
+                .map(Long::parseLong)
+                .defaultIfEmpty(3L);
+
+        return freeLimitMono.flatMap(freeLimit ->
+            memberStoredCardRepository.findByMemberId(memberId)
+                .flatMap(card -> {
+                    // 验证密码
+                    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("支付密码错误"));
+                    }
+
+                    // 前N次取消不扣手续费，超出后扣除10%
+                    BigDecimal refundAmount = amount;
+                    BigDecimal fee = BigDecimal.ZERO;
+                    if (cancelCount >= freeLimit) {
+                        fee = amount.multiply(new BigDecimal("0.1")).setScale(2, java.math.RoundingMode.HALF_UP);
+                        refundAmount = amount.subtract(fee);
+                        log.info("[储值卡退款] 第{}次取消，已超出免手续费阈值({}次)，扣除10%手续费: 原额={}, 手续费={}, 退款={}",
+                                cancelCount + 1, freeLimit, amount, fee, refundAmount);
+                    } else {
+                        log.info("[储值卡退款] 第{}次取消，在免手续费阈值({}次)内，全额退款: 原额={}",
+                                cancelCount + 1, freeLimit, amount);
+                    }
+
+                    // 执行退款
+                    BigDecimal finalRefundAmount = refundAmount;
+                    return memberStoredCardRepository.refundBalance(memberId, refundAmount)
+                            .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, finalRefundAmount);
+                                    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<BigDecimal> refundBalanceWithFee(Long memberId, BigDecimal amount, long cancelCount) {
+        return sysConfigService.getConfigValue("group_course.cancel_free_limit")
+                .map(Long::parseLong)
+                .defaultIfEmpty(3L)
+                .flatMap(freeLimit -> {
+                    BigDecimal refundAmount;
+                    if (cancelCount >= freeLimit) {
+                        BigDecimal fee = amount.multiply(new BigDecimal("0.1")).setScale(2, java.math.RoundingMode.HALF_UP);
+                        refundAmount = amount.subtract(fee);
+                        log.info("[储值卡退款-内部] 第{}次取消，超出免手续费阈值({}次)，扣除10%: 原额={}, 手续费={}, 退款={}",
+                                cancelCount + 1, freeLimit, amount, fee, refundAmount);
+                    } else {
+                        refundAmount = amount;
+                        log.info("[储值卡退款-内部] 第{}次取消，在免手续费阈值({}次)内，全额退款: {}", 
+                                cancelCount + 1, freeLimit, amount);
+                    }
+                    return memberStoredCardRepository.refundBalance(memberId, refundAmount)
+                            .flatMap(rows -> {
+                                if (rows > 0) {
+                                    return Mono.just(refundAmount);
+                                }
+                                return Mono.error(new RuntimeException("储值卡退款失败"));
+                            });
+                });
+    }
+
+    @Override
+    public Mono<Long> countRechargeRecords(Long memberId) {
+        return memberStoredCardRechargeRepository.countByMemberIdAndDeletedAtIsNull(memberId);
+    }
+}

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

@@ -43,12 +43,25 @@ public class WechatApiServiceImpl implements WechatApiService {
 
     @Override
     public Mono<Map<String, String>> jsCode2Session(String code) {
-        log.info("微信jsCode2Session API");
-        log.info("信息 - AppID: {}, AppSecret {}",
+        log.info("微信jsCode2Session API, code: {}", code);
+
+        // Mock模式：返回模拟数据
+        if (wechatProperties.getMockEnabled() != null && wechatProperties.getMockEnabled()) {
+            log.info("Mock模式已启用，返回模拟微信登录数据");
+            Map<String, String> mockResult = new HashMap<>();
+            // 使用 code 的哈希生成唯一的 openid，确保每次登录创建不同用户
+            String mockOpenId = "mock_openid_" + Math.abs(code.hashCode() % 1000000);
+            mockResult.put("openid", mockOpenId);
+            mockResult.put("session_key", "mock_session_key");
+            mockResult.put("unionid", "mock_unionid_" + Math.abs(code.hashCode() % 1000000));
+            log.info("Mock微信API响应成功, openid: {}, unionid: {}", mockOpenId, mockResult.get("unionid"));
+            return Mono.just(mockResult);
+        }
+
+        log.info("真实微信API调用 - AppID: {}, AppSecret {}",
                 wechatProperties.getMiniapp().getAppId(),
                 wechatProperties.getMiniapp().getAppSecret() != null ?
                     wechatProperties.getMiniapp().getAppSecret().substring(0, Math.min(4, wechatProperties.getMiniapp().getAppSecret().length())) + "***" : "null");
-        log.info(" - code: {}", code);
 
         return webClient.get()
                 .uri(uriBuilder -> uriBuilder
@@ -152,6 +165,12 @@ public class WechatApiServiceImpl implements WechatApiService {
     public Mono<String> getAccessToken(String appType) {
         log.debug("获取access_token, appType: {}", appType);
 
+        // Mock模式：返回模拟access_token
+        if (wechatProperties.getMockEnabled() != null && wechatProperties.getMockEnabled()) {
+            log.debug("Mock模式已启用，返回模拟access_token");
+            return Mono.just("mock_access_token");
+        }
+
         String cacheKey = ACCESS_TOKEN_CACHE_PREFIX + appType;
 
         return redisUtil.get(cacheKey, String.class)

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

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.novalon.gym.manage</groupId>
+        <artifactId>gym-manage-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <groupId>cn.novalon.gym.manage</groupId>
+    <artifactId>gym-payment</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Gym Payment</name>
+    <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>
+
+        <!-- 汇付聚合支付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/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/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

@@ -0,0 +1,247 @@
+package cn.novalon.gym.manage.payment.handler;
+
+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;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerResponse;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+@Tag(name = "支付管理", description = "支付宝App支付接口")
+public class PaymentHandler {
+
+    private final PaymentService paymentService;
+    private final AuthUtil authUtil;
+
+    public PaymentHandler(PaymentService paymentService, AuthUtil authUtil) {
+        this.paymentService = paymentService;
+        this.authUtil = authUtil;
+    }
+
+    @Operation(summary = "创建支付订单", description = "创建支付宝App支付订单")
+    public Mono<ServerResponse> createPayment(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.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> 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");
+        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 = "接收汇付异步回调通知")
+    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"));
+                    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("退款申请失败"));
+                                }
+                            });
+                })
+                .onErrorResume(e -> {
+                    log.error("[Payment] 退款异常: orderId={}", orderId, e);
+                    return ServerResponse.ok()
+                            .bodyValue(ApiResponse.error("退款失败: " + 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()));
+                });
+    }
+
+    @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()));
+                });
+    }
+
+    @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/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/java/cn/novalon/gym/manage/payment/service/impl/PaymentServiceImpl.java

@@ -0,0 +1,937 @@
+package cn.novalon.gym.manage.payment.service.impl;
+
+import cn.novalon.gym.manage.common.util.RedisUtil;
+import cn.novalon.gym.manage.payment.config.HuifuProperties;
+import cn.novalon.gym.manage.payment.dto.CreatePaymentRequest;
+import cn.novalon.gym.manage.payment.dto.PaymentResponse;
+import cn.novalon.gym.manage.payment.entity.PaymentOrder;
+import cn.novalon.gym.manage.payment.repository.PaymentOrderRepository;
+import cn.novalon.gym.manage.payment.service.PaymentNotifyService;
+import cn.novalon.gym.manage.payment.service.PaymentService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+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.V2TradePaymentScanpayQueryRequest;
+import com.huifu.bspay.sdk.opps.core.utils.DateTools;
+import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
+import com.huifu.dg.lightning.biz.client.CommonPayClient;
+import com.huifu.dg.lightning.biz.exception.BasePayException;
+import com.huifu.dg.lightning.factory.Factory;
+import com.huifu.dg.lightning.models.payment.TradePaymentCreateRequest;
+import com.huifu.dg.lightning.models.payment.TradePaymentScanpayQueryRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.UUID;
+
+@Slf4j
+@Service
+public class PaymentServiceImpl implements PaymentService {
+
+    private static final String PROCESSED_TRADE_PREFIX = "huifu:processed:trade:";
+    private static final long IDEMPOTENT_EXPIRE_SECONDS = 86400;
+    private static final int ORDER_EXPIRE_MINUTES = 15;
+    private static final String TEST_AMOUNT = "1";
+
+    private final HuifuProperties huifuProperties;
+    private final PaymentOrderRepository paymentOrderRepository;
+    private final RedisUtil redisUtil;
+    private final PaymentNotifyService paymentNotifyService;
+
+    public PaymentServiceImpl(HuifuProperties huifuProperties,
+                              PaymentOrderRepository paymentOrderRepository,
+                              RedisUtil redisUtil,
+                              PaymentNotifyService paymentNotifyService) {
+        this.huifuProperties = huifuProperties;
+        this.paymentOrderRepository = paymentOrderRepository;
+        this.redisUtil = redisUtil;
+        this.paymentNotifyService = paymentNotifyService;
+    }
+
+    @Override
+    public Mono<PaymentResponse> createPayment(Long memberId, CreatePaymentRequest request) {
+        return alipayAppPay(memberId, request);
+    }
+
+    @Override
+    public Mono<PaymentResponse> alipayAppPay(Long memberId, CreatePaymentRequest request) {
+        log.info("[Huifu] APP支付下单开始, memberId={}, goodsDesc={}, transAmt={}",
+                memberId, request.getGoodsDesc(), request.getTransAmt());
+
+        if (!huifuProperties.isSdkInitialized()) {
+            log.warn("[Huifu] 支付SDK未初始化，返回模拟订单");
+            return createMockOrder(memberId, request, "ALIPAY");
+        }
+
+        return paymentOrderRepository.findLatestPendingOrder(memberId, request.getOrderType())
+                .flatMap(existingOrder -> {
+                    log.info("[Huifu] 存在未支付订单, 直接返回, orderNo={}", existingOrder.getOrderNo());
+                    return Mono.just(convertToResponse(existingOrder));
+                })
+                .switchIfEmpty(Mono.defer(() -> doCreatePayment(memberId, request, "ALIPAY")));
+    }
+
+    @Override
+    public Mono<PaymentResponse> alipayQrCodePay(Long memberId, CreatePaymentRequest request) {
+        log.info("[Huifu] 扫码支付下单开始, memberId={}, goodsDesc={}, transAmt={}",
+                memberId, request.getGoodsDesc(), request.getTransAmt());
+
+        if (!huifuProperties.isSdkInitialized()) {
+            log.warn("[Huifu] 支付SDK未初始化，返回模拟扫码订单");
+            return createMockOrder(memberId, request, "QRCODE");
+        }
+
+        return paymentOrderRepository.findLatestPendingOrder(memberId, request.getOrderType())
+                .flatMap(existingOrder -> {
+                    log.info("[Huifu] 存在未支付订单, 直接返回, orderNo={}", existingOrder.getOrderNo());
+                    return Mono.just(convertToResponse(existingOrder));
+                })
+                .switchIfEmpty(Mono.defer(() -> doCreatePayment(memberId, request, "QRCODE")));
+    }
+
+    private Mono<PaymentResponse> doCreatePayment(Long memberId, CreatePaymentRequest request, String tradeType) {
+        String orderNo = generateOrderNo();
+        String reqSeqId = SequenceTools.getReqSeqId32();
+        String reqDate = DateTools.getCurrentDateYYYYMMDD();
+        String transAmt = TEST_AMOUNT;
+
+        log.info("[Huifu] 测试模式, 强制金额为0.01元, 前端传入金额={}", request.getTransAmt());
+
+        return Mono.fromCallable(() -> {
+            TradePaymentCreateRequest createRequest = new TradePaymentCreateRequest();
+            createRequest.setReqDate(reqDate);
+            createRequest.setReqSeqId(reqSeqId);
+            createRequest.setHuifuId(huifuProperties.getMerchant().getHuifuId());
+            createRequest.setTradeType("A_NATIVE");
+            createRequest.setTransAmt(formatAmount(transAmt));
+            createRequest.setGoodsDesc(truncate(request.getGoodsDesc(), 128));
+            createRequest.setRemark(request.getRemark());
+            createRequest.setNotifyUrl(huifuProperties.getNotify().getUrl());
+            createRequest.addExtendInfo("out_ord_id", orderNo);
+
+            CommonPayClient client = Factory.Payment.Common();
+            return client.create(createRequest);
+        })
+        .subscribeOn(Schedulers.boundedElastic())
+        .flatMap(response -> {
+            log.info("[Huifu] 支付下单响应, orderNo={}, response={}", orderNo, response);
+            
+            String outOrdId = String.valueOf(response.getOrDefault("out_ord_id", ""));
+            String merchantOrderId = String.valueOf(response.getOrDefault("merchant_order_id", ""));
+            String orgReqSeqId = String.valueOf(response.getOrDefault("org_req_seq_id", ""));
+            log.info("[Huifu] 汇付返回的订单号字段: out_ord_id={}, merchant_order_id={}, org_req_seq_id={}", outOrdId, merchantOrderId, orgReqSeqId);
+
+            String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+            boolean success = "00000000".equals(respCode) || "00000100".equals(respCode);
+
+            PaymentOrder paymentOrder = PaymentOrder.builder()
+                    .orderNo(orderNo)
+                    .memberId(memberId)
+                    .orderType(request.getOrderType())
+                    .goodsDesc(request.getGoodsDesc())
+                    .transAmt(new BigDecimal(transAmt).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP))
+                    .tradeType(tradeType)
+                    .payStatus(success ? "PENDING" : "FAIL")
+                    .huifuId(huifuProperties.getMerchant().getHuifuId())
+                    .reqSeqId(reqSeqId)
+                    .reqDate(reqDate)
+                    .hfSeqId(String.valueOf(response.getOrDefault("hf_seq_id", "")))
+                    .partyOrderId(String.valueOf(response.getOrDefault("party_order_id", "")))
+                    .remark(request.getRemark())
+                    .notifyUrl(huifuProperties.getNotify().getUrl())
+                    .expireTime(LocalDateTime.now().plusMinutes(ORDER_EXPIRE_MINUTES))
+                    .errorCode(success ? null : respCode)
+                    .errorMsg(success ? null : String.valueOf(response.getOrDefault("resp_desc", "")))
+                    .build();
+
+            String payInfo = extractPayInfo(response);
+            paymentOrder.setPayInfo(payInfo);
+            paymentOrder.setPayUrl(payInfo);
+            paymentOrder.setQrCode(payInfo);
+
+            return paymentOrderRepository.save(paymentOrder)
+                    .map(savedOrder -> {
+                        log.info("[Huifu] 支付订单创建成功, orderNo={}", orderNo);
+                        return convertToResponse(savedOrder);
+                    });
+        })
+        .onErrorResume(e -> {
+            log.error("[Huifu] 支付下单异常, orderNo={}", orderNo, e);
+            String errorCode = "UNKNOWN_ERROR";
+            String errorMsg = e.getMessage();
+            if (e instanceof BasePayException) {
+                errorCode = ((BasePayException) e).getCode();
+            }
+            PaymentResponse resp = PaymentResponse.builder()
+                    .orderId(orderNo)
+                    .status("FAIL")
+                    .errorCode(errorCode)
+                    .errorMsg(errorMsg)
+                    .build();
+            return Mono.just(resp);
+        });
+    }
+
+    @Override
+    public Mono<PaymentResponse> getPaymentStatus(Long memberId, String orderId) {
+        log.info("[Huifu] 查询支付状态, memberId={}, orderId={}", memberId, orderId);
+
+        return paymentOrderRepository.findByOrderNo(orderId)
+                .flatMap(order -> {
+                    if (!memberId.equals(order.getMemberId())) {
+                        log.warn("[Huifu] 订单不属于当前会员, memberId={}, orderMemberId={}", memberId, order.getMemberId());
+                        return Mono.just(PaymentResponse.builder()
+                                .orderId(orderId)
+                                .status("NOT_FOUND")
+                                .errorMsg("订单不存在")
+                                .build());
+                    }
+
+                    if ("SUCCESS".equals(order.getPayStatus())
+                            || "CLOSED".equals(order.getPayStatus())
+                            || "FAIL".equals(order.getPayStatus())) {
+                        return Mono.just(convertToResponse(order));
+                    }
+
+                    if (!huifuProperties.isSdkInitialized()) {
+                        return Mono.just(convertToResponse(order));
+                    }
+
+                    return Mono.fromCallable(() -> queryFromHuifu(order))
+                            .subscribeOn(Schedulers.boundedElastic())
+                            .flatMap(response -> {
+                                log.info("[Huifu] 查询支付状态响应, orderId={}, resp_code={}, trans_stat={}", 
+                                        orderId, 
+                                        response.getOrDefault("resp_code", ""),
+                                        response.getOrDefault("trans_stat", ""));
+
+                                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                                String transStat = String.valueOf(response.getOrDefault("trans_stat", ""));
+
+                                if ("00000000".equals(respCode)) {
+                                    if ("S".equals(transStat)) {
+                                        if (!"SUCCESS".equals(order.getPayStatus())) {
+                                            log.info("[Huifu] 查询到支付成功，更新订单状态并触发业务通知, orderNo={}", order.getOrderNo());
+                                            order.setPayStatus("SUCCESS");
+                                            order.setHfSeqId(String.valueOf(response.getOrDefault("hf_seq_id", order.getHfSeqId())));
+                                            order.setPayTime(LocalDateTime.now());
+                                            return paymentOrderRepository.save(order)
+                                                    .flatMap(savedOrder -> {
+                                                        log.info("[Huifu] 订单状态已更新为SUCCESS, orderNo={}", savedOrder.getOrderNo());
+                                                        return paymentNotifyService.notifyPaymentStatus(savedOrder.getOrderNo(), "SUCCESS", savedOrder.getMemberId())
+                                                                .thenReturn(convertToResponse(savedOrder));
+                                                    });
+                                        } else {
+                                            log.info("[Huifu] 订单已处理过，跳过, orderNo={}", order.getOrderNo());
+                                        }
+                                    } else if ("F".equals(transStat)) {
+                                        if (!"FAIL".equals(order.getPayStatus())) {
+                                            log.info("[Huifu] 查询到支付失败，仅更新订单状态, orderNo={}", order.getOrderNo());
+                                            order.setPayStatus("FAIL");
+                                            order.setErrorMsg(String.valueOf(response.getOrDefault("resp_desc", "支付失败")));
+                                            return paymentOrderRepository.save(order)
+                                                    .map(savedOrder -> convertToResponse(savedOrder));
+                                        }
+                                    } else if ("P".equals(transStat)) {
+                                        order.setPayStatus("PENDING");
+                                    }
+                                } else {
+                                    log.warn("[Huifu] 查询返回非成功状态码, orderId={}, resp_code={}, resp_desc={}", 
+                                            orderId, respCode, response.getOrDefault("resp_desc", ""));
+                                }
+
+                                return paymentOrderRepository.save(order)
+                                        .map(savedOrder -> convertToResponse(savedOrder));
+                            })
+                            .onErrorResume(e -> {
+                                log.error("[Huifu] 查询支付状态异常, orderId={}", orderId, e);
+                                return Mono.just(convertToResponse(order));
+                            });
+                })
+                .switchIfEmpty(Mono.defer(() -> {
+                    log.warn("[Huifu] 订单不存在, orderId={}", orderId);
+                    return Mono.just(PaymentResponse.builder()
+                            .orderId(orderId)
+                            .status("NOT_FOUND")
+                            .errorMsg("订单不存在")
+                            .build());
+                }));
+    }
+
+    private Map<String, Object> queryFromHuifu(PaymentOrder order) {
+        String orderNo = order.getOrderNo();
+        String hfSeqId = order.getHfSeqId();
+
+        log.info("[Huifu] 开始从汇付查询订单状态, orderNo={}, hfSeqId={}", orderNo, hfSeqId);
+
+        List<String> huifuIds = new ArrayList<>();
+        if (huifuProperties.getMerchant() != null && huifuProperties.getMerchant().getHuifuId() != null) {
+            huifuIds.add(huifuProperties.getMerchant().getHuifuId());
+        }
+        if (huifuProperties.getChannel() != null && huifuProperties.getChannel().getHuifuId() != null) {
+            String channelHuifuId = huifuProperties.getChannel().getHuifuId();
+            if (!huifuIds.contains(channelHuifuId)) {
+                huifuIds.add(channelHuifuId);
+            }
+        }
+
+        log.info("[Huifu] 查询ID列表: huifuIds={}", huifuIds);
+
+        for (String huifuId : huifuIds) {
+            try {
+                if (hfSeqId != null && !hfSeqId.isEmpty() && !"null".equals(hfSeqId)) {
+                    Map<String, Object> response = executeV2QueryByHfSeqId(huifuId, hfSeqId);
+                    String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                    log.info("[Huifu] 按汇付流水号查询: huifuId={}, hfSeqId={}, resp_code={}", huifuId, hfSeqId, respCode);
+                    if ("00000000".equals(respCode)) {
+                        return response;
+                    }
+                }
+
+                Map<String, Object> response = executeV2QueryByOrgReqSeqId(huifuId, order.getReqSeqId());
+                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                log.info("[Huifu] 按请求流水号查询: huifuId={}, reqSeqId={}, resp_code={}", huifuId, order.getReqSeqId(), respCode);
+                if ("00000000".equals(respCode)) {
+                    return response;
+                }
+
+                response = executeV4SingleQuery(huifuId, orderNo);
+                respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                log.info("[Huifu] V4接口按订单号查询: huifuId={}, orderNo={}, resp_code={}", huifuId, orderNo, respCode);
+                if ("00000000".equals(respCode)) {
+                    return response;
+                }
+
+                response = executeV2SingleQuery(huifuId, orderNo);
+                respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                log.info("[Huifu] V2接口按订单号查询: huifuId={}, orderNo={}, resp_code={}", huifuId, orderNo, respCode);
+                if ("00000000".equals(respCode)) {
+                    return response;
+                }
+            } catch (Exception e) {
+                log.warn("[Huifu] 查询异常, huifuId={}, orderNo={}", huifuId, orderNo, e);
+            }
+        }
+
+        log.warn("[Huifu] 所有查询方式均未成功, orderNo={}", orderNo);
+        Map<String, Object> emptyResult = new HashMap<>();
+        emptyResult.put("resp_code", "QUERY_FAILED");
+        emptyResult.put("resp_desc", "查询失败");
+        return emptyResult;
+    }
+
+    @Override
+    public Mono<String> handleAlipayNotify(Map<String, String> params) {
+        String respData = params.get("resp_data");
+        String sign = params.get("sign");
+
+        log.info("[Huifu] 收到异步通知, respData={}, sign={}", respData, sign);
+
+        if (respData == null || sign == null) {
+            log.error("[Huifu] 异步通知参数为空");
+            return Mono.just("FAIL");
+        }
+
+        JSONObject notification = JSONObject.parseObject(respData);
+        String reqSeqId = notification.getString("req_seq_id");
+        String hfSeqId = notification.getString("hf_seq_id");
+        String transStat = notification.getString("trans_stat");
+
+        log.info("[Huifu] 解析异步通知, reqSeqId={}, hfSeqId={}, transStat={}", reqSeqId, hfSeqId, transStat);
+
+        return isTradeProcessed(reqSeqId)
+                .flatMap(processed -> {
+                    if (processed) {
+                        log.info("[Huifu] 幂等处理：通知已处理，跳过, reqSeqId={}", reqSeqId);
+                        return Mono.just("RECV_ORD_ID_" + reqSeqId);
+                    }
+
+                    return paymentOrderRepository.findByReqSeqId(reqSeqId)
+                            .flatMap(order -> {
+                                if ("S".equals(transStat)) {
+                                    log.info("[Huifu] 交易成功, hfSeqId={}, orderNo={}", hfSeqId, order.getOrderNo());
+                                    order.setPayStatus("SUCCESS");
+                                    order.setHfSeqId(hfSeqId);
+                                    order.setPayTime(LocalDateTime.now());
+                                    return paymentOrderRepository.save(order)
+                                            .flatMap(saved -> markTradeProcessed(reqSeqId))
+                                            .then(paymentNotifyService.notifyPaymentStatus(order.getOrderNo(), "SUCCESS", order.getMemberId()))
+                                            .thenReturn("RECV_ORD_ID_" + reqSeqId);
+                                } else if ("F".equals(transStat)) {
+                                    log.info("[Huifu] 交易失败, hfSeqId={}, orderNo={}", hfSeqId, order.getOrderNo());
+                                    order.setPayStatus("FAIL");
+                                    order.setErrorMsg(notification.getString("resp_desc"));
+                                    return paymentOrderRepository.save(order)
+                                            .flatMap(saved -> markTradeProcessed(reqSeqId))
+                                            .then(paymentNotifyService.notifyPaymentStatus(order.getOrderNo(), "FAIL", order.getMemberId()))
+                                            .thenReturn("RECV_ORD_ID_" + reqSeqId);
+                                } else if ("P".equals(transStat)) {
+                                    log.info("[Huifu] 交易处理中, hfSeqId={}, orderNo={}", hfSeqId, order.getOrderNo());
+                                    return paymentNotifyService.notifyPaymentStatus(order.getOrderNo(), "PENDING", order.getMemberId())
+                                            .thenReturn("RECV_ORD_ID_" + reqSeqId);
+                                }
+                                return Mono.just("RECV_ORD_ID_" + reqSeqId);
+                            })
+                            .switchIfEmpty(Mono.defer(() -> {
+                                log.warn("[Huifu] 未找到对应订单, reqSeqId={}", reqSeqId);
+                                return Mono.just("FAIL");
+                            }));
+                })
+                .onErrorResume(e -> {
+                    log.error("[Huifu] 处理异步通知异常", e);
+                    return Mono.just("FAIL");
+                });
+    }
+
+    @Override
+    public Mono<Boolean> refund(Long memberId, String orderId, String refundAmt) {
+        log.warn("[Huifu] 退款功能暂未实现, memberId={}, orderId={}, refundAmt={}", memberId, orderId, refundAmt);
+        return Mono.just(false);
+    }
+
+    @Override
+    public Flux<PaymentResponse> getAllPaymentOrders(Long memberId) {
+        System.err.println("========== 开始查询交易记录, memberId=" + memberId + " ==========");
+        return paymentOrderRepository.findByMemberIdAndDeletedAtIsNull(memberId)
+                .doOnNext(order -> {
+                    System.err.println("订单记录:");
+                    System.err.println("  ID: " + order.getId());
+                    System.err.println("  订单号: " + order.getOrderNo());
+                    System.err.println("  汇付流水号: " + order.getHfSeqId());
+                    System.err.println("  商户号: " + order.getHuifuId());
+                    System.err.println("  请求流水号: " + order.getReqSeqId());
+                    System.err.println("  请求日期: " + order.getReqDate());
+                    System.err.println("  支付状态: " + order.getPayStatus());
+                    System.err.println("  交易金额: " + order.getTransAmt());
+                    System.err.println("  创建时间: " + order.getCreatedAt());
+                    System.err.println("----------------------------------------");
+                })
+                .doOnComplete(() -> {
+                    System.err.println("========== 查询完成 ==========");
+                })
+                .map(this::convertToResponse);
+    }
+
+    @Override
+    public Mono<Map<String, Object>> queryHuifuTradeList(Long memberId, String beginDate, String endDate) {
+        log.info("[Huifu] 查询斗拱官方交易记录, memberId={}, beginDate={}, endDate={}", memberId, beginDate, endDate);
+
+        return Mono.fromCallable(() -> {
+            String today = DateTools.getCurrentDateYYYYMMDD();
+            
+            java.time.LocalDate todayDate = java.time.LocalDate.parse(today, java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            java.time.LocalDate yesterdayDate = todayDate.minusDays(1);
+            String yesterday = yesterdayDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            
+            String effectiveEndDate = (endDate != null && !endDate.isEmpty()) ? endDate : yesterday;
+            String effectiveBeginDate = (beginDate != null && !beginDate.isEmpty()) ? beginDate : yesterday;
+
+            Map<String, Object> allResults = new java.util.HashMap<>();
+            allResults.put("begin_date", effectiveBeginDate);
+            allResults.put("end_date", effectiveEndDate);
+            allResults.put("note", "斗拱对账文件T+1生成，当日交易次日可查；如已知订单号请使用/api/payment/huifu/query?outOrdId=xxx单笔查询");
+
+            java.util.List<Map<String, Object>> tradeList = new java.util.ArrayList<>();
+            java.util.List<Map<String, Object>> apiResults = new java.util.ArrayList<>();
+
+            java.util.List<String> huifuIds = new java.util.ArrayList<>();
+            if (huifuProperties.getMerchant() != null && huifuProperties.getMerchant().getHuifuId() != null) {
+                huifuIds.add(huifuProperties.getMerchant().getHuifuId());
+            }
+            if (huifuProperties.getChannel() != null && huifuProperties.getChannel().getHuifuId() != null) {
+                String channelId = huifuProperties.getChannel().getHuifuId();
+                if (!huifuIds.contains(channelId)) {
+                    huifuIds.add(channelId);
+                }
+            }
+
+            allResults.put("huifu_ids", huifuIds);
+
+            java.time.LocalDate startDate = java.time.LocalDate.parse(effectiveBeginDate, java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+            java.time.LocalDate endDateObj = java.time.LocalDate.parse(effectiveEndDate, java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+            String[] billTypes = {"TRADE_BILL", "MERGE_BILL"};
+
+            for (String huifuId : huifuIds) {
+                log.info("[Huifu] 使用 huifuId={} 查询对账文件", huifuId);
+
+                for (java.time.LocalDate date = startDate; !date.isAfter(endDateObj); date = date.plusDays(1)) {
+                    String fileDate = date.format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+                    
+                    for (String billType : billTypes) {
+                        try {
+                            V2TradeCheckFilequeryRequest request = new V2TradeCheckFilequeryRequest();
+                            request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+                            request.setReqSeqId(SequenceTools.getReqSeqId32());
+                            request.setHuifuId(huifuId);
+                            request.setFileDate(fileDate);
+
+                            Map<String, Object> extendInfoMap = new java.util.HashMap<>();
+                            extendInfoMap.put("bill_type", billType);
+                            request.setExtendInfo(extendInfoMap);
+
+                            log.info("[Huifu] 调用对账单查询接口, billType={}, fileDate={}, huifuId={}", billType, fileDate, 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", ""));
+
+                            log.info("[Huifu] 对账单查询响应: billType={}, fileDate={}, resp_code={}, resp_desc={}", billType, fileDate, respCode, respDesc);
+
+                            Map<String, Object> apiResult = new java.util.HashMap<>();
+                            apiResult.put("api", "V2TradeCheckFilequeryRequest");
+                            apiResult.put("bill_type", billType);
+                            apiResult.put("file_date", fileDate);
+                            apiResult.put("huifu_id", huifuId);
+                            apiResult.put("resp_code", respCode);
+                            apiResult.put("resp_desc", respDesc);
+
+                            if ("00000000".equals(respCode)) {
+                                apiResult.put("full_response", response);
+                                
+                                Object fileDetails = response.get("file_details");
+                                Object fileList = response.get("file_list");
+                                Object taskDetails = response.get("task_details");
+                                Object billList = response.get("bill_list");
+                                Object downloadUrl = response.get("download_url");
+                                Object fileName = response.get("file_name");
+                                
+                                boolean hasData = false;
+                                if (fileDetails != null && !"null".equals(String.valueOf(fileDetails)) && !String.valueOf(fileDetails).isEmpty()) {
+                                    apiResult.put("file_details", fileDetails);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到file_details, billType={}, fileDate={}", billType, fileDate);
+                                    try {
+                                        if (fileDetails instanceof java.util.List) {
+                                            java.util.List<?> detailsList = (java.util.List<?>) fileDetails;
+                                            for (Object detail : detailsList) {
+                                                if (detail instanceof Map) {
+                                                    tradeList.add((Map<String, Object>) detail);
+                                                }
+                                            }
+                                        } else if (fileDetails instanceof Map) {
+                                            tradeList.add((Map<String, Object>) fileDetails);
+                                        }
+                                    } catch (Exception e) {
+                                        log.warn("[Huifu] 解析file_details失败", e);
+                                    }
+                                }
+                                if (fileList != null && !"null".equals(String.valueOf(fileList)) && !String.valueOf(fileList).isEmpty()) {
+                                    apiResult.put("file_list", fileList);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到file_list, billType={}, fileDate={}", billType, fileDate);
+                                }
+                                if (taskDetails != null && !"null".equals(String.valueOf(taskDetails)) && !String.valueOf(taskDetails).isEmpty()) {
+                                    apiResult.put("task_details", taskDetails);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到task_details, billType={}, fileDate={}", billType, fileDate);
+                                }
+                                if (billList != null && !"null".equals(String.valueOf(billList)) && !String.valueOf(billList).isEmpty()) {
+                                    apiResult.put("bill_list", billList);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到bill_list, billType={}, fileDate={}", billType, fileDate);
+                                }
+                                if (downloadUrl != null && !"null".equals(String.valueOf(downloadUrl)) && !String.valueOf(downloadUrl).isEmpty()) {
+                                    apiResult.put("download_url", downloadUrl);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到download_url, billType={}, fileDate={}", billType, fileDate);
+                                }
+                                if (fileName != null && !"null".equals(String.valueOf(fileName)) && !String.valueOf(fileName).isEmpty()) {
+                                    apiResult.put("file_name", fileName);
+                                    hasData = true;
+                                    log.info("[Huifu] 获取到file_name, billType={}, fileDate={}", billType, fileDate);
+                                }
+                                
+                                if (!hasData) {
+                                    log.info("[Huifu] 对账单查询成功但无文件数据, billType={}, fileDate={}, huifuId={}", billType, fileDate, huifuId);
+                                }
+                            }
+                            apiResults.add(apiResult);
+                        } catch (Exception e) {
+                            log.warn("[Huifu] 对账单查询接口调用失败, billType={}, fileDate={}, error={}", billType, fileDate, e.getMessage());
+                            Map<String, Object> apiResult = new java.util.HashMap<>();
+                            apiResult.put("api", "V2TradeCheckFilequeryRequest");
+                            apiResult.put("bill_type", billType);
+                            apiResult.put("file_date", fileDate);
+                            apiResult.put("huifu_id", huifuId);
+                            apiResult.put("error", e.getMessage());
+                            apiResults.add(apiResult);
+                        }
+                    }
+                }
+            }
+
+            allResults.put("api_results", apiResults);
+            allResults.put("trade_list", tradeList);
+            allResults.put("total_count", tradeList.size());
+
+            log.info("[Huifu] 查询完成, 共获取到 {} 条交易记录", tradeList.size());
+
+            return allResults;
+        }).subscribeOn(Schedulers.boundedElastic());
+    }
+
+    @Override
+    public Mono<Map<String, Object>> queryHuifuTradeByOrderId(Long memberId, String outOrdId, String hfSeqId) {
+        log.info("[Huifu] 查询单笔交易记录, memberId={}, outOrdId={}, hfSeqId={}", memberId, outOrdId, hfSeqId);
+
+        return Mono.fromCallable(() -> {
+            Map<String, Object> result = new java.util.HashMap<>();
+            result.put("out_ord_id", outOrdId);
+            result.put("hf_seq_id", hfSeqId);
+
+            try {
+                Map<String, Object> response = null;
+                String usedHuifuId = null;
+                String respCode = null;
+                String usedApi = null;
+
+                java.util.List<String> huifuIds = new java.util.ArrayList<>();
+                String merchantId = null;
+                String channelId = null;
+                if (huifuProperties.getMerchant() != null && huifuProperties.getMerchant().getHuifuId() != null) {
+                    merchantId = huifuProperties.getMerchant().getHuifuId();
+                    huifuIds.add(merchantId);
+                }
+                if (huifuProperties.getChannel() != null && huifuProperties.getChannel().getHuifuId() != null) {
+                    channelId = huifuProperties.getChannel().getHuifuId();
+                    if (!huifuIds.contains(channelId)) {
+                        huifuIds.add(channelId);
+                    }
+                }
+
+                log.info("[Huifu] 查询ID列表: merchantId={}, channelId={}, huifuIds={}", merchantId, channelId, huifuIds);
+
+                for (String huifuId : huifuIds) {
+                    if (hfSeqId != null && !hfSeqId.isEmpty()) {
+                        response = executeV2QueryByHfSeqId(huifuId, hfSeqId);
+                        respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                        usedApi = "V2TradePaymentScanpayQuery(hfSeqId)";
+                        log.info("[Huifu] V2接口按汇付流水号查询: huifuId={}, hfSeqId={}, resp_code={}", huifuId, hfSeqId, respCode);
+
+                        if ("00000000".equals(respCode)) {
+                            usedHuifuId = huifuId;
+                            break;
+                        }
+                    }
+
+                    response = executeV2QueryByOrgReqSeqId(huifuId, outOrdId);
+                    respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                    usedApi = "V2TradePaymentScanpayQuery(orgReqSeqId)";
+                    log.info("[Huifu] V2接口按商户订单号查询: huifuId={}, orgReqSeqId={}, resp_code={}", huifuId, outOrdId, respCode);
+
+                    if ("00000000".equals(respCode)) {
+                        usedHuifuId = huifuId;
+                        break;
+                    }
+
+                    response = executeV4SingleQuery(huifuId, outOrdId);
+                    respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                    usedApi = "V4TradePaymentScanpayQuery";
+                    log.info("[Huifu] V4接口查询: huifuId={}, resp_code={}", huifuId, respCode);
+
+                    if ("00000000".equals(respCode)) {
+                        usedHuifuId = huifuId;
+                        break;
+                    }
+
+                    response = executeV2SingleQuery(huifuId, outOrdId);
+                    respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+                    usedApi = "V2TradePaymentScanpayQuery(outOrdId)";
+                    log.info("[Huifu] V2接口查询: huifuId={}, resp_code={}", huifuId, respCode);
+
+                    if ("00000000".equals(respCode)) {
+                        usedHuifuId = huifuId;
+                        break;
+                    }
+                }
+
+                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
+
+                result.put("huifu_id", usedHuifuId);
+                result.put("resp_code", respCode);
+                result.put("resp_desc", respDesc);
+                result.put("trade_info", response);
+                result.put("api", usedApi);
+                result.put("success", "00000000".equals(respCode));
+
+            } catch (Exception e) {
+                log.error("[Huifu] 单笔交易查询失败", e);
+                result.put("success", false);
+                result.put("error", e.getMessage());
+            }
+
+            return result;
+        }).subscribeOn(Schedulers.boundedElastic());
+    }
+    
+    private Map<String, Object> executeV2QueryByOrgReqSeqId(String huifuId, String orgReqSeqId) throws Exception {
+        String today = DateTools.getCurrentDateYYYYMMDD();
+        
+        V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+        request.setHuifuId(huifuId);
+        request.setOrgReqSeqId(orgReqSeqId);
+        request.setOrgReqDate(today);
+        log.info("[Huifu] V2按商户订单号查询: huifuId={}, orgReqSeqId={}, orgReqDate={}", huifuId, orgReqSeqId, today);
+        
+        Map<String, Object> response = BasePayClient.request(request, false);
+        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(yesterday);
+        response = BasePayClient.request(request, false);
+        respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String dayBeforeYesterday = java.time.LocalDate.now().minusDays(2).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(dayBeforeYesterday);
+        return BasePayClient.request(request, false);
+    }
+
+    private Map<String, Object> executeV2QueryByHfSeqId(String huifuId, String hfSeqId) throws Exception {
+        V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+        request.setHuifuId(huifuId);
+        request.setOrgHfSeqId(hfSeqId);
+        request.setOrgReqDate(DateTools.getCurrentDateYYYYMMDD());
+        Map<String, Object> response = BasePayClient.request(request, false);
+        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(yesterday);
+        response = BasePayClient.request(request, false);
+        respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String dayBeforeYesterday = java.time.LocalDate.now().minusDays(2).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(dayBeforeYesterday);
+        return BasePayClient.request(request, false);
+    }
+
+    private Map<String, Object> executeV4SingleQuery(String huifuId, String outOrdId) throws Exception {
+        String huifuOrderNo = stripPayPrefix(outOrdId);
+        CommonPayClient client = Factory.Payment.Common();
+        TradePaymentScanpayQueryRequest request = new TradePaymentScanpayQueryRequest();
+        request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
+        request.setReqSeqId(com.huifu.dg.lightning.utils.SequenceTools.getReqSeqId32());
+        request.setHuifuId(huifuId);
+        request.setOutOrdId(huifuOrderNo);
+        log.info("[Huifu] V4查询: outOrdId={} -> huifuOrderNo={}", outOrdId, huifuOrderNo);
+        return client.query(request);
+    }
+
+    private Map<String, Object> executeV2SingleQuery(String huifuId, String outOrdId) throws Exception {
+        String huifuOrderNo = stripPayPrefix(outOrdId);
+        String today = DateTools.getCurrentDateYYYYMMDD();
+        
+        V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
+        request.setHuifuId(huifuId);
+        request.setOutOrdId(huifuOrderNo);
+        request.setOrgReqSeqId(huifuOrderNo);
+        request.setOrgReqDate(today);
+        log.info("[Huifu] V2查询参数: huifuId={}, outOrdId={} -> huifuOrderNo={}, orgReqDate={}", huifuId, outOrdId, huifuOrderNo, today);
+        
+        Map<String, Object> response = BasePayClient.request(request, false);
+        String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String yesterday = java.time.LocalDate.now().minusDays(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(yesterday);
+        response = BasePayClient.request(request, false);
+        respCode = String.valueOf(response.getOrDefault("resp_code", ""));
+        if ("00000000".equals(respCode)) {
+            return response;
+        }
+        
+        String dayBeforeYesterday = java.time.LocalDate.now().minusDays(2).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
+        request.setOrgReqDate(dayBeforeYesterday);
+        return BasePayClient.request(request, false);
+    }
+    
+    private String extractDateFromOrderId(String orderId) {
+        if (orderId == null || orderId.length() < 12) {
+            return DateTools.getCurrentDateYYYYMMDD();
+        }
+        String datePart = orderId.substring(3, 11);
+        if (datePart.matches("\\d{8}")) {
+            return datePart;
+        }
+        return DateTools.getCurrentDateYYYYMMDD();
+    }
+
+    private String extractPayInfo(Map<String, Object> response) {
+        String qrCode = String.valueOf(response.getOrDefault("qr_code", ""));
+        String payInfo = String.valueOf(response.getOrDefault("pay_info", ""));
+        String methodExpand = String.valueOf(response.getOrDefault("method_expand", ""));
+
+        if (qrCode != null && !qrCode.isEmpty() && !"null".equals(qrCode)) {
+            return qrCode;
+        }
+        if (payInfo != null && !payInfo.isEmpty() && !"null".equals(payInfo)) {
+            return payInfo;
+        }
+        if (methodExpand != null && !methodExpand.isEmpty() && !"null".equals(methodExpand)) {
+            try {
+                Map<String, Object> expand = JSON.parseObject(methodExpand, Map.class);
+                if (expand.containsKey("code_url")) {
+                    return String.valueOf(expand.get("code_url"));
+                } else if (expand.containsKey("qr_code")) {
+                    return String.valueOf(expand.get("qr_code"));
+                }
+            } catch (Exception e) {
+                log.warn("[Huifu] 解析method_expand失败, methodExpand={}", methodExpand);
+            }
+        }
+        return "";
+    }
+
+    private PaymentResponse convertToResponse(PaymentOrder order) {
+        return PaymentResponse.builder()
+                .orderId(order.getOrderNo())
+                .status(order.getPayStatus())
+                .payUrl(order.getPayUrl())
+                .qrCode(order.getQrCode())
+                .payInfo(order.getPayInfo())
+                .h5PayUrl(order.getPayUrl())
+                .errorCode(order.getErrorCode())
+                .errorMsg(order.getErrorMsg())
+                .transAmt(order.getTransAmt() != null ? order.getTransAmt().toString() : "0")
+                .goodsDesc(order.getGoodsDesc())
+                .tradeType(order.getTradeType())
+                .payTime(order.getPayTime() != null ?
+                        order.getPayTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null)
+                .hfSeqId(order.getHfSeqId())
+                .partyOrderId(order.getPartyOrderId())
+                .merchantOrderId(order.getReqSeqId())
+                .build();
+    }
+
+    private String formatAmount(String transAmt) {
+        if (transAmt == null || transAmt.isEmpty()) {
+            throw new IllegalArgumentException("交易金额不能为空");
+        }
+        BigDecimal amount = new BigDecimal(transAmt);
+        return amount.divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString();
+    }
+
+    private String truncate(String str, int maxLength) {
+        if (str == null) {
+            return null;
+        }
+        if (str.length() <= maxLength) {
+            return str;
+        }
+        return str.substring(0, maxLength);
+    }
+
+    private String generateOrderNo() {
+        String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+        String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
+        return "PAY" + timestamp + uuid;
+    }
+    
+    private String stripPayPrefix(String orderNo) {
+        if (orderNo != null && orderNo.startsWith("PAY")) {
+            return orderNo.substring(3);
+        }
+        return orderNo;
+    }
+
+    private Mono<Boolean> isTradeProcessed(String reqSeqId) {
+        return redisUtil.hasKey(PROCESSED_TRADE_PREFIX + reqSeqId)
+                .onErrorResume(e -> {
+                    log.error("[Huifu] 检查交易处理状态异常: reqSeqId={}", reqSeqId, e);
+                    return Mono.just(false);
+                });
+    }
+
+    private Mono<Void> markTradeProcessed(String reqSeqId) {
+        return redisUtil.setWithExpire(PROCESSED_TRADE_PREFIX + reqSeqId, "1", IDEMPOTENT_EXPIRE_SECONDS)
+                .onErrorResume(e -> {
+                    log.error("[Huifu] 标记交易处理状态异常: reqSeqId={}", reqSeqId, e);
+                    return Mono.empty();
+                })
+                .then();
+    }
+
+    private Mono<PaymentResponse> createMockOrder(Long memberId, CreatePaymentRequest request, String tradeType) {
+        String orderNo = generateOrderNo();
+        String reqSeqId = SequenceTools.getReqSeqId32();
+        String reqDate = DateTools.getCurrentDateYYYYMMDD();
+
+        PaymentOrder paymentOrder = PaymentOrder.builder()
+                .orderNo(orderNo)
+                .memberId(memberId)
+                .orderType(request.getOrderType())
+                .goodsDesc(request.getGoodsDesc())
+                .transAmt(new BigDecimal(request.getTransAmt()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP))
+                .tradeType(tradeType)
+                .payStatus("PENDING")
+                .huifuId(huifuProperties.getMerchant() != null ? huifuProperties.getMerchant().getHuifuId() : "MOCK")
+                .reqSeqId(reqSeqId)
+                .reqDate(reqDate)
+                .remark(request.getRemark())
+                .notifyUrl(huifuProperties.getNotify() != null ? huifuProperties.getNotify().getUrl() : "")
+                .expireTime(LocalDateTime.now().plusMinutes(ORDER_EXPIRE_MINUTES))
+                .build();
+
+        String mockPayInfo = "alipays://platformapi/startapp?appId=2021000122672222&page=pages/pay/pay&orderNo=" + orderNo;
+        paymentOrder.setPayInfo(mockPayInfo);
+        paymentOrder.setPayUrl(mockPayInfo);
+        paymentOrder.setQrCode("https://qr.alipay.com/bax0" + orderNo);
+
+        return paymentOrderRepository.save(paymentOrder)
+                .map(savedOrder -> {
+                    log.info("[Huifu] 模拟订单创建成功, orderNo={}", orderNo);
+                    return convertToResponse(savedOrder);
+                });
+    }
+
+    @Override
+    public Mono<PaymentResponse> getPendingOrder(Long memberId, String orderType) {
+        log.info("[Huifu] 查询未支付订单, memberId={}, orderType={}", memberId, orderType);
+        return paymentOrderRepository.findLatestPendingOrder(memberId, orderType)
+                .map(this::convertToResponse);
+    }
+
+    @Override
+    public Mono<Boolean> closeOrder(Long memberId, String orderId) {
+        log.info("[Huifu] 关闭订单, memberId={}, orderId={}", memberId, orderId);
+        return paymentOrderRepository.findByOrderNo(orderId)
+                .flatMap(order -> {
+                    if (!memberId.equals(order.getMemberId())) {
+                        log.warn("[Huifu] 订单不属于当前会员, memberId={}, orderMemberId={}", memberId, order.getMemberId());
+                        return Mono.just(false);
+                    }
+                    if (!"PENDING".equals(order.getPayStatus())) {
+                        log.warn("[Huifu] 订单状态不是待支付，无法关闭, orderId={}, status={}", orderId, order.getPayStatus());
+                        return Mono.just(false);
+                    }
+                    return paymentOrderRepository.closeExpiredOrder(order.getId())
+                            .map(rows -> rows != null && rows > 0);
+                })
+                .switchIfEmpty(Mono.just(false));
+    }
+}

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();
+        }
+    }
+}