变基至dev，并修复配置

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

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

@@ -1,18 +0,0 @@
-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,20 +1,25 @@
 package cn.novalon.gym.manage.auth.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * 手机号一键登录请求DTO
+ * uniapp官方一键登录流程：前端通过云函数获取access_token和openid传给后端换取手机号
+ */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class PhoneLoginDto {
 
-    private String phone;
+    @NotBlank(message = "access_token不能为空")
-
     private String accessToken;
 
+    @NotBlank(message = "openid不能为空")
     private String openid;
 
     private String nickname;

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

@@ -1,6 +1,5 @@
 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;
@@ -17,19 +16,22 @@ import cn.novalon.gym.manage.member.util.AesUtil;
 import cn.novalon.gym.manage.member.util.EsSyncUtils;
 import cn.novalon.gym.manage.member.util.MemberNoGenerator;
 import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.dypnsapi.model.v20170525.GetMobileRequest;
+import com.aliyuncs.dypnsapi.model.v20170525.GetMobileResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.profile.DefaultProfile;
 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
@@ -42,41 +44,32 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
     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: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
+        log.info("手机号一键登录请求, accessToken: {}, openid: {}", request.getAccessToken(), request.getOpenid());
 
-        if (request.getPhone() != null && !request.getPhone().isEmpty()) {
+        return Mono.fromCallable(() -> getPhoneByToken(request.getAccessToken(), request.getOpenid()))
-            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);
+
+                    return memberRepository.findByPhone(encryptedPhone)
+                            .flatMap(existingMember -> {
+                                log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+                                return doLogin(existingMember, false, request);
+                            })
+                            .switchIfEmpty(Mono.defer(() -> {
+                                log.info("手机号未注册，创建新会员");
+                                return createNewMemberAndLogin(request, encryptedPhone);
+                            }));
                 })
                 .onErrorResume(e -> {
                     log.error("一键登录失败", e);
@@ -84,64 +77,30 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
                 });
     }
 
-    private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
+    /**
-        return memberRepository.findByPhone(encryptedPhone)
+     * 通过access_token和openid获取手机号
-                .flatMap(existingMember -> {
+     * 使用阿里云DYPNS API
-                    log.info("手机号已注册，直接登录, memberId: {}", existingMember.getId());
+     */
-                    return doLogin(existingMember, false, request);
+    private String getPhoneByToken(String accessToken, String openid) throws Exception {
-                })
+        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", smsProperties.getAccessKeyId(), smsProperties.getAccessKeySecret());
-                .switchIfEmpty(Mono.defer(() -> {
+        IAcsClient client = new DefaultAcsClient(profile);
-                    log.info("手机号未注册，创建新会员");
+        GetMobileRequest request = new GetMobileRequest();
-                    return createNewMemberAndLogin(request, encryptedPhone);
+        request.setAccessToken(accessToken);
-                }));
-    }
 
-    private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
+        try {
-        Map<String, String> requestBody = new HashMap<>();
+            GetMobileResponse response = client.getAcsResponse(request);
-        requestBody.put("appid", dCloudUniverifyConfig.getAppid());
+            if ("OK".equals(response.getCode())) {
-        requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
+                return response.getGetMobileResultDTO().getMobile();
-        requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
+            }
-        requestBody.put("access_token", accessToken);
+            log.warn("DYPNS API返回错误: code={}, message={}", response.getCode(), response.getMessage());
-        requestBody.put("openid", openid);
+            throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + response.getMessage());
-
+        } catch (ServerException e) {
-        log.info("调用DCloud Univerify API, params: {}", requestBody);
+            log.error("阿里云DYPNS API服务端异常", e);
-
+            throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败");
-        return webClient.post()
+        } catch (ClientException e) {
-                .bodyValue(requestBody)
+            log.error("阿里云DYPNS API客户端异常", e);
-                .retrieve()
+            throw new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败");
-                .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()));
-                });
     }
 
     /**

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

@@ -194,4 +194,47 @@ public class CheckInHandler {
                         .contentType(MediaType.APPLICATION_JSON)
                         .bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
     }
+
+    /**
+     * 管理员查询所有签到记录（支持排序）
+     *
+     * GET /api/checkIn/admin/records
+     */
+    public Mono<ServerResponse> getAllSignInRecords(ServerRequest request) {
+        String startDateStr = request.queryParam("startDate").orElse(null);
+        String endDateStr = request.queryParam("endDate").orElse(null);
+        String sortBy = request.queryParam("sortBy").orElse("signInTime");
+        String sortOrder = request.queryParam("sortOrder").orElse("desc");
+
+        LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
+        LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
+
+        log.info("管理员查询所有签到记录, startDate: {}, endDate: {}, sortBy: {}, sortOrder: {}", startDate, endDate, sortBy, sortOrder);
+
+        return checkService.getAllSignInRecords(startDate, endDate, sortBy, sortOrder)
+                .collectList()
+                .flatMap(records -> ServerResponse.ok()
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .bodyValue(Map.of("code", 200, "message", "success", "data", records)));
+    }
+
+    /**
+     * 管理员查询签到统计（不限会员）
+     *
+     * GET /api/checkIn/admin/statistics
+     */
+    public Mono<ServerResponse> getAllSignInStatistics(ServerRequest request) {
+        String startDateStr = request.queryParam("startDate").orElse(null);
+        String endDateStr = request.queryParam("endDate").orElse(null);
+
+        LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
+        LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
+
+        log.info("管理员查询签到统计, startDate: {}, endDate: {}", startDate, endDate);
+
+        return checkService.getAllSignInStats(startDate, endDate)
+                .flatMap(stats -> ServerResponse.ok()
+                        .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/repository/SignInRecordRepository.java

@@ -57,6 +57,12 @@ public interface SignInRecordRepository extends R2dbcRepository<SignInRecord, Lo
     @Query("SELECT * FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
     Flux<SignInRecord> findByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
 
+    /**
+     * 根据时间范围查询签到记录（支持动态排序）
+     */
+    @Query("SELECT * FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
+    Flux<SignInRecord> findByTimeRangeSorted(LocalDateTime startTime, LocalDateTime endTime);
+
     /**
      * 统计会员在时间范围内的签到次数
      */

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

@@ -78,4 +78,20 @@ public interface ICheckInService {
      * @return 签到统计VO
      */
     Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
+
+    /**
+     * 管理员查询所有签到记录（支持排序）
+     *
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param sortBy 排序字段
+     * @param sortOrder 排序方向
+     * @return 签到记录列表（含会员姓名、卡类型）
+     */
+    Flux<SignInRecordVO> getAllSignInRecords(LocalDate startTime, LocalDate endTime, String sortBy, String sortOrder);
+
+    /**
+     * 管理员查询签到统计（不限会员）
+     */
+    Mono<SignInStatsVO> getAllSignInStats(LocalDate startTime, LocalDate endTime);
 }

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

@@ -16,11 +16,13 @@ import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
 import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
 import cn.novalon.gym.manage.common.util.RedisUtil;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
+import cn.novalon.gym.manage.member.entity.Member;
 import cn.novalon.gym.manage.member.entity.MemberCard;
 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.IMemberRepository;
 import cn.novalon.gym.manage.member.repository.MemberCardRepository;
+import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -47,6 +49,7 @@ public class CheckServiceImpl implements ICheckInService {
     private final MemberCardRepository memberCardRepository;
     private final SignInRecordRepository signInRecordRepository;
     private final IGroupCourseBookingService groupCourseBookingService;
+    private final IMemberRepository memberRepository;
 
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
@@ -430,6 +433,83 @@ public class CheckServiceImpl implements ICheckInService {
         return vo;
     }
 
+    @Override
+    public Flux<SignInRecordVO> getAllSignInRecords(LocalDate startTime, LocalDate endTime, String sortBy, String sortOrder) {
+        LocalDateTime start = startTime.atStartOfDay();
+        LocalDateTime end = endTime.atTime(LocalTime.MAX);
+
+        Flux<SignInRecord> recordFlux = signInRecordRepository.findByTimeRangeSorted(start, end);
+
+        return recordFlux
+                .flatMap(record -> {
+                    // fetch member name
+                    Mono<String> memberNameMono = memberRepository.findById(record.getMemberId())
+                            .map(Member::getNickname)
+                            .defaultIfEmpty("未知");
+                    // fetch card type name
+                    Mono<String> cardTypeMono = record.getMemberCardId() != null
+                            ? memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
+                                    .map(MemberCard::getMemberCardName)
+                                    .defaultIfEmpty("未知")
+                            : Mono.just("-");
+                    return Mono.zip(memberNameMono, cardTypeMono)
+                            .map(tuple -> {
+                                SignInRecordVO vo = convertToVO(record);
+                                vo.setMemberName(tuple.getT1());
+                                vo.setMemberCardType(tuple.getT2());
+                                return vo;
+                            });
+                })
+                .collectList()
+                .flatMapMany(list -> {
+                    // in-memory sort
+                    boolean asc = "asc".equalsIgnoreCase(sortOrder);
+                    java.util.Comparator<SignInRecordVO> comparator;
+                    switch (sortBy != null ? sortBy : "signInTime") {
+                        case "id":
+                            comparator = java.util.Comparator.comparing(SignInRecordVO::getId, java.util.Comparator.nullsLast(Long::compareTo));
+                            break;
+                        case "memberName":
+                            comparator = java.util.Comparator.comparing(SignInRecordVO::getMemberName, java.util.Comparator.nullsLast(String::compareTo));
+                            break;
+                        case "signInTime":
+                        default:
+                            comparator = java.util.Comparator.comparing(SignInRecordVO::getSignInTime, java.util.Comparator.nullsLast(java.time.LocalDateTime::compareTo));
+                            break;
+                    }
+                    if (!asc) {
+                        comparator = comparator.reversed();
+                    }
+                    list.sort(comparator);
+                    return Flux.fromIterable(list);
+                });
+    }
+
+    @Override
+    public Mono<SignInStatsVO> getAllSignInStats(LocalDate startTime, LocalDate endTime) {
+        LocalDateTime start = startTime.atStartOfDay();
+        LocalDateTime end = endTime.atTime(LocalTime.MAX);
+
+        return Mono.zip(
+                (Object[] results) -> {
+                    Long total = (Long) results[0];
+                    Long success = (Long) results[1];
+                    Long members = (Long) results[2];
+                    SignInStatsVO stats = new SignInStatsVO();
+                    stats.setTotalCount(total);
+                    stats.setSuccessCount(success);
+                    stats.setStartDate(startTime);
+                    stats.setEndDate(endTime);
+                    stats.setUniqueMemberCount(members);
+                    stats.setSuccessRate(total > 0 ? (double) success / total * 100.0 : 0.0);
+                    return stats;
+                },
+                signInRecordRepository.countByTimeRange(start, end),
+                signInRecordRepository.countSuccessByTimeRange(start, end),
+                signInRecordRepository.countDistinctMembersByTimeRange(start, end)
+        );
+    }
+
     private long getSecondsUntilEndOfDay() {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime endOfDay = now.toLocalDate().atTime(23, 59, 59);

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

@@ -59,6 +59,16 @@ public class SignInRecordVO {
      */
     private String source;
 
+    /**
+     * 会员姓名（关联查询）
+     */
+    private String memberName;
+
+    /**
+     * 会员卡类型名称（关联查询）
+     */
+    private String memberCardType;
+
     /**
      * 创建时间
      */

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

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

gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/dao/DataStatisticsDao.java

@@ -26,7 +26,7 @@ public class DataStatisticsDao {
      * 统计指定时间范围内新增会员数
      */
     public Mono<Long> countNewMembers(LocalDateTime startTime, LocalDateTime endTime) {
-        return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE created_at >= :startTime AND created_at < :endTime AND is_deleted = false")
+        return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE created_at >= :startTime AND created_at < :endTime AND deleted_at IS NULL")
                 .bind("startTime", startTime)
                 .bind("endTime", endTime)
                 .map(row -> row.get(0, Long.class))
@@ -37,7 +37,7 @@ public class DataStatisticsDao {
      * 统计总会员数
      */
     public Mono<Long> countTotalMembers() {
-        return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE is_deleted = false")
+        return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE deleted_at IS NULL")
                 .map(row -> row.get(0, Long.class))
                 .one();
     }

gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/handler/DataStatisticsHandler.java

@@ -4,6 +4,8 @@ import cn.novalon.gym.manage.datacount.domain.*;
 import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -25,6 +27,8 @@ import java.time.format.DateTimeFormatter;
 @Tag(name = "数据统计", description = "数据统计相关操作")
 public class DataStatisticsHandler {
 
+    private static final Logger log = LoggerFactory.getLogger(DataStatisticsHandler.class);
+
     @Autowired
     private IDataStatisticsService dataStatisticsService;
 
@@ -35,6 +39,7 @@ public class DataStatisticsHandler {
         return dataStatisticsService.getStatisticsSummaryWithCache(query)
                 .flatMap(summary -> ServerResponse.ok().bodyValue(summary))
                 .onErrorResume(e -> {
+                    log.error("获取综合统计数据失败", e);
                     StatisticsSummary errorSummary = StatisticsSummary.builder()
                             .statDate(LocalDateTime.now().toLocalDate().toString())
                             .generatedAt(LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))

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

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.ByteArrayOutputStream;
@@ -22,7 +23,9 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -173,9 +176,25 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 
     @Override
     public Mono<StatisticsSummary> getStatisticsSummary(StatisticsQuery query) {
-        Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query);
+        String statDate = query.getStartTime() != null
-        Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query);
+                ? query.getStartTime().toLocalDate().toString()
-        Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query);
+                : LocalDateTime.now().toLocalDate().toString();
+
+        Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query)
+                .onErrorResume(e -> {
+                    log.error("获取会员统计数据失败", e);
+                    return Mono.just(MemberStatistics.builder().statDate(statDate).build());
+                });
+        Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query)
+                .onErrorResume(e -> {
+                    log.error("获取预约统计数据失败", e);
+                    return Mono.just(BookingStatistics.builder().statDate(statDate).build());
+                });
+        Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query)
+                .onErrorResume(e -> {
+                    log.error("获取签到统计数据失败", e);
+                    return Mono.just(SignInStatistics.builder().statDate(statDate).build());
+                });
 
         return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono)
                 .map(tuple -> StatisticsSummary.builder()
@@ -188,21 +207,75 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
     }
 
     @Override
-    public reactor.core.publisher.Flux<DataStatistics> queryHistoricalStatistics(StatisticsQuery query) {
+    public Flux<DataStatistics> queryHistoricalStatistics(StatisticsQuery query) {
         // 历史统计数据查询（从Redis缓存中获取）
         String cacheKey = buildCacheKey(query);
         return redisUtil.get(cacheKey, String.class)
                 .flatMapMany(json -> {
                     try {
-                        java.util.List<DataStatistics> stats = objectMapper.readValue(json,
+                        List<DataStatistics> stats = objectMapper.readValue(json,
-                                objectMapper.getTypeFactory().constructCollectionType(java.util.List.class, DataStatistics.class));
+                                objectMapper.getTypeFactory().constructCollectionType(List.class, DataStatistics.class));
-                        return reactor.core.publisher.Flux.fromIterable(stats);
+                        return Flux.fromIterable(stats);
                     } catch (Exception e) {
                         log.error("Failed to parse historical statistics from cache", e);
-                        return reactor.core.publisher.Flux.empty();
+                        return Flux.empty();
                     }
                 })
-                .switchIfEmpty(reactor.core.publisher.Flux.empty());
+                .switchIfEmpty(buildLiveStatistics(query));
+    }
+
+    /**
+     * 缓存未命中时，从数据库实时构建统计数据
+     */
+    private Flux<DataStatistics> buildLiveStatistics(StatisticsQuery query) {
+        LocalDateTime startTime = getStartTime(query);
+        LocalDateTime endTime = getEndTime(query);
+        String periodType = query.getPeriodType() != null ? query.getPeriodType() : "DAY";
+        LocalDateTime statDate = endTime;
+
+        Mono<Long> memberCountMono = dataStatisticsDao.countNewMembers(startTime, endTime);
+        Mono<Long> totalMembersMono = dataStatisticsDao.countTotalMembers();
+        Mono<Long> bookingCountMono = dataStatisticsDao.countBookings(startTime, endTime);
+        Mono<Long> signInCountMono = dataStatisticsDao.countSignIns(startTime, endTime);
+
+        return Mono.zip(memberCountMono, totalMembersMono, bookingCountMono, signInCountMono)
+                .flatMapMany(tuple -> {
+                    long newMembers = tuple.getT1() != null ? tuple.getT1() : 0L;
+                    long totalMembers = tuple.getT2() != null ? tuple.getT2() : 0L;
+                    long bookings = tuple.getT3() != null ? tuple.getT3() : 0L;
+                    long signIns = tuple.getT4() != null ? tuple.getT4() : 0L;
+
+                    List<DataStatistics> list = new ArrayList<>();
+
+                    DataStatistics memberStat = DataStatistics.builder()
+                            .statType(DataStatistics.StatType.MEMBER)
+                            .periodType(periodType)
+                            .statDate(statDate)
+                            .count(totalMembers)
+                            .extraData("新增" + newMembers + "人")
+                            .build();
+                    list.add(memberStat);
+
+                    DataStatistics bookingStat = DataStatistics.builder()
+                            .statType(DataStatistics.StatType.BOOKING)
+                            .periodType(periodType)
+                            .statDate(statDate)
+                            .count(bookings)
+                            .extraData("新增" + bookings + "条预约")
+                            .build();
+                    list.add(bookingStat);
+
+                    DataStatistics signInStat = DataStatistics.builder()
+                            .statType(DataStatistics.StatType.SIGN_IN)
+                            .periodType(periodType)
+                            .statDate(statDate)
+                            .count(signIns)
+                            .extraData("新增" + signIns + "次签到")
+                            .build();
+                    list.add(signInStat);
+
+                    return Flux.fromIterable(list);
+                });
     }
 
     @Override

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

@@ -40,6 +40,10 @@ public interface GroupCourseDao extends R2dbcRepository<GroupCourseEntity, Long>
     @Query("UPDATE group_course SET deleted_at = :deletedAt WHERE id = :id")
     Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
 
+    @Modifying
+    @Query("UPDATE group_course SET deleted_at = NULL, status = '1', updated_at = :updatedAt WHERE id = :id AND deleted_at IS NOT NULL")
+    Mono<Integer> restoreCourse(Long id, LocalDateTime updatedAt);
+
     @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);

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

@@ -29,4 +29,8 @@ public interface GroupCourseTypeDao extends R2dbcRepository<GroupCourseTypeEntit
     @Modifying
     @Query("UPDATE group_course_type SET deleted_at = :deletedAt WHERE id = :id")
     Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
+
+    @Modifying
+    @Query("UPDATE group_course_type SET type_name = :typeName, base_difficulty = :baseDifficulty, description = :description, category = :category, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL")
+    Mono<Integer> updateFields(Long id, String typeName, Integer baseDifficulty, String description, String category, LocalDateTime updatedAt);
 }

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

@@ -0,0 +1,120 @@
+package cn.novalon.gym.manage.groupcourse.handler;
+
+import cn.novalon.gym.manage.groupcourse.util.OSSUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.http.codec.multipart.Part;
+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.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 通用文件上传处理器
+ */
+@Slf4j
+@Component
+@Tag(name = "文件上传", description = "通用文件上传到阿里云OSS")
+public class CommonUploadHandler {
+
+    @Operation(summary = "上传图片文件", description = "上传图片到阿里云OSS，返回ossKey和预签名URL")
+    public Mono<ServerResponse> uploadImage(ServerRequest request) {
+        return request.multipartData()
+                .flatMap(multiValueMap -> {
+                    List<Part> fileParts = multiValueMap.get("file");
+                    if (fileParts == null || fileParts.isEmpty()) {
+                        return ServerResponse.badRequest()
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .bodyValue(Map.of("code", 400, "message", "未选择文件"));
+                    }
+
+                    Part part = fileParts.get(0);
+                    if (!(part instanceof FilePart filePart)) {
+                        return ServerResponse.badRequest()
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .bodyValue(Map.of("code", 400, "message", "文件格式不正确"));
+                    }
+
+                    String originalFilename = filePart.filename();
+                    String ext = "";
+                    int dotIndex = originalFilename.lastIndexOf('.');
+                    if (dotIndex > 0) {
+                        ext = originalFilename.substring(dotIndex);
+                    }
+                    String newFileName = UUID.randomUUID().toString().replace("-", "") + ext;
+
+                    Path tempFile = null;
+                    try {
+                        tempFile = Files.createTempFile("upload-", newFileName);
+                    } catch (Exception e) {
+                        return Mono.error(new RuntimeException("创建临时文件失败", e));
+                    }
+                    Path finalTempFile = tempFile;
+
+                    return filePart.transferTo(finalTempFile)
+                            .then(Mono.defer(() -> {
+                                try {
+                                    String ossKey;
+                                    try (InputStream inputStream = Files.newInputStream(finalTempFile)) {
+                                        ossKey = OSSUtil.uploadCoverToOSS(inputStream, newFileName);
+                                    }
+                                    String presignedUrl = OSSUtil.generatePresignedUrl(ossKey);
+                                    return ServerResponse.ok()
+                                            .contentType(MediaType.APPLICATION_JSON)
+                                            .bodyValue(Map.of(
+                                                    "code", 200,
+                                                    "message", "上传成功",
+                                                    "data", Map.of(
+                                                            "ossKey", ossKey,
+                                                            "presignedUrl", presignedUrl,
+                                                            "fileName", originalFilename
+                                                    )
+                                            ));
+                                } catch (Exception e) {
+                                    return ServerResponse.status(500)
+                                            .contentType(MediaType.APPLICATION_JSON)
+                                            .bodyValue(Map.of("code", 500, "message", "上传失败: " + e.getMessage()));
+                                } finally {
+                                    try {
+                                        Files.deleteIfExists(finalTempFile);
+                                    } catch (Exception ignored) {
+                                    }
+                                }
+                            }));
+                });
+    }
+
+    @Operation(summary = "获取OSS预签名URL", description = "根据ossKey生成临时访问URL，有效期5分钟")
+    public Mono<ServerResponse> presignUrl(ServerRequest request) {
+        String ossKey = request.queryParam("key").orElse(null);
+        if (ossKey == null || ossKey.isBlank()) {
+            return ServerResponse.badRequest()
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .bodyValue(Map.of("code", 400, "message", "参数 key 不能为空"));
+        }
+
+        try {
+            String presignedUrl = OSSUtil.generatePresignedUrl(ossKey);
+            return ServerResponse.ok()
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .bodyValue(Map.of(
+                            "code", 200,
+                            "data", Map.of("presignedUrl", presignedUrl)
+                    ));
+        } catch (Exception e) {
+            return ServerResponse.status(500)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .bodyValue(Map.of("code", 500, "message", "生成预签名URL失败: " + e.getMessage()));
+        }
+    }
+}

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

@@ -146,18 +146,25 @@ public class CourseLabelHandler {
         
         return request.bodyToMono(Map.class)
                 .flatMap(body -> {
-                    @SuppressWarnings("unchecked")
+                    Object labelIdsObj = body.get("labelIds");
-                    List<Integer> labelIdsInt = (List<Integer>) body.get("labelIds");
                     
-                    if (labelIdsInt == null || labelIdsInt.isEmpty()) {
+                    if (!(labelIdsObj instanceof List)) {
                         Map<String, Object> error = new HashMap<>();
                         error.put("success", false);
                         error.put("message", "labelIds不能为空");
                         return ServerResponse.badRequest().bodyValue(error);
                     }
                     
-                    List<Long> labelIds = labelIdsInt.stream()
+                    List<?> rawList = (List<?>) labelIdsObj;
-                            .map(Integer::longValue)
+                    if (rawList.isEmpty()) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "labelIds不能为空");
+                        return ServerResponse.badRequest().bodyValue(error);
+                    }
+                    
+                    List<Long> labelIds = rawList.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/GroupCourseHandler.java

@@ -7,10 +7,13 @@ import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseDetail;
 import cn.novalon.gym.manage.groupcourse.dto.GroupCourseQueryDto;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Validator;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -26,15 +29,21 @@ public class GroupCourseHandler {
     private final Validator validator;
     private final RedisUtil redisUtil;
     private final ObjectMapper objectMapper;
+    private final ISysUserService sysUserService;
+    private final AuthUtil authUtil;
     
     public GroupCourseHandler(IGroupCourseService groupCourseService, 
                               Validator validator,
                               RedisUtil redisUtil,
-                              ObjectMapper objectMapper){
+                              ObjectMapper objectMapper,
+                              ISysUserService sysUserService,
+                              AuthUtil authUtil){
         this.groupCourseService = groupCourseService;
         this.validator = validator;
         this.redisUtil = redisUtil;
         this.objectMapper = objectMapper;
+        this.sysUserService = sysUserService;
+        this.authUtil = authUtil;
     }
 
     @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表")
@@ -114,25 +123,43 @@ public class GroupCourseHandler {
                 });
     }
 
-    @Operation(summary = "更新团课", description = "更新指定团课信息")
+    @Operation(summary = "更新团课", description = "更新指定团课信息，需验证管理员密码")
     public Mono<ServerResponse> updateGroupCourse(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
 
-        return request.bodyToMono(GroupCourse.class)
+        if (adminPassword == null || adminPassword.isBlank()) {
-                .flatMap(groupCourse -> {
+            Map<String, Object> error = new HashMap<>();
-                    return groupCourseService.update(id, groupCourse)
+            error.put("success", false);
-                            .flatMap(course -> {
+            error.put("message", "管理员密码不能为空");
-                                Map<String, Object> response = new HashMap<>();
+            return ServerResponse.badRequest().bodyValue(error);
-                                response.put("success", true);
+        }
-                                response.put("message", "团课更新成功");
+
-                                response.put("data", course);
+        return sysUserService.verifyPassword(adminId, adminPassword)
-                                return ServerResponse.ok().bodyValue(response);
+                .flatMap(valid -> {
-                            })
+                    if (!valid) {
-                            .onErrorResume(error -> {
+                        Map<String, Object> error = new HashMap<>();
-                                Map<String, Object> response = new HashMap<>();
+                        error.put("success", false);
-                                response.put("success", false);
+                        error.put("message", "管理员密码错误");
-                                response.put("message", error.getMessage());
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
-                                return ServerResponse.badRequest().bodyValue(response);
+                    }
+                    return request.bodyToMono(GroupCourse.class)
+                            .flatMap(groupCourse -> {
+                                return groupCourseService.update(id, groupCourse)
+                                        .flatMap(course -> {
+                                            Map<String, Object> response = new HashMap<>();
+                                            response.put("success", true);
+                                            response.put("message", "团课更新成功");
+                                            response.put("data", course);
+                                            return ServerResponse.ok().bodyValue(response);
+                                        })
+                                        .onErrorResume(error -> {
+                                            Map<String, Object> response = new HashMap<>();
+                                            response.put("success", false);
+                                            response.put("message", error.getMessage());
+                                            return ServerResponse.badRequest().bodyValue(response);
+                                        });
                             });
                 });
     }
@@ -197,22 +224,78 @@ public class GroupCourseHandler {
                 });
     }
 
-    @Operation(summary = "删除团课", description = "删除指定团课（软删除）")
+    @Operation(summary = "删除团课", description = "删除指定团课（软删除），需验证管理员密码")
     public Mono<ServerResponse> deleteGroupCourse(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
 
-        return groupCourseService.delete(id)
+        if (adminPassword == null || adminPassword.isBlank()) {
-                .then(Mono.defer(() -> {
+            Map<String, Object> error = new HashMap<>();
-                    Map<String, Object> response = new HashMap<>();
+            error.put("success", false);
-                    response.put("success", true);
+            error.put("message", "管理员密码不能为空");
-                    response.put("message", "团课删除成功");
+            return ServerResponse.badRequest().bodyValue(error);
-                    return ServerResponse.ok().bodyValue(response);
+        }
-                }))
+
-                .onErrorResume(error -> {
+        return sysUserService.verifyPassword(adminId, adminPassword)
-                    Map<String, Object> response = new HashMap<>();
+                .flatMap(valid -> {
-                    response.put("success", false);
+                    if (!valid) {
-                    response.put("message", error.getMessage());
+                        Map<String, Object> error = new HashMap<>();
-                    return ServerResponse.badRequest().bodyValue(response);
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return groupCourseService.delete(id)
+                            .then(Mono.defer(() -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课删除成功");
+                                return ServerResponse.ok().bodyValue(response);
+                            }))
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
+                });
+    }
+
+    @Operation(summary = "恢复已删除团课", description = "将已删除的团课恢复为已取消状态，需验证管理员密码")
+    public Mono<ServerResponse> restoreGroupCourse(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
+
+        if (adminPassword == null || adminPassword.isBlank()) {
+            Map<String, Object> error = new HashMap<>();
+            error.put("success", false);
+            error.put("message", "管理员密码不能为空");
+            return ServerResponse.badRequest().bodyValue(error);
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return groupCourseService.restore(id)
+                            .flatMap(course -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课恢复成功");
+                                response.put("data", course);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
                 });
     }
 

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

@@ -2,8 +2,11 @@ package cn.novalon.gym.manage.groupcourse.handler;
 
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseRecommend;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseRecommendService;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -17,9 +20,15 @@ import java.util.Map;
 public class GroupCourseRecommendHandler {
 
     private final IGroupCourseRecommendService recommendService;
+    private final ISysUserService sysUserService;
+    private final AuthUtil authUtil;
 
-    public GroupCourseRecommendHandler(IGroupCourseRecommendService recommendService) {
+    public GroupCourseRecommendHandler(IGroupCourseRecommendService recommendService,
+                                        ISysUserService sysUserService,
+                                        AuthUtil authUtil) {
         this.recommendService = recommendService;
+        this.sysUserService = sysUserService;
+        this.authUtil = authUtil;
     }
 
     @Operation(summary = "获取所有团课推荐", description = "获取系统中所有团课推荐列表，支持按优先级排序")
@@ -80,20 +89,73 @@ public class GroupCourseRecommendHandler {
                 });
     }
 
-    @Operation(summary = "更新团课推荐", description = "更新指定团课推荐信息")
+    @Operation(summary = "更新团课推荐", description = "更新指定团课推荐信息，需验证管理员密码")
     public Mono<ServerResponse> updateRecommendation(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
 
-        return request.bodyToMono(GroupCourseRecommend.class)
+        if (adminPassword == null || adminPassword.isBlank()) {
-                .flatMap(recommend -> {
+            Map<String, Object> error = new HashMap<>();
-                    return recommendService.update(id, recommend)
+            error.put("success", false);
-                            .flatMap(r -> {
+            error.put("message", "管理员密码不能为空");
+            return ServerResponse.badRequest().bodyValue(error);
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return request.bodyToMono(GroupCourseRecommend.class)
+                            .flatMap(recommend -> recommendService.update(id, recommend)
+                                    .flatMap(r -> {
+                                        Map<String, Object> response = new HashMap<>();
+                                        response.put("success", true);
+                                        response.put("message", "团课推荐更新成功");
+                                        response.put("data", r);
+                                        return ServerResponse.ok().bodyValue(response);
+                                    })
+                                    .onErrorResume(error -> {
+                                        Map<String, Object> response = new HashMap<>();
+                                        response.put("success", false);
+                                        response.put("message", error.getMessage());
+                                        return ServerResponse.badRequest().bodyValue(response);
+                                    }));
+                });
+    }
+
+    @Operation(summary = "删除团课推荐", description = "删除指定团课推荐（软删除），需验证管理员密码")
+    public Mono<ServerResponse> deleteRecommendation(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
+
+        if (adminPassword == null || adminPassword.isBlank()) {
+            Map<String, Object> error = new HashMap<>();
+            error.put("success", false);
+            error.put("message", "管理员密码不能为空");
+            return ServerResponse.badRequest().bodyValue(error);
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return recommendService.delete(id)
+                            .then(Mono.defer(() -> {
                                 Map<String, Object> response = new HashMap<>();
                                 response.put("success", true);
-                                response.put("message", "团课推荐更新成功");
+                                response.put("message", "团课推荐删除成功");
-                                response.put("data", r);
                                 return ServerResponse.ok().bodyValue(response);
-                            })
+                            }))
                             .onErrorResume(error -> {
                                 Map<String, Object> response = new HashMap<>();
                                 response.put("success", false);
@@ -103,25 +165,6 @@ public class GroupCourseRecommendHandler {
                 });
     }
 
-    @Operation(summary = "删除团课推荐", description = "删除指定团课推荐（软删除）")
-    public Mono<ServerResponse> deleteRecommendation(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-
-        return recommendService.delete(id)
-                .then(Mono.defer(() -> {
-                    Map<String, Object> response = new HashMap<>();
-                    response.put("success", true);
-                    response.put("message", "团课推荐删除成功");
-                    return ServerResponse.ok().bodyValue(response);
-                }))
-                .onErrorResume(error -> {
-                    Map<String, Object> response = new HashMap<>();
-                    response.put("success", false);
-                    response.put("message", error.getMessage());
-                    return ServerResponse.badRequest().bodyValue(response);
-                });
-    }
-
     @Operation(summary = "启用团课推荐", description = "启用指定团课推荐")
     public Mono<ServerResponse> enableRecommendation(ServerRequest request) {
         Long id = Long.valueOf(request.pathVariable("id"));
@@ -142,23 +185,41 @@ public class GroupCourseRecommendHandler {
                 });
     }
 
-    @Operation(summary = "禁用团课推荐", description = "禁用指定团课推荐")
+    @Operation(summary = "禁用团课推荐", description = "禁用指定团课推荐，需验证管理员密码")
     public Mono<ServerResponse> disableRecommendation(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
 
-        return recommendService.disable(id)
+        if (adminPassword == null || adminPassword.isBlank()) {
-                .flatMap(r -> {
+            Map<String, Object> error = new HashMap<>();
-                    Map<String, Object> response = new HashMap<>();
+            error.put("success", false);
-                    response.put("success", true);
+            error.put("message", "管理员密码不能为空");
-                    response.put("message", "团课推荐禁用成功");
+            return ServerResponse.badRequest().bodyValue(error);
-                    response.put("data", r);
+        }
-                    return ServerResponse.ok().bodyValue(response);
+
-                })
+        return sysUserService.verifyPassword(adminId, adminPassword)
-                .onErrorResume(error -> {
+                .flatMap(valid -> {
-                    Map<String, Object> response = new HashMap<>();
+                    if (!valid) {
-                    response.put("success", false);
+                        Map<String, Object> error = new HashMap<>();
-                    response.put("message", error.getMessage());
+                        error.put("success", false);
-                    return ServerResponse.badRequest().bodyValue(response);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return recommendService.disable(id)
+                            .flatMap(r -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", true);
+                                response.put("message", "团课推荐禁用成功");
+                                response.put("data", r);
+                                return ServerResponse.ok().bodyValue(response);
+                            })
+                            .onErrorResume(error -> {
+                                Map<String, Object> response = new HashMap<>();
+                                response.put("success", false);
+                                response.put("message", error.getMessage());
+                                return ServerResponse.badRequest().bodyValue(response);
+                            });
                 });
     }
 }

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

@@ -2,8 +2,11 @@ package cn.novalon.gym.manage.groupcourse.handler;
 
 import cn.novalon.gym.manage.groupcourse.domain.GroupCourseType;
 import cn.novalon.gym.manage.groupcourse.service.IGroupCourseTypeService;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+import cn.novalon.gym.manage.sys.util.AuthUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -17,9 +20,15 @@ import java.util.Map;
 public class GroupCourseTypeHandler {
 
     private final IGroupCourseTypeService groupCourseTypeService;
+    private final ISysUserService sysUserService;
+    private final AuthUtil authUtil;
 
-    public GroupCourseTypeHandler(IGroupCourseTypeService groupCourseTypeService) {
+    public GroupCourseTypeHandler(IGroupCourseTypeService groupCourseTypeService,
+                                   ISysUserService sysUserService,
+                                   AuthUtil authUtil) {
         this.groupCourseTypeService = groupCourseTypeService;
+        this.sysUserService = sysUserService;
+        this.authUtil = authUtil;
     }
 
     @Operation(summary = "获取所有团课类型", description = "获取系统中所有团课类型列表")
@@ -92,21 +101,76 @@ public class GroupCourseTypeHandler {
                 });
     }
 
-    @Operation(summary = "更新团课类型", description = "更新指定团课类型信息")
+    @Operation(summary = "更新团课类型", description = "更新指定团课类型信息，需验证管理员密码")
     public Mono<ServerResponse> updateGroupCourseType(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
 
-        return request.bodyToMono(GroupCourseType.class)
+        if (adminPassword == null || adminPassword.isBlank()) {
-                .flatMap(groupCourseType -> {
+            Map<String, Object> error = new HashMap<>();
-                    groupCourseType.setId(id);
+            error.put("success", false);
-                    return groupCourseTypeService.update(id, groupCourseType)
+            error.put("message", "管理员密码不能为空");
-                            .flatMap(type -> {
+            return ServerResponse.badRequest().bodyValue(error);
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return request.bodyToMono(GroupCourseType.class)
+                            .flatMap(groupCourseType -> {
+                                groupCourseType.setId(id);
+                                return groupCourseTypeService.update(id, groupCourseType)
+                                        .flatMap(type -> {
+                                            Map<String, Object> response = new HashMap<>();
+                                            response.put("success", true);
+                                            response.put("message", "团课类型更新成功");
+                                            response.put("data", type);
+                                            return ServerResponse.ok().bodyValue(response);
+                                        })
+                                        .onErrorResume(error -> {
+                                            Map<String, Object> response = new HashMap<>();
+                                            response.put("success", false);
+                                            response.put("message", error.getMessage());
+                                            return ServerResponse.badRequest().bodyValue(response);
+                                        });
+                            });
+                });
+    }
+
+    @Operation(summary = "删除团课类型", description = "删除指定团课类型（软删除），需验证管理员密码，且该类型不能被任何团课引用")
+    public Mono<ServerResponse> deleteGroupCourseType(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
+        Long id = Long.valueOf(request.pathVariable("id"));
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
+
+        if (adminPassword == null || adminPassword.isBlank()) {
+            Map<String, Object> error = new HashMap<>();
+            error.put("success", false);
+            error.put("message", "管理员密码不能为空");
+            return ServerResponse.badRequest().bodyValue(error);
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        Map<String, Object> error = new HashMap<>();
+                        error.put("success", false);
+                        error.put("message", "管理员密码错误");
+                        return ServerResponse.status(HttpStatus.FORBIDDEN).bodyValue(error);
+                    }
+                    return groupCourseTypeService.delete(id)
+                            .then(Mono.defer(() -> {
                                 Map<String, Object> response = new HashMap<>();
                                 response.put("success", true);
-                                response.put("message", "团课类型更新成功");
+                                response.put("message", "团课类型删除成功");
-                                response.put("data", type);
                                 return ServerResponse.ok().bodyValue(response);
-                            })
+                            }))
                             .onErrorResume(error -> {
                                 Map<String, Object> response = new HashMap<>();
                                 response.put("success", false);
@@ -115,23 +179,4 @@ public class GroupCourseTypeHandler {
                             });
                 });
     }
-
-    @Operation(summary = "删除团课类型", description = "删除指定团课类型（软删除）")
-    public Mono<ServerResponse> deleteGroupCourseType(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("id"));
-        
-        return groupCourseTypeService.delete(id)
-                .then(Mono.defer(() -> {
-                    Map<String, Object> response = new HashMap<>();
-                    response.put("success", true);
-                    response.put("message", "团课类型删除成功");
-                    return ServerResponse.ok().bodyValue(response);
-                }))
-                .onErrorResume(error -> {
-                    Map<String, Object> response = new HashMap<>();
-                    response.put("success", false);
-                    response.put("message", error.getMessage());
-                    return ServerResponse.badRequest().bodyValue(response);
-                });
-    }
 }

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

@@ -27,6 +27,8 @@ public interface IGroupCourseRepository {
     
     Mono<Void> deleteById(Long id);
     
+    Mono<GroupCourse> restoreById(Long id);
+    
     Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta);
     
     Flux<GroupCourse> findByCourseType(Long courseType);

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

@@ -169,6 +169,17 @@ public class GroupCourseRepository implements IGroupCourseRepository {
                 .then();
     }
 
+    @Override
+    public Mono<GroupCourse> restoreById(Long id) {
+        return groupCourseDao.restoreCourse(id, LocalDateTime.now())
+                .flatMap(updated -> {
+                    if (updated > 0) {
+                        return findByIdAndDeletedAtIsNull(id);
+                    }
+                    return Mono.error(new RuntimeException("团课恢复失败，可能该课程未被删除"));
+                });
+    }
+
     @Override
     public Mono<GroupCourse> updateCurrentMembers(Long id, Integer delta) {
         return groupCourseDao.updateCurrentMembers(id, delta, LocalDateTime.now())

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

@@ -105,21 +105,20 @@ public class GroupCourseTypeRepository implements IGroupCourseTypeRepository {
         return groupCourseTypeDao.findByIdIsAndDeletedAtIsNull(groupCourseType.getId())
                 .switchIfEmpty(Mono.error(new RuntimeException("团课类型不存在")))
                 .flatMap(existing -> {
-                    existing.markNotNew();
+                    String typeName = groupCourseType.getTypeName() != null
-                    if (groupCourseType.getTypeName() != null) {
+                            ? groupCourseType.getTypeName() : existing.getTypeName();
-                        existing.setTypeName(groupCourseType.getTypeName());
+                    Integer baseDifficulty = groupCourseType.getBaseDifficulty() != null
-                    }
+                            ? groupCourseType.getBaseDifficulty() : existing.getBaseDifficulty();
-                    if (groupCourseType.getBaseDifficulty() != null) {
+                    String description = groupCourseType.getDescription() != null
-                        existing.setBaseDifficulty(groupCourseType.getBaseDifficulty());
+                            ? groupCourseType.getDescription() : existing.getDescription();
-                    }
+                    String category = groupCourseType.getCategory() != null
-                    if (groupCourseType.getDescription() != null) {
+                            ? groupCourseType.getCategory() : existing.getCategory();
-                        existing.setDescription(groupCourseType.getDescription());
+                    LocalDateTime now = LocalDateTime.now();
-                    }
+
-                    if (groupCourseType.getCategory() != null) {
+                    return groupCourseTypeDao.updateFields(
-                        existing.setCategory(groupCourseType.getCategory());
+                                    groupCourseType.getId(), typeName, baseDifficulty,
-                    }
+                                    description, category, now)
-                    existing.setUpdatedAt(LocalDateTime.now());
+                            .then(groupCourseTypeDao.findByIdIsAndDeletedAtIsNull(groupCourseType.getId()));
-                    return groupCourseTypeDao.save(existing);
                 })
                 .map(converter::toGroupCourseType);
     }

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

@@ -27,5 +27,7 @@ public interface IGroupCourseService {
     
     Mono<Void> delete(Long id);
     
+    Mono<GroupCourse> restore(Long id);
+
     Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query);
 }

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

@@ -536,14 +536,14 @@ public class GroupCourseService implements IGroupCourseService {
 
     @Override
     public Mono<Void> delete(Long id) {
-        // 先查询课程状态，只有已取消的课程才能删除
+        // 已取消或已结束的课程才能删除
         return groupCourseRepository.findByIdAndDeletedAtIsNull(id)
                 .switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
                 .flatMap(course -> {
-                    // 检查课程状态是否为已取消（状态码1）
+                    Long status = course.getStatus();
-                    if (course.getStatus() == null || !course.getStatus().equals(CourseStatus.CANCELLED.getValue())) {
+                    if (status == null || (!status.equals(CourseStatus.CANCELLED.getValue()) && !status.equals(CourseStatus.ENDED.getValue()))) {
-                        return Mono.error(new RuntimeException("只有已取消的课程才能删除，当前状态: " + 
+                        return Mono.error(new RuntimeException("只有已取消或已结束的课程才能删除，当前状态: " + 
-                                (course.getStatus() != null ? course.getStatus() : "未知")));
+                                (status != null ? status : "未知")));
                     }
                     
                     // 删除课程
@@ -554,6 +554,14 @@ public class GroupCourseService implements IGroupCourseService {
                 });
     }
 
+    @Override
+    public Mono<GroupCourse> restore(Long id) {
+        return groupCourseRepository.restoreById(id)
+                .doOnSuccess(course -> logger.info("团课恢复成功 - id={}", id))
+                .flatMap(course -> clearCache().thenReturn(course))
+                .doOnError(error -> logger.error("团课恢复失败 - id={}, error: {}", id, error.getMessage()));
+    }
+
     @Override
     public Mono<PageResponse<GroupCourse>> searchGroupCourses(GroupCourseQueryDto query) {
         logger.info("多条件查询团课 - courseName={}, courseType={}, startDate={}, endDate={}, timePeriod={}, priceSort={}, remainingMost={}", 

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

@@ -1,6 +1,7 @@
 package cn.novalon.gym.manage.groupcourse.service.impl;
 
 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 +10,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,7 +72,14 @@ public class GroupCourseTypeService implements IGroupCourseTypeService {
 
     @Override
     public Mono<Void> delete(Long id) {
-        return groupCourseTypeRepository.deleteById(id)
+        return groupCourseRepository.findByCourseType(id)
+                .hasElements()
+                .flatMap(hasCourses -> {
+                    if (hasCourses) {
+                        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()));
     }

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

@@ -1,14 +1,19 @@
 package cn.novalon.gym.manage.groupcourse.util;
 
+import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.PutObjectRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 /**
  * 阿里云OSS工具类
@@ -19,8 +24,8 @@ public class OSSUtil {
 
     // 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_ID = "LTAI5t9wHCiH68Xjxg64Xx4Y";
-    private static final String ACCESS_KEY_SECRET = "zD6NlCeH5UhjBs4vnQVqn8Ksi3CaZz";
+    private static final String ACCESS_KEY_SECRET = "isAfz1IFGAnV13LOIrVg19aPhY8aRq";
     private static final String BUCKET_NAME = "ycc-filesaver";
 
     // OSS访问地址前缀
@@ -28,36 +33,31 @@ public class OSSUtil {
 
     // 文件存储目录
     private static final String QRCODE_DIR = "qrcode/";
+    private static final String COVER_DIR = "cover/";
+
+    // 预签名URL有效期（秒）
+    private static final long PRESIGN_EXPIRE_SECONDS = 300;
 
     /**
-     * 上传文件到阿里云OSS
+     * 上传文件到阿里云OSS（文件默认继承Bucket权限，不设置ACL）
      *
      * @param localFilePath 本地文件路径
      * @param fileName 文件名（不含路径）
-     * @return OSS访问地址
+     * @return OSS object key（不含域名前缀）
      */
     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);
 
-            // 构建访问地址
+            logger.info("文件上传到OSS成功: localPath={}, ossKey={}", localFilePath, ossFilePath);
-            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+            return 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);
@@ -69,34 +69,25 @@ public class OSSUtil {
     }
 
     /**
-     * 上传文件到阿里云OSS（自定义存储路径）
+     * 上传文件到阿里云OSS（自定义存储路径，文件默认继承Bucket权限）
      *
      * @param localFilePath 本地文件路径
      * @param ossDirectory OSS存储目录
      * @param fileName 文件名（不含路径）
-     * @return OSS访问地址
+     * @return OSS object key（不含域名前缀）
      */
     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);
 
-            // 构建访问地址
+            logger.info("文件上传到OSS成功: localPath={}, ossKey={}", localFilePath, ossFilePath);
-            String accessUrl = OSS_URL_PREFIX + ossFilePath;
+            return 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);
@@ -106,4 +97,78 @@ public class OSSUtil {
             }
         }
     }
+
+    /**
+     * 上传封面图到阿里云OSS（使用InputStream，文件默认继承Bucket权限）
+     *
+     * @param inputStream 文件输入流
+     * @param fileName 文件名（不含路径）
+     * @return OSS object key（不含域名前缀）
+     */
+    public static String uploadCoverToOSS(InputStream inputStream, String fileName) {
+        OSS ossClient = null;
+        try {
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            String datePath = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+            String ossFilePath = COVER_DIR + datePath + "/" + fileName;
+
+            ossClient.putObject(BUCKET_NAME, ossFilePath, inputStream);
+
+            logger.info("封面上传到OSS成功: fileName={}, ossKey={}", fileName, ossFilePath);
+            return ossFilePath;
+        } catch (Exception e) {
+            logger.error("封面上传到OSS失败 - fileName: {}, error: {}", fileName, e.getMessage(), e);
+            throw new RuntimeException("封面上传到OSS失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+
+    /**
+     * 生成OSS对象预签名URL（临时访问链接）
+     *
+     * @param ossKey OSS对象Key（不含域名前缀）
+     * @return 预签名URL
+     */
+    public static String generatePresignedUrl(String ossKey) {
+        return generatePresignedUrl(ossKey, PRESIGN_EXPIRE_SECONDS);
+    }
+
+    /**
+     * 生成OSS对象预签名URL（可指定有效期）
+     *
+     * @param ossKey          OSS对象Key（不含域名前缀）
+     * @param expireSeconds   有效期（秒）
+     * @return 预签名URL
+     */
+    public static String generatePresignedUrl(String ossKey, long expireSeconds) {
+        OSS ossClient = null;
+        try {
+            ossClient = new OSSClientBuilder().build(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET);
+
+            Date expiration = new Date(System.currentTimeMillis() + expireSeconds * 1000);
+            GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(BUCKET_NAME, ossKey, HttpMethod.GET);
+            request.setExpiration(expiration);
+
+            URL signedUrl = ossClient.generatePresignedUrl(request);
+            return signedUrl.toString();
+        } catch (Exception e) {
+            logger.error("生成预签名URL失败 - ossKey: {}, error: {}", ossKey, e.getMessage(), e);
+            throw new RuntimeException("生成预签名URL失败: " + e.getMessage(), e);
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
+    }
+
+    /**
+     * 根据OSS Key拼接公开访问URL（仅当Bucket为公共读时有效）
+     */
+    public static String getPublicUrl(String ossKey) {
+        return OSS_URL_PREFIX + ossKey;
+    }
 }

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

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

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

@@ -0,0 +1,59 @@
+package cn.novalon.gym.manage.member.dto;
+
+import cn.novalon.gym.manage.member.enums.GenderEnum;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 管理员编辑会员信息DTO（含密码验证）
+ *
+ * @author system
+ * @date 2026-06-24
+ */
+@Data
+public class AdminEditMemberDto {
+
+    /**
+     * 管理员密码（必填，用于验证身份）
+     */
+    private String adminPassword;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别
+     */
+    private GenderEnum gender;
+
+    /**
+     * 生日
+     */
+    private LocalDate birthday;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 转换为 UpdateMemberInfoDto
+     */
+    public UpdateMemberInfoDto toUpdateMemberInfoDto() {
+        UpdateMemberInfoDto dto = new UpdateMemberInfoDto();
+        dto.setNickname(nickname);
+        dto.setGender(gender);
+        dto.setBirthday(birthday);
+        dto.setAddress(address);
+        dto.setAvatar(avatar);
+        return dto;
+    }
+}

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

@@ -4,81 +4,69 @@ 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 {
+public class MemberCardRecord extends BaseEntity {
-
-    @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,64 +3,75 @@ 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;
 
-import java.time.LocalDateTime;
+/**
-
+ * 会员卡交易流水实体 - 对应 member_card_transactions 表
+ * 
+ * @author 付嘉
+ * @date 2026-05-27
+ */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Table("member_card_transactions")
-public class MemberCardTransaction {
+public class MemberCardTransaction extends BaseEntity {
-
-    @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 LocalDateTime archivedAt;
+    private java.time.LocalDateTime archivedAt;
 
 }

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

@@ -1,42 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.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

@@ -1,48 +0,0 @@
-package cn.novalon.gym.manage.member.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-import java.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

@@ -2,16 +2,21 @@ package cn.novalon.gym.manage.member.handler;
 
 import cn.novalon.gym.manage.member.entity.MemberCard;
 import cn.novalon.gym.manage.member.service.IMemberCardService;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
+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.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
 
+import java.util.Map;
+
 /**
  * 会员卡管理处理器
  * 
@@ -24,14 +29,18 @@ import reactor.core.publisher.Mono;
 public class MemberCardHandler {
 
     private final IMemberCardService memberCardService;
+    private final ISysUserService sysUserService;
+    private final AuthUtil authUtil;
 
-    public MemberCardHandler(IMemberCardService memberCardService) {
+    public MemberCardHandler(IMemberCardService memberCardService, ISysUserService sysUserService, AuthUtil authUtil) {
         this.memberCardService = memberCardService;
+        this.sysUserService = sysUserService;
+        this.authUtil = authUtil;
     }
 
     @Operation(summary = "根据ID查询会员卡类型", description = "查询指定ID的会员卡类型详情")
     public Mono<ServerResponse> getMemberCardById(ServerRequest request) {
-        Long id = Long.valueOf(request.pathVariable("memberCardId"));
+        Long id = Long.valueOf(request.pathVariable("id"));
         return memberCardService.findByMemberCardIdAndDeletedAtIsNull(id)
                 .flatMap(card -> ServerResponse.ok().bodyValue(card))
                 .switchIfEmpty(ServerResponse.notFound().build());
@@ -60,27 +69,72 @@ public class MemberCardHandler {
                 .flatMap(card -> ServerResponse.status(HttpStatus.CREATED).bodyValue(card));
     }
 
-    @Operation(summary = "更新会员卡类型", description = "更新会员卡类型信息")
+    @Operation(summary = "更新会员卡类型", description = "更新会员卡类型信息，需验证管理员密码")
     public Mono<ServerResponse> updateMemberCard(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
-        return request.bodyToMono(MemberCard.class)
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
-                .flatMap(card -> {
+
-                    card.setMemberCardId(id);
+        if (adminPassword == null || adminPassword.isBlank()) {
-                    return memberCardService.save(card);
+            return ServerResponse.badRequest()
-                })
+                    .contentType(MediaType.APPLICATION_JSON)
-                .flatMap(updated -> ServerResponse.ok().bodyValue(updated))
+                    .bodyValue(Map.of("code", 400, "message", "管理员密码不能为空"))
-                .switchIfEmpty(ServerResponse.notFound().build());
+                    .flatMap(resp -> Mono.just(resp));
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                        .flatMap(valid -> {
+                            if (!valid) {
+                                return ServerResponse.status(HttpStatus.FORBIDDEN)
+                                        .contentType(MediaType.APPLICATION_JSON)
+                                        .bodyValue(Map.of("code", 403, "message", "管理员密码错误"))
+                                        .flatMap(resp -> Mono.just(resp));
+                            }
+                            return request.bodyToMono(MemberCard.class)
+                                    .flatMap(body -> memberCardService.findByMemberCardIdAndDeletedAtIsNull(id)
+                                            .flatMap(existing -> {
+                                                existing.setMemberCardName(body.getMemberCardName());
+                                                existing.setMemberCardType(body.getMemberCardType());
+                                                existing.setMemberCardPrice(body.getMemberCardPrice());
+                                                existing.setMemberCardValidityDays(body.getMemberCardValidityDays());
+                                                existing.setMemberCardTotalTimes(body.getMemberCardTotalTimes());
+                                                existing.setMemberCardAmount(body.getMemberCardAmount());
+                                                existing.setMemberCardStatus(body.getMemberCardStatus());
+                                                return memberCardService.save(existing);
+                                            })
+                                            .flatMap(updated -> ServerResponse.ok().bodyValue(updated))
+                                            .switchIfEmpty(ServerResponse.notFound().build()));
+                        });
     }
 
-    @Operation(summary = "删除会员卡类型", description = "逻辑删除会员卡类型")
+    @Operation(summary = "删除会员卡类型", description = "逻辑删除会员卡类型，需验证管理员密码")
     public Mono<ServerResponse> deleteMemberCard(ServerRequest request) {
+        Long adminId = authUtil.getMemberIdOrThrow(request);
         Long id = Long.valueOf(request.pathVariable("id"));
-        return memberCardService.logicalDelete(id)
+        String adminPassword = request.queryParam("adminPassword").orElse(null);
-                .flatMap(rows -> {
+
-                    if (rows > 0) {
+        if (adminPassword == null || adminPassword.isBlank()) {
-                        return ServerResponse.noContent().build();
+            return ServerResponse.badRequest()
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .bodyValue(Map.of("code", 400, "message", "管理员密码不能为空"))
+                    .flatMap(resp -> Mono.just(resp));
+        }
+
+        return sysUserService.verifyPassword(adminId, adminPassword)
+                .flatMap(valid -> {
+                    if (!valid) {
+                        return ServerResponse.status(HttpStatus.FORBIDDEN)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .bodyValue(Map.of("code", 403, "message", "管理员密码错误"))
+                                .flatMap(resp -> Mono.just(resp));
                     }
-                    return ServerResponse.notFound().build();
+                    return memberCardService.logicalDelete(id)
+                            .flatMap(rows -> {
+                                if (rows > 0) {
+                                    return ServerResponse.noContent().build();
+                                }
+                                return ServerResponse.notFound().build();
+                            });
                 });
     }
 
@@ -97,32 +151,29 @@ 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, memberId, addTimes, addAmount, addDays, sourceOrderId)
+        return memberCardService.renewCard(recordId, addTimes, addAmount, addDays, sourceOrderId)
                 .flatMap(record -> ServerResponse.ok().bodyValue(record));
     }
 
     @Operation(summary = "使用会员卡", description = "扣减会员卡次数或余额")
     public Mono<ServerResponse> useCard(ServerRequest request) {
         Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        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, memberId, deductTimes, deductAmount)
+        return memberCardService.useCard(recordId, deductTimes, deductAmount)
                 .flatMap(record -> ServerResponse.ok().bodyValue(record));
     }
 
     @Operation(summary = "退款会员卡", description = "申请会员卡退款")
     public Mono<ServerResponse> refundCard(ServerRequest request) {
         Long recordId = Long.valueOf(request.queryParam("recordId").orElseThrow());
-        Long memberId = Long.valueOf(request.queryParam("memberId").orElseThrow());
+        return memberCardService.refundCard(recordId)
-        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,7 +3,6 @@ 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;
@@ -24,22 +23,19 @@ 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(
-                        memberId,
+                        body.getMemberId(),
                         body.getMemberCardId(),
                         body.getSourceOrderId()))
                 .flatMap(record -> ServerResponse.ok().bodyValue(record))
@@ -49,10 +45,8 @@ 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(),
@@ -64,10 +58,8 @@ 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))
@@ -77,8 +69,7 @@ public class MemberCardRecordHandler {
     @Operation(summary = "退款会员卡", description = "使用Saga模式执行退款流程，保证事务一致性")
     public Mono<ServerResponse> refundCard(ServerRequest request) {
         Long recordId = Long.parseLong(request.pathVariable("recordId"));
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return memberCardService.refundCard(recordId)
-        return memberCardService.refundCard(recordId, memberId)
                 .then(ServerResponse.ok().bodyValue("退款成功"))
                 .onErrorResume(e -> ServerResponse.badRequest().bodyValue("退款失败: " + e.getMessage()));
     }
@@ -93,34 +84,12 @@ public class MemberCardRecordHandler {
 
     @Operation(summary = "会员我的卡包", description = "查询当前会员的所有有效卡")
     public Mono<ServerResponse> getMyCards(ServerRequest request) {
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        Long memberId = Long.parseLong(request.pathVariable("memberId"));
         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()
@@ -129,6 +98,7 @@ 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,17 +109,6 @@ 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

@@ -1,7 +1,7 @@
 package cn.novalon.gym.manage.member.handler;
 
 import cn.novalon.gym.manage.common.exception.NotFoundException;
-import cn.novalon.gym.manage.member.config.WechatProperties;
+import cn.novalon.gym.manage.member.dto.AdminEditMemberDto;
 import cn.novalon.gym.manage.member.dto.AdminUpdatePhoneDto;
 import cn.novalon.gym.manage.member.dto.SearchMemberDto;
 import cn.novalon.gym.manage.member.dto.UpdateMemberInfoDto;
@@ -10,8 +10,8 @@ import cn.novalon.gym.manage.member.service.WechatAuthService;
 import cn.novalon.gym.manage.member.service.WechatOfficialService;
 import cn.novalon.gym.manage.member.util.AesUtil;
 import cn.novalon.gym.manage.member.util.WechatPhoneUtil;
+import cn.novalon.gym.manage.sys.core.service.ISysUserService;
 import cn.novalon.gym.manage.sys.util.AuthUtil;
-import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +24,8 @@ import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
 
+import java.util.Map;
+
 /**
  * 会员信息处理器
  *
@@ -41,6 +43,7 @@ public class MemberHandler {
     private final WechatAuthService wechatAuthService;
     private final WechatOfficialService wechatOfficialService;
     private final AuthUtil authUtil;
+    private final ISysUserService sysUserService;
 
     @Operation(summary = "获取会员信息", description = "根据当前登录用户获取会员基本信息")
     public Mono<ServerResponse> getMemberInfo(ServerRequest request) {
@@ -165,7 +168,7 @@ public class MemberHandler {
                 });
     }
 
-    @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息")
+    @Operation(summary = "管理员编辑会员信息", description = "后台管理员编辑会员信息，需验证管理员密码")
     public Mono<ServerResponse> adminUpdateMemberInfo(ServerRequest request) {
 
         Long adminId = authUtil.getMemberIdOrThrow(request);
@@ -174,14 +177,30 @@ public class MemberHandler {
         long memberId = NumberUtils.toLong(memberIdStr, 0L);
         if(memberId <= 0L) throw new IllegalArgumentException("会员ID格式错误");
 
-        // TODO: 补充签到记录
         log.info("前台编辑会员信息, adminId: {}, memberId: {}", adminId, memberId);
 
-        return request.bodyToMono(UpdateMemberInfoDto.class)
+        return request.bodyToMono(AdminEditMemberDto.class)
-                .flatMap(updateDto -> memberService.adminUpdateMemberInfo(memberId, updateDto))
+                .flatMap(dto -> {
-                .flatMap(detail -> ServerResponse.ok()
+                    if (dto.getAdminPassword() == null || dto.getAdminPassword().isBlank()) {
-                        .contentType(MediaType.APPLICATION_JSON)
+                        return ServerResponse.badRequest()
-                        .bodyValue(detail));
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .bodyValue(Map.of("code", 400, "message", "管理员密码不能为空"))
+                                .flatMap(resp -> Mono.<ServerResponse>just(resp));
+                    }
+                    return sysUserService.verifyPassword(adminId, dto.getAdminPassword())
+                            .flatMap(valid -> {
+                                if (!valid) {
+                                    return ServerResponse.status(HttpStatus.FORBIDDEN)
+                                            .contentType(MediaType.APPLICATION_JSON)
+                                            .bodyValue(Map.of("code", 403, "message", "管理员密码错误"))
+                                            .flatMap(resp -> Mono.<ServerResponse>just(resp));
+                                }
+                                return memberService.adminUpdateMemberInfo(memberId, dto.toUpdateMemberInfoDto())
+                                        .flatMap(result -> ServerResponse.ok()
+                                                .contentType(MediaType.APPLICATION_JSON)
+                                                .bodyValue(result));
+                            });
+                });
     }
 
     @Operation(summary = "搜索会员列表", description = "后台管理员按关键词搜索会员，支持性别筛选和分页")

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

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

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

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

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

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

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

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

@@ -32,20 +32,4 @@ 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, Long memberId, Integer addTimes, Double addAmount, Integer addDays, Long sourceOrderId);
+    Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, Integer addDays, Long sourceOrderId);
     
-    Mono<MemberCardRecord> useCard(Long recordId, Long memberId, Integer deductTimes, Double deductAmount);
+    Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount);
     
-    Mono<Void> refundCard(Long recordId, Long memberId);
+    Mono<Void> refundCard(Long recordId);
     
     Mono<Integer> processExpiredCards();
 }

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

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

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

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

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

@@ -124,18 +124,11 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
     @Override
     public Mono<MemberCardRecord> purchaseCard(Long memberId, Long memberCardId, Long sourceOrderId) {
-        if (memberId == null) {
+        return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(memberCardId)
-            return Mono.error(new RuntimeException("会员ID不能为空"));
-        }
-        if (memberCardId == null) {
-            return Mono.error(new RuntimeException("会员卡类型ID不能为空"));
-        }
-        // 前端传的是数据库主键id，不是业务字段member_card_id
-        return memberCardRepository.findByIdAndDeletedAtIsNull(memberCardId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
                 .flatMap(card -> {
-                    if (card.getMemberCardStatus() != null && card.getMemberCardStatus() == 0) {
+                    if (card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1) {
-                        return Mono.error(new RuntimeException("该会员卡已下架"));
+                        return Mono.error(new RuntimeException("该会员卡已禁用"));
                     }
 
                     MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
@@ -144,13 +137,12 @@ public class MemberCardServiceImpl implements IMemberCardService {
                             memberId.toString(),
                             cardType.name(),
                             Mono.defer(() -> createCardRecord(memberId, memberCardId, sourceOrderId, card))
-                                    // 修改：将 card 对象传递给 createTransaction 以获取购买金额
-                                    .flatMap(record -> createTransactionForPurchase(record, card, TransactionType.PURCHASE, "购买会员卡")
-                                            .thenReturn(record))
-                                    .flatMap(record -> expirationReminderService.scheduleExpirationReminder(record)
-                                            .then(Mono.just(record)))
                     );
-                });
+                })
+                .flatMap(record -> createTransaction(record, TransactionType.PURCHASE, "购买会员卡")
+                        .thenReturn(record))
+                .flatMap(record -> expirationReminderService.scheduleExpirationReminder(record)
+                        .then(Mono.just(record)));
     }
 
     private Mono<MemberCardRecord> createCardRecord(Long memberId, Long memberCardId, 
@@ -169,16 +161,12 @@ public class MemberCardServiceImpl implements IMemberCardService {
 
             switch (cardType) {
                 case TIME_CARD:
-                    if (card.getMemberCardValidityDays() != null) {
+                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                        record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                    }
                     record.setRemainingTimes(0);
                     record.setRemainingAmount(0.0);
                     break;
                 case COUNT_CARD:
-                    if (card.getMemberCardValidityDays() != null) {
+                    record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                        record.setExpireTime(now.plusDays(card.getMemberCardValidityDays()));
-                    }
                     record.setRemainingTimes(card.getMemberCardTotalTimes());
                     record.setRemainingAmount(0.0);
                     break;
@@ -203,17 +191,12 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<MemberCardRecord> renewCard(Long recordId, Long memberId, Integer addTimes, Double addAmount,
+    public Mono<MemberCardRecord> renewCard(Long recordId, Integer addTimes, Double addAmount, 
                                              Integer addDays, Long sourceOrderId) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(originalRecord -> {
+                .flatMap(originalRecord -> stateMachine.validateTransition(originalRecord, CardEvent.RENEW)
-                    if (!originalRecord.getMemberId().equals(memberId)) {
+                        .then(Mono.just(originalRecord)))
-                        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 -> {
@@ -266,16 +249,11 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<MemberCardRecord> useCard(Long recordId, Long memberId, Integer deductTimes, Double deductAmount) {
+    public Mono<MemberCardRecord> useCard(Long recordId, Integer deductTimes, Double deductAmount) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> {
+                .flatMap(record -> stateMachine.validateTransition(record, CardEvent.USE)
-                    if (!record.getMemberId().equals(memberId)) {
+                        .then(Mono.just(record)))
-                        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 -> {
@@ -336,24 +314,19 @@ public class MemberCardServiceImpl implements IMemberCardService {
     }
 
     @Override
-    public Mono<Void> refundCard(Long recordId, Long memberId) {
+    public Mono<Void> refundCard(Long recordId) {
         return recordRepository.findById(recordId)
                 .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
-                .flatMap(record -> {
+                .flatMap(record -> memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
-                    if (!record.getMemberId().equals(memberId)) {
+                        .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
-                        return Mono.error(new RuntimeException("无权操作此会员卡"));
+                        .flatMap(card -> {
-                    }
+                            MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
-                    return memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(record.getMemberCardId())
+                            return distributedLockService.executeWithLock(
-                            .switchIfEmpty(Mono.error(new RuntimeException("会员卡类型不存在")))
+                                record.getMemberId().toString(),
-                            .flatMap(card -> {
+                                cardType.name(),
-                                MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
+                                refundSagaHandler.executeRefund(recordId)
-                                return distributedLockService.executeWithLock(
+                            );
-                                    record.getMemberId().toString(),
+                        }));
-                                    cardType.name(),
-                                    refundSagaHandler.executeRefund(recordId)
-                                );
-                            });
-                });
     }
 
     @Override
@@ -368,7 +341,6 @@ 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())
@@ -382,25 +354,6 @@ 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,19 +91,8 @@ public class MemberCardTransactionServiceImpl implements IMemberCardTransactionS
 
     @Override
     public Mono<Void> createTransaction(MemberCardTransaction transaction) {
-        return transactionRepository.insertTransaction(
+        return transactionRepository.save(transaction)
-                transaction.getMemberCardRecordId(),
+                .then()
-                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,7 +17,6 @@ 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;
@@ -140,18 +139,7 @@ public class MemberServiceImpl implements MemberService {
 
     private MemberInfoVO buildMemberInfoResponse(Member member) {
         String phone = member.getPhone();
-        String maskedPhone = null;
+        String maskedPhone = phone != null ? phone.replace(phone.substring(3, 7), "****") : 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());
 
@@ -254,45 +242,58 @@ public class MemberServiceImpl implements MemberService {
                         log.debug("从缓存获取会员详情, memberId: {}", memberId);
                         return Mono.just(cached);
                     }
-                    return memberRepository.findById(memberId)
+                    // 缓存反序列化异常，查数据库
-                            .zipWith(
+                    return queryMemberDetailFromDb(memberId, cacheKey);
-                                    memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
+                })
-                                            .collectList(),
+                .switchIfEmpty(Mono.defer(() -> {
-                                    (baseInfo, cardList) -> {
+                    // 缓存不存在，查数据库
-                                        MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
+                    return queryMemberDetailFromDb(memberId, cacheKey);
+                }));
+    }
 
-                                        GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
+    private Mono<MemberDetailVO> queryMemberDetailFromDb(Long memberId, String cacheKey) {
-                                        memberDetailVO.setGenderDesc(genderEnum.getDesc());
+        return memberRepository.findById(memberId)
+                .zipWith(
+                        memberRepository.findCardRecordsWithCardInfoByMemberId(memberId)
+                                .collectList(),
+                        (baseInfo, cardList) -> {
+                            MemberDetailVO memberDetailVO = BeanConvertUtil.toBean(baseInfo, MemberDetailVO.class);
 
-                                        List<MemberCardInfoVO> enrichedCards = cardList.stream()
+                            GenderEnum genderEnum = GenderEnum.fromCode(baseInfo.getGender());
-                                                .peek(vo -> {
+                            memberDetailVO.setGenderDesc(genderEnum.getDesc());
-                                                    if (vo.getMemberCardType() != null) {
-                                                        try {
-                                                            MemberCardType cardType = MemberCardType.valueOf(vo.getMemberCardType());
-                                                            vo.setMemberCardTypeDesc(cardType.getDesc());
-                                                        } catch (IllegalArgumentException e) {
-                                                            vo.setMemberCardTypeDesc(vo.getMemberCardType());
-                                                        }
-                                                    }
-                                                    if (vo.getMemberCardStatus() != null) {
-                                                        vo.setMemberCardStatusDesc(vo.getMemberCardStatus() == 1 ? "上架" : "下架");
-                                                    }
-                                                })
-                                                .collect(Collectors.toList());
-                                        memberDetailVO.setMemberCards(enrichedCards);
 
-                                        long activeCount = enrichedCards.stream()
+                            List<MemberCardInfoVO> enrichedCards = cardList.stream()
-                                                .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
+                                    .peek(vo -> {
-                                                .count();
+                                        if (vo.getMemberCardType() != null) {
-                                        memberDetailVO.setActiveCardCount((int) activeCount);
+                                            try {
-                                        memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
+                                                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);
 
-                                        return memberDetailVO;
+                            long activeCount = enrichedCards.stream()
-                                    }
+                                    .filter(card -> card.getMemberCardStatus() != null && card.getMemberCardStatus() == 1)
-                            )
+                                    .count();
-                            .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                            memberDetailVO.setActiveCardCount((int) activeCount);
-                                    .then(Mono.just(vo)));
+                            memberDetailVO.setInactiveCardCount(enrichedCards.size() - (int) activeCount);
-                });
+
+                            return memberDetailVO;
+                        }
+                )
+                .flatMap(vo -> redisUtil.setWithExpire(cacheKey, vo, CACHE_EXPIRE_SECONDS)
+                        .then(Mono.just(vo)))
+                .switchIfEmpty(Mono.error(() -> {
+                    log.error("会员不存在: memberId={}", memberId);
+                    return new NotFoundException(ErrorCode.NOT_FOUND_USER, "会员不存在");
+                }));
     }
 
 

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

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

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

@@ -279,24 +279,3 @@ 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-payment/pom.xml

@@ -31,25 +31,18 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- 汇付聚合支付SDK -->
+        <!-- 支付宝SDK -->
         <dependency>
-            <groupId>com.huifu.dg.lightning.sdk</groupId>
+            <groupId>com.alipay.sdk</groupId>
-            <artifactId>dg-lightning-sdk</artifactId>
+            <artifactId>alipay-sdk-java</artifactId>
-            <version>1.0.5</version>
+            <version>4.35.120.ALL</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>
+            <groupId>com.google.code.gson</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>gson</artifactId>
-            <version>1.2.83</version>
+            <version>2.10.1</version>
         </dependency>
 
         <!-- Lombok -->
@@ -65,11 +58,5 @@
             <artifactId>swagger-annotations</artifactId>
             <version>2.2.19</version>
         </dependency>
-	    <dependency>
+    </dependencies>
-		    <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/AlipayClientConfig.java

@@ -0,0 +1,32 @@
+package cn.novalon.gym.manage.payment.config;
+
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 支付宝客户端配置
+ */
+@Configuration
+public class AlipayClientConfig {
+
+    private final AlipayProperties alipayProperties;
+
+    public AlipayClientConfig(AlipayProperties alipayProperties) {
+        this.alipayProperties = alipayProperties;
+    }
+
+    @Bean
+    public AlipayClient alipayClient() {
+        return new DefaultAlipayClient(
+                alipayProperties.getGateway(),
+                alipayProperties.getAppId(),
+                alipayProperties.getAppPrivateKey(),
+                "json",
+                alipayProperties.getCharset(),
+                alipayProperties.getAlipayPublicKey(),
+                alipayProperties.getSignType()
+        );
+    }
+}

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

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

@@ -13,9 +13,6 @@ 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;
 
@@ -54,8 +51,4 @@ public class CreatePaymentRequest {
 
     @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

@@ -51,13 +51,4 @@ public class PaymentResponse {
 
     @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

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

@@ -2,8 +2,8 @@ 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.dto.PaymentResponse;
 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;
@@ -11,40 +11,42 @@ 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 reactor.core.publisher.MonoSink;
 
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 支付处理器
+ * 提供支付宝App支付相关接口
+ */
 @Slf4j
 @Component
 @Tag(name = "支付管理", description = "支付宝App支付接口")
 public class PaymentHandler {
 
     private final PaymentService paymentService;
-    private final AuthUtil authUtil;
 
-    public PaymentHandler(PaymentService paymentService, AuthUtil authUtil) {
+    public PaymentHandler(PaymentService paymentService) {
         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());
+                            createReq.getMemberId(), createReq.getOrderType(), createReq.getGoodsDesc(), createReq.getTransAmt());
 
-                    return paymentService.alipayAppPay(memberId, createReq)
+                    PaymentResponse result = paymentService.alipayAppPay(createReq);
-                            .flatMap(result -> {
+
-                                if ("FAIL".equals(result.getStatus())) {
+                    if ("FAIL".equals(result.getStatus())) {
-                                    return ServerResponse.ok()
+                        return ServerResponse.ok()
-                                            .bodyValue(ApiResponse.error(result.getErrorMsg()));
+                                .bodyValue(ApiResponse.error(result.getErrorMsg()));
-                                }
+                    }
-                                return ServerResponse.ok()
+
-                                        .bodyValue(ApiResponse.success(result));
+                    return ServerResponse.ok()
-                            });
+                            .bodyValue(ApiResponse.success(result));
                 })
                 .onErrorResume(e -> {
                     log.error("[Payment] 创建支付订单异常", e);
@@ -55,21 +57,20 @@ public class PaymentHandler {
 
     @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());
+                            createReq.getMemberId(), createReq.getOrderType(), createReq.getGoodsDesc(), createReq.getTransAmt());
 
-                    return paymentService.alipayQrCodePay(memberId, createReq)
+                    PaymentResponse result = paymentService.alipayQrCodePay(createReq);
-                            .flatMap(result -> {
+
-                                if ("FAIL".equals(result.getStatus())) {
+                    if ("FAIL".equals(result.getStatus())) {
-                                    return ServerResponse.ok()
+                        return ServerResponse.ok()
-                                            .bodyValue(ApiResponse.error(result.getErrorMsg()));
+                                .bodyValue(ApiResponse.error(result.getErrorMsg()));
-                                }
+                    }
-                                return ServerResponse.ok()
+
-                                        .bodyValue(ApiResponse.success(result));
+                    return ServerResponse.ok()
-                            });
+                            .bodyValue(ApiResponse.success(result));
                 })
                 .onErrorResume(e -> {
                     log.error("[Payment] 创建扫码支付订单异常", e);
@@ -80,42 +81,40 @@ public class PaymentHandler {
 
     @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)
+        PaymentResponse result = paymentService.getPaymentStatus(orderId);
-                .flatMap(result -> ServerResponse.ok().bodyValue(ApiResponse.success(result)))
+        return ServerResponse.ok()
-                .onErrorResume(e -> {
+                .bodyValue(ApiResponse.success(result));
-                    log.error("[Payment] 查询支付状态异常", e);
-                    return ServerResponse.ok()
-                            .bodyValue(ApiResponse.error("查询支付状态失败: " + e.getMessage()));
-                });
     }
 
-    @Operation(summary = "汇付异步通知", description = "接收汇付异步回调通知")
+    @Operation(summary = "支付宝异步通知", description = "接收支付宝异步回调通知")
-    public Mono<ServerResponse> huifuNotify(ServerRequest request) {
+    public Mono<ServerResponse> alipayNotify(ServerRequest request) {
-        Long memberId = authUtil.getMemberIdOrThrow(request);
+        return request.bodyToMono(Map.class)
-        String respData = request.queryParam("resp_data").orElse(null);
+                .flatMap(params -> {
-        String sign = request.queryParam("sign").orElse(null);
+                    log.info("[Payment] 收到支付宝异步通知: params={}", params);
 
-        log.info("[Payment] 收到汇付异步通知: resp_data={}, sign={}", respData, sign);
+                    // 转换Map类型
+                    Map<String, String> notifyParams = new HashMap<>();
+                    if (params instanceof Map) {
+                        ((Map<?, ?>) params).forEach((key, value) ->
+                            notifyParams.put(String.valueOf(key), String.valueOf(value)));
+                    }
 
-        Map<String, String> notifyParams = new HashMap<>();
+                    String result = paymentService.handleAlipayNotify(notifyParams);
-        notifyParams.put("resp_data", respData);
+                    return ServerResponse.ok()
-        notifyParams.put("sign", sign);
+                            .bodyValue(result);
-
+                })
-        return paymentService.handleAlipayNotify(notifyParams)
-                .flatMap(result -> ServerResponse.ok().bodyValue(result))
                 .onErrorResume(e -> {
-                    log.error("[Payment] 处理异步通知异常", e);
+                    log.error("[Payment] 异步通知处理异常", e);
-                    return ServerResponse.ok().bodyValue("FAIL");
+                    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)
@@ -123,16 +122,14 @@ public class PaymentHandler {
                     String refundAmt = String.valueOf(body.get("refundAmt"));
                     log.info("[Payment] 申请退款: orderId={}, refundAmt={}", orderId, refundAmt);
 
-                    return paymentService.refund(memberId, orderId, refundAmt)
+                    boolean success = paymentService.refund(orderId, refundAmt);
-                            .flatMap(success -> {
+                    if (success) {
-                                if (success) {
+                        return ServerResponse.ok()
-                                    return ServerResponse.ok()
+                                .bodyValue(ApiResponse.success("退款申请成功"));
-                                            .bodyValue(ApiResponse.success("退款申请成功"));
+                    } else {
-                                } else {
+                        return ServerResponse.ok()
-                                    return ServerResponse.ok()
+                                .bodyValue(ApiResponse.error("退款申请失败"));
-                                            .bodyValue(ApiResponse.error("退款申请失败"));
+                    }
-                                }
-                            });
                 })
                 .onErrorResume(e -> {
                     log.error("[Payment] 退款异常: orderId={}", orderId, e);
@@ -140,108 +137,4 @@ public class PaymentHandler {
                             .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

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

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

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

@@ -2,32 +2,58 @@ 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);
+    /**
+     * 创建支付订单
+     *
+     * @param request 创建支付请求
+     * @return 支付响应
+     */
+    PaymentResponse createPayment(CreatePaymentRequest request);
 
-    Mono<PaymentResponse> getPaymentStatus(Long memberId, String orderId);
+    /**
+     * 查询支付状态
+     *
+     * @param orderId 订单ID
+     * @return 支付响应
+     */
+    PaymentResponse getPaymentStatus(String orderId);
 
-    Mono<PaymentResponse> alipayAppPay(Long memberId, CreatePaymentRequest request);
+    /**
+     * 支付宝App支付
+     *
+     * @param request 创建支付请求
+     * @return 支付响应
+     */
+    PaymentResponse alipayAppPay(CreatePaymentRequest request);
 
-    Mono<PaymentResponse> alipayQrCodePay(Long memberId, CreatePaymentRequest request);
+    /**
+     * 支付宝扫码支付（二维码支付）
+     *
+     * @param request 创建支付请求
+     * @return 支付响应（包含二维码链接）
+     */
+    PaymentResponse alipayQrCodePay(CreatePaymentRequest request);
 
-    Mono<String> handleAlipayNotify(Map<String, String> params);
+    /**
+     * 处理支付宝异步通知
+     *
+     * @param params 通知参数
+     * @return 处理结果
+     */
+    String handleAlipayNotify(java.util.Map<String, String> params);
 
-    Mono<Boolean> refund(Long memberId, String orderId, String refundAmt);
+    /**
-
+     * 申请退款
-    Flux<PaymentResponse> getAllPaymentOrders(Long memberId);
+     *
-
+     * @param orderId   订单ID
-    Mono<Map<String, Object>> queryHuifuTradeList(Long memberId, String beginDate, String endDate);
+     * @param refundAmt 退款金额(分)
-
+     * @return 退款结果
-    Mono<Map<String, Object>> queryHuifuTradeByOrderId(Long memberId, String outOrdId, String hfSeqId);
+     */
-
+    boolean refund(String orderId, String refundAmt);
-    Mono<PaymentResponse> getPendingOrder(Long memberId, String orderType);
-
-    Mono<Boolean> closeOrder(Long memberId, String orderId);
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,88 +0,0 @@
-import com.huifu.bspay.sdk.opps.client.BasePayClient;
-import com.huifu.bspay.sdk.opps.core.request.V2TradeBatchtranslogQueryRequest;
-import com.huifu.bspay.sdk.opps.core.request.V2TradeSettleCollectionDetailQueryRequest;
-import com.huifu.bspay.sdk.opps.core.utils.DateTools;
-import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
-import com.alibaba.fastjson.JSON;
-import java.util.Map;
-
-public class TestOtherQueryApis {
-    public static void main(String[] args) {
-        try {
-            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
-            String sysId = "6666000207581039";
-            String productId = "XLSISV";
-            String huifuId = "6666000207581039";
-            String skillSource = "hfps/1.3.0";
-
-            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
-            merConfig.setSysId(sysId);
-            merConfig.setProductId(productId);
-            merConfig.setRsaPrivateKey(privateKey);
-            merConfig.setRsaPublicKey(huifuPublicKey);
-            merConfig.setSkillSource(skillSource);
-
-            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
-            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
-
-            String today = DateTools.getCurrentDateYYYYMMDD();
-            String yesterday = "20260625";
-            
-            System.out.println("========== 1. 批量交易日志查询 (V2TradeBatchtranslogQueryRequest) ==========");
-            try {
-                V2TradeBatchtranslogQueryRequest request = new V2TradeBatchtranslogQueryRequest();
-                request.setHuifuId(huifuId);
-                request.setBeginDate(yesterday);
-                request.setEndDate(today);
-                
-                System.out.println("请求参数: " + JSON.toJSONString(request));
-                System.out.println();
-                
-                Map<String, Object> response = BasePayClient.request(request, false);
-                
-                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
-                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
-                
-                System.out.println("响应码: " + respCode);
-                System.out.println("响应描述: " + respDesc);
-                System.out.println("完整响应: " + JSON.toJSONString(response, true));
-            } catch (Exception e) {
-                System.out.println("调用失败: " + e.getMessage());
-                e.printStackTrace();
-            }
-            
-            System.out.println();
-            System.out.println("========== 2. 结算汇总明细查询 (V2TradeSettleCollectionDetailQueryRequest) ==========");
-            try {
-                V2TradeSettleCollectionDetailQueryRequest request = new V2TradeSettleCollectionDetailQueryRequest();
-                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
-                request.setReqSeqId(SequenceTools.getReqSeqId32());
-                request.setBeginDate(yesterday);
-                request.setEndDate(today);
-                request.setInHuifuId(huifuId);
-                
-                System.out.println("请求参数: " + JSON.toJSONString(request));
-                System.out.println();
-                
-                Map<String, Object> response = BasePayClient.request(request, false);
-                
-                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
-                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
-                
-                System.out.println("响应码: " + respCode);
-                System.out.println("响应描述: " + respDesc);
-                System.out.println("完整响应: " + JSON.toJSONString(response, true));
-            } catch (Exception e) {
-                System.out.println("调用失败: " + e.getMessage());
-                e.printStackTrace();
-            }
-            
-            System.out.println();
-            System.out.println("========== 测试结束 ==========");
-            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,58 +0,0 @@
-import com.huifu.bspay.sdk.opps.client.BasePayClient;
-import com.huifu.bspay.sdk.opps.core.request.V2TradeSettleCollectionDetailQueryRequest;
-import com.huifu.bspay.sdk.opps.core.utils.DateTools;
-import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
-import com.alibaba.fastjson.JSON;
-import java.util.Map;
-
-public class TestSettlementQuery {
-    public static void main(String[] args) {
-        try {
-            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
-            String sysId = "6666000207581039";
-            String productId = "XLSISV";
-            String huifuId = "6666000207581039";
-            String skillSource = "hfps/1.3.0";
-
-            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
-            merConfig.setSysId(sysId);
-            merConfig.setProductId(productId);
-            merConfig.setRsaPrivateKey(privateKey);
-            merConfig.setRsaPublicKey(huifuPublicKey);
-            merConfig.setSkillSource(skillSource);
-
-            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
-            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
-
-            System.out.println("========== 测试结算汇总明细查询（生产环境）==========");
-            System.out.println();
-
-            String today = DateTools.getCurrentDateYYYYMMDD();
-            String weekAgo = java.time.LocalDate.now().minusDays(7).format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
-
-            System.out.println("----- 结算汇总明细查询 -----");
-            try {
-                V2TradeSettleCollectionDetailQueryRequest request = new V2TradeSettleCollectionDetailQueryRequest();
-                request.setReqDate(today);
-                request.setReqSeqId(SequenceTools.getReqSeqId32());
-                request.setBeginDate(weekAgo);
-                request.setEndDate(today);
-                request.setInHuifuId(huifuId);
-
-                System.out.println("请求参数: " + JSON.toJSONString(request));
-                Map<String, Object> response = BasePayClient.request(request, false);
-                System.out.println("响应: " + JSON.toJSONString(response, true));
-            } catch (Exception e) {
-                System.out.println("查询失败: " + e.getMessage());
-                e.printStackTrace();
-            }
-
-            System.out.println();
-            System.out.println("========== 测试结束 ==========");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-import com.huifu.dg.lightning.factory.Factory;
-import com.huifu.dg.lightning.biz.client.CommonPayClient;
-import com.huifu.dg.lightning.models.payment.TradePaymentScanpayQueryRequest;
-import com.huifu.dg.lightning.utils.BasePay;
-import com.huifu.dg.lightning.biz.config.MerConfig;
-import com.alibaba.fastjson.JSON;
-import java.util.Map;
-
-public class TestSingleQuery {
-    public static void main(String[] args) {
-        try {
-            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String sysId = "6666000207581039";
-            String productId = "XLSISV";
-            String huifuId = "6666000207581039";
-            String skillSource = "hfps/1.3.0";
-
-            MerConfig merConfig = new MerConfig();
-            merConfig.setSysId(sysId);
-            merConfig.setProductId(productId);
-            merConfig.setRsaPrivateKey(privateKey);
-            merConfig.setRsaPublicKey(huifuPublicKey);
-            merConfig.setSkillSource(skillSource);
-
-            BasePay.prodMode = BasePay.MODE_PROD;
-            BasePay.initWithMerConfig(merConfig);
-
-            System.out.println("========== V4 单笔交易查询测试 ==========");
-
-            CommonPayClient client = Factory.Payment.Common();
-
-            TradePaymentScanpayQueryRequest queryRequest = new TradePaymentScanpayQueryRequest();
-            queryRequest.setReqDate("20260626");
-            queryRequest.setReqSeqId(com.huifu.dg.lightning.utils.SequenceTools.getReqSeqId32());
-            queryRequest.setHuifuId(huifuId);
-            queryRequest.setOutOrdId("20260626063214982n7cuxk8mp4cbbx");
-
-            Map<String, Object> response = client.query(queryRequest);
-
-            System.out.println("查询响应:");
-            System.out.println(JSON.toJSONString(response, true));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -1,71 +0,0 @@
-import com.huifu.bspay.sdk.opps.client.BasePayClient;
-import com.huifu.bspay.sdk.opps.core.request.V2TradeTransstatQueryRequest;
-import com.huifu.bspay.sdk.opps.core.utils.DateTools;
-import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
-import com.alibaba.fastjson.JSON;
-import java.util.Map;
-
-public class TestTransstat {
-    public static void main(String[] args) {
-        try {
-            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
-            String sysId = "6666000207581039";
-            String productId = "XLSISV";
-            String huifuId = "6666000207581039";
-            String skillSource = "hfps/1.3.0";
-
-            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
-            merConfig.setSysId(sysId);
-            merConfig.setProductId(productId);
-            merConfig.setRsaPrivateKey(privateKey);
-            merConfig.setRsaPublicKey(huifuPublicKey);
-            merConfig.setSkillSource(skillSource);
-
-            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
-            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
-
-            System.out.println("========== 交易状态查询测试 ==========");
-            System.out.println("商户号: " + huifuId);
-            System.out.println();
-
-            try {
-                V2TradeTransstatQueryRequest request = new V2TradeTransstatQueryRequest();
-                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
-                request.setHuifuId(huifuId);
-                request.setPageNo("1");
-                request.setPageSize("20");
-
-                System.out.println("请求参数: " + JSON.toJSONString(request));
-                System.out.println();
-
-                Map<String, Object> response = BasePayClient.request(request, false);
-
-                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
-                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
-
-                System.out.println("响应码: " + respCode);
-                System.out.println("响应描述: " + respDesc);
-                System.out.println("完整响应: " + JSON.toJSONString(response, true));
-
-                if ("00000000".equals(respCode)) {
-                    System.out.println();
-                    System.out.println("*** 查询成功！ ***");
-                    Object transDetails = response.get("trans_details");
-                    if (transDetails != null) {
-                        System.out.println("trans_details: " + transDetails);
-                    }
-                }
-            } catch (Exception e) {
-                System.out.println("调用失败: " + e.getMessage());
-                e.printStackTrace();
-            }
-
-            System.out.println();
-            System.out.println("========== 测试结束 ==========");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-import com.huifu.bspay.sdk.opps.client.BasePayClient;
-import com.huifu.bspay.sdk.opps.core.request.V2TradeTransstatQueryRequest;
-import com.huifu.bspay.sdk.opps.core.utils.DateTools;
-import com.huifu.bspay.sdk.opps.core.utils.SequenceTools;
-import com.alibaba.fastjson.JSON;
-import java.util.Map;
-
-public class TestTransstatQuery {
-    public static void main(String[] args) {
-        try {
-            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUCKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
-            String huifuPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB";
-            String sysId = "6666000207581039";
-            String productId = "XLSISV";
-            String huifuId = "6666000207581039";
-            String skillSource = "hfps/1.3.0";
-
-            com.huifu.bspay.sdk.opps.core.config.MerConfig merConfig = new com.huifu.bspay.sdk.opps.core.config.MerConfig();
-            merConfig.setSysId(sysId);
-            merConfig.setProductId(productId);
-            merConfig.setRsaPrivateKey(privateKey);
-            merConfig.setRsaPublicKey(huifuPublicKey);
-            merConfig.setSkillSource(skillSource);
-
-            com.huifu.bspay.sdk.opps.core.BasePay.prodMode = com.huifu.bspay.sdk.opps.core.BasePay.MODE_PROD;
-            com.huifu.bspay.sdk.opps.core.BasePay.initWithMerConfig(merConfig);
-
-            System.out.println("========== 斗拱官方交易状态查询测试（生产环境）==========");
-            System.out.println("环境: 生产环境");
-            System.out.println("商户号: " + huifuId);
-            System.out.println();
-
-            try {
-                V2TradeTransstatQueryRequest request = new V2TradeTransstatQueryRequest();
-                request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
-                request.setHuifuId(huifuId);
-                request.setPageNo("1");
-                request.setPageSize("10");
-
-                System.out.println("请求参数: " + JSON.toJSONString(request));
-
-                Map<String, Object> response = BasePayClient.request(request, false);
-
-                String respCode = String.valueOf(response.getOrDefault("resp_code", ""));
-                String respDesc = String.valueOf(response.getOrDefault("resp_desc", ""));
-
-                System.out.println("响应码: " + respCode);
-                System.out.println("响应描述: " + respDesc);
-                System.out.println("完整响应: " + JSON.toJSONString(response, true));
-
-                if ("00000000".equals(respCode)) {
-                    System.out.println("*** 查询成功！ ***");
-                }
-            } catch (Exception e) {
-                System.out.println("调用失败: " + e.getMessage());
-                e.printStackTrace();
-            }
-
-            System.out.println();
-            System.out.println("========== 测试结束 ==========");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

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

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

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

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

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

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

@@ -10,22 +10,20 @@ import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDeta
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.server.WebFilter;
 
 import java.util.List;
 
 @SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = {
         ReactiveUserDetailsServiceAutoConfiguration.class })
-@EnableScheduling
+//@EnableScheduling
 @EnableR2dbcRepositories(basePackages = {
         "cn.novalon.gym.manage.db.dao",
         "cn.novalon.gym.manage.sys.audit.repository" ,
         "cn.novalon.gym.manage.gymmembercard.dao",
         "cn.novalon.gym.manage.member.repository",
         "cn.novalon.gym.manage.groupcourse.dao",
-        "cn.novalon.gym.manage.checkIn.repository",
+        "cn.novalon.gym.manage.checkIn.repository"
-        "cn.novalon.gym.manage.payment.repository"
 })
 @EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository")
 public class ManageApplication {

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

@@ -1,30 +0,0 @@
-package cn.novalon.gym.manage.app.config;
-
-import cn.novalon.gym.manage.app.handler.PaymentWebSocketHandler;
-import lombok.RequiredArgsConstructor;
-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 java.util.HashMap;
-import java.util.Map;
-
-@Configuration
-@RequiredArgsConstructor
-public class PaymentWebSocketConfig {
-
-    private final PaymentWebSocketHandler paymentWebSocketHandler;
-
-    @Bean
-    public HandlerMapping paymentWebSocketHandlerMapping() {
-        Map<String, WebSocketHandler> map = new HashMap<>();
-        map.put("/ws/payment/{orderNo}", paymentWebSocketHandler);
-
-        SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
-        mapping.setUrlMap(map);
-        mapping.setOrder(-1);
-        return mapping;
-    }
-}

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

@@ -10,11 +10,11 @@ import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseRecommendHandler;
 import cn.novalon.gym.manage.groupcourse.handler.GroupCourseTypeHandler;
 import cn.novalon.gym.manage.groupcourse.handler.CourseLabelHandler;
+import cn.novalon.gym.manage.groupcourse.handler.CommonUploadHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardRecordHandler;
 import cn.novalon.gym.manage.member.handler.MemberCardTransactionHandler;
 import cn.novalon.gym.manage.member.handler.MemberHandler;
-import cn.novalon.gym.manage.member.handler.MemberStoredCardHandler;
 import cn.novalon.gym.manage.member.handler.WechatAuthHandler;
 import cn.novalon.gym.manage.notify.handler.SysNoticeHandler;
 import cn.novalon.gym.manage.notify.handler.SysUserMessageHandler;
@@ -73,7 +73,6 @@ public class SystemRouter {
             MemberCardHandler memberCardHandler,
             MemberCardRecordHandler memberCardRecordHandler,
             MemberCardTransactionHandler memberCardTransactionHandler,
-            MemberStoredCardHandler memberStoredCardHandler,
             GroupCourseHandler groupCourseHandler,
             GroupCourseBookingHandler groupCourseBookingHandler,
             GroupCourseRecommendHandler groupCourseRecommendHandler,
@@ -82,7 +81,8 @@ public class SystemRouter {
             CheckInHandler checkInHandler,
             DataStatisticsHandler dataStatisticsHandler,
             PhoneAuthHandler phoneAuthHandler,
-            PaymentHandler paymentHandler) {
+            PaymentHandler paymentHandler,
+            CommonUploadHandler commonUploadHandler) {
 
         return route()
                 // ========== 诊断路由 ==========
@@ -170,6 +170,7 @@ public class SystemRouter {
                 .POST("/api/auth/login", authHandler::login)
                 .POST("/api/auth/register", authHandler::register)
                 .POST("/api/auth/logout", authHandler::logout)
+                .GET("/api/auth/me", authHandler::me)
 
                 // ========== 统计路由 ==========
                 .GET("/api/stats/overview", statsHandler::getOverview)
@@ -217,6 +218,10 @@ public class SystemRouter {
                 .GET("/api/files/preview/{fileName}", fileHandler::previewFileByName)
                 .DELETE("/api/files/{id}", fileHandler::deleteFile)
 
+                // ===== 通用文件上传（OSS）=====
+                .POST("/api/upload/image", commonUploadHandler::uploadImage)
+                .GET("/api/upload/presign", commonUploadHandler::presignUrl)
+
                 // ========== 权限路由 ==========
                 .GET("/api/permissions", permissionHandler::getAllPermissions)
                 .GET("/api/permissions/{id}", permissionHandler::getPermissionById)
@@ -257,8 +262,11 @@ public class SystemRouter {
 
                 // ===== 会员卡类型管理 =====
                 .GET("/api/member-cards/active", memberCardHandler::getActiveCards)
+                .GET("/api/member-cards", memberCardHandler::listMemberCards)
                 .GET("/api/member-cards/{memberCardId}", memberCardHandler::getMemberCardById)
                 .POST("/api/member-cards", memberCardHandler::createMemberCard)
+                .PUT("/api/member-cards/{id}", memberCardHandler::updateMemberCard)
+                .DELETE("/api/member-cards/{id}", memberCardHandler::deleteMemberCard)
 
                 // ===== 会员卡记录管理（核心业务）=====
                 .POST("/api/member-card-records/purchase", memberCardRecordHandler::purchaseCard)
@@ -266,8 +274,6 @@ public class SystemRouter {
                 .POST("/api/member-card-records/{recordId}/use", memberCardRecordHandler::useCard)
                 .POST("/api/member-card-records/{recordId}/refund", memberCardRecordHandler::refundCard)
                 .GET("/api/member-card-records/my-cards/{memberId}", memberCardRecordHandler::getMyCards)
-                .GET("/api/member-card-records/my-cards-with-status/{memberId}", memberCardRecordHandler::getMyCardsWithStatus)
-                .GET("/api/member-card-records/primary/{memberId}", memberCardRecordHandler::getPrimaryCard)
                 .GET("/api/member-card-records/{recordId}", memberCardRecordHandler::getMemberCardRecordById)
                 .POST("/api/member-card-records/process-expired", memberCardRecordHandler::processExpiredCards)
 
@@ -276,20 +282,10 @@ public class SystemRouter {
                 .GET("/api/member-card-transactions", memberCardTransactionHandler::getTransactionsWithConditions)
                 .GET("/api/member-card-transactions/member/{memberId}", memberCardTransactionHandler::getMemberTransactions)
                 .GET("/api/member-card-transactions/card/{cardId}", memberCardTransactionHandler::getTransactionsByCardId)
-                .GET("/api/member-card-transactions/record/{recordId}", memberCardTransactionHandler::getTransactionsByRecordId)
                 .GET("/api/member-card-transactions/statistics/deduct/{cardId}", memberCardTransactionHandler::getDeductCountByCardId)
                 .GET("/api/member-card-transactions/statistics/renew", memberCardTransactionHandler::getRenewAmountByTimeRange)
                 .GET("/api/member-card-transactions/statistics/purchase/{memberId}", memberCardTransactionHandler::getPurchaseAmountByMember)
 
-                // ===== 储值卡管理（包含支付密码） =====
-                .GET("/api/stored-card/{memberId}", memberStoredCardHandler::getStoredCardInfo)
-                .GET("/api/stored-card/{memberId}/balance", memberStoredCardHandler::getBalance)
-                .GET("/api/stored-card/{memberId}/recharges", memberStoredCardHandler::getRechargeRecords)
-                .GET("/api/pay-password/check/{memberId}", memberStoredCardHandler::checkPasswordSet)
-                .POST("/api/pay-password/set/{memberId}", memberStoredCardHandler::setPassword)
-                .POST("/api/pay-password/verify/{memberId}", memberStoredCardHandler::verifyPassword)
-                .POST("/api/stored-card/pay/{memberId}", memberStoredCardHandler::payWithStoredCard)
-
                 // ========================================
                 // ========== 团课管理路由 =================
                 // ========================================
@@ -345,6 +341,7 @@ public class SystemRouter {
                 .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse)
                 .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse)
                 .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse)
+                .POST("/api/groupCourse/{id}/restore", groupCourseHandler::restoreGroupCourse)
                 .POST("/api/groupCourse/signin/{memberId}", groupCourseHandler::signIn)
                 .POST("/api/groupCourse/search", groupCourseHandler::searchGroupCourses)
                 
@@ -354,6 +351,7 @@ public class SystemRouter {
                 .GET("/api/checkIn/qrcode", checkInHandler::getQRCode)
                 
                 // ===== 签到记录管理 =====
+                .GET("/api/checkIn/records/export", checkInHandler::exportSignInRecords)
                 .GET("/api/checkIn/records", checkInHandler::getSignInRecords)
                 .GET("/api/checkIn/records/{id}", checkInHandler::getSignInRecordById)
                 
@@ -361,8 +359,9 @@ public class SystemRouter {
                 .GET("/api/checkIn/statistics", checkInHandler::getSignInStatistics)
                 .GET("/api/checkIn/daily-stats", checkInHandler::getDailySignInStats)
 
-                // ===== 签到数据导出 =====
+                // ===== 管理员签到记录（全员） =====
-                .GET("/api/checkIn/records/export", checkInHandler::exportSignInRecords)
+                .GET("/api/checkIn/admin/records", checkInHandler::getAllSignInRecords)
+                .GET("/api/checkIn/admin/statistics", checkInHandler::getAllSignInStatistics)
 
                 // ========================================
                 // ========== 数据统计模块路由 ============
@@ -377,19 +376,17 @@ public class SystemRouter {
                 .GET("/api/datacount/export", dataStatisticsHandler::exportStatistics)
 
                 // ========================================
-                // ========== 支付模块路由 ================
+                // ========== 支付模块路由 =================
                 // ========================================
 
+                // ===== 支付宝App支付 =====
                 .POST("/api/payment/create", paymentHandler::createPayment)
-                .POST("/api/payment/qrcode/create", paymentHandler::createQrCodePayment)
-                .GET("/api/payment/all", paymentHandler::getAllPaymentOrders)
-                .GET("/api/payment/huifu/list", paymentHandler::queryHuifuTradeList)
-                .GET("/api/payment/huifu/query", paymentHandler::queryHuifuTradeByOrderId)
-                .GET("/api/payment/notify/huifu", paymentHandler::huifuNotify)
-                .GET("/api/payment/pending/{memberId}", paymentHandler::getPendingOrder)
                 .GET("/api/payment/{orderId}", paymentHandler::getPaymentStatus)
                 .POST("/api/payment/{orderId}/refund", paymentHandler::refundPayment)
-                .POST("/api/payment/{orderId}/close", paymentHandler::closeOrder)
+                .POST("/api/payment/notify", paymentHandler::alipayNotify)
+
+                // ===== 支付宝扫码支付 =====
+                .POST("/api/payment/qrcode/create", paymentHandler::createQrCodePayment)
 
                 .build();
     }

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

@@ -1,85 +0,0 @@
-package cn.novalon.gym.manage.app.handler;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.WebSocketSession;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.publisher.Sinks;
-
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@Component
-public class PaymentWebSocketHandler implements WebSocketHandler {
-
-    private static final Map<String, Sinks.Many<String>> sessionSinks = new ConcurrentHashMap<>();
-
-    public static void sendMessage(String orderNo, String status) {
-        Sinks.Many<String> sink = sessionSinks.get(orderNo);
-        if (sink != null) {
-            JSONObject message = new JSONObject();
-            message.put("orderId", orderNo);
-            message.put("status", status);
-            message.put("timestamp", System.currentTimeMillis());
-            sink.tryEmitNext(message.toJSONString());
-            log.info("[WebSocket] 推送支付状态, orderNo={}, status={}", orderNo, status);
-        } else {
-            log.warn("[WebSocket] 未找到连接, orderNo={}", orderNo);
-        }
-    }
-
-    @Override
-    public Mono<Void> handle(WebSocketSession session) {
-        String path = session.getHandshakeInfo().getUri().getPath();
-        String orderNo = extractOrderNo(path);
-
-        log.info("[WebSocket] 客户端连接, orderNo={}", orderNo);
-
-        Sinks.Many<String> sink = Sinks.many().multicast().onBackpressureBuffer();
-        sessionSinks.put(orderNo, sink);
-
-        Mono<Void> heartbeat = Mono.delay(Duration.ofSeconds(30))
-                .repeat(() -> true)
-                .then()
-                .onErrorResume(e -> Mono.empty());
-
-        Mono<Void> send = session.send(
-                sink.asFlux()
-                        .map(session::textMessage)
-                        .mergeWith(
-                                Flux.interval(Duration.ofSeconds(25))
-                                        .map(tick -> {
-                                            JSONObject ping = new JSONObject();
-                                            ping.put("type", "ping");
-                                            ping.put("timestamp", System.currentTimeMillis());
-                                            return session.textMessage(ping.toJSONString());
-                                        })
-                        )
-        );
-
-        Mono<Void> receive = session.receive()
-                .doOnNext(message -> {
-                    log.debug("[WebSocket] 收到消息, orderNo={}, msg={}", orderNo, message.getPayloadAsText());
-                })
-                .then();
-
-        return Mono.zip(send, receive, heartbeat)
-                .then()
-                .doFinally(signal -> {
-                    sessionSinks.remove(orderNo);
-                    log.info("[WebSocket] 连接关闭, orderNo={}, signal={}", orderNo, signal);
-                });
-    }
-
-    private String extractOrderNo(String path) {
-        if (path.startsWith("/ws/payment/")) {
-            return path.substring("/ws/payment/".length());
-        }
-        return "unknown";
-    }
-}

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

@@ -1,222 +0,0 @@
-package cn.novalon.gym.manage.app.service;
-
-import cn.novalon.gym.manage.app.handler.PaymentWebSocketHandler;
-import cn.novalon.gym.manage.member.repository.MemberStoredCardRechargeRepository;
-import cn.novalon.gym.manage.member.repository.MemberStoredCardRepository;
-import cn.novalon.gym.manage.member.service.IMemberCardService;
-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 lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Slf4j
-@Service
-public class PaymentNotifyServiceImpl implements PaymentNotifyService {
-
-    private final PaymentOrderRepository paymentOrderRepository;
-    private final MemberStoredCardRepository memberStoredCardRepository;
-    private final MemberStoredCardRechargeRepository memberStoredCardRechargeRepository;
-    private final IMemberCardService memberCardService;
-   private Long memberIdGlob;
-
-    public PaymentNotifyServiceImpl(PaymentOrderRepository paymentOrderRepository,
-                                     MemberStoredCardRepository memberStoredCardRepository,
-                                     MemberStoredCardRechargeRepository memberStoredCardRechargeRepository,
-                                     IMemberCardService memberCardService) {
-        this.paymentOrderRepository = paymentOrderRepository;
-        this.memberStoredCardRepository = memberStoredCardRepository;
-        this.memberStoredCardRechargeRepository = memberStoredCardRechargeRepository;
-        this.memberCardService = memberCardService;
-    }
-
-    @Override
-    public Mono<Void> notifyPaymentStatus(String orderNo, String status,Long memberId) {
-        memberIdGlob = memberId;
-        return paymentOrderRepository.findByOrderNo(orderNo)
-                .flatMap(order -> {
-                    log.info("[PaymentNotify] 支付通知: orderNo={}, status={}, orderType={}", orderNo, status, order.getOrderType());
-
-                    if ("SUCCESS".equals(status)) {
-                        return handlePaymentSuccess(order);
-                    }
-
-                    return Mono.empty();
-                })
-                .doOnSuccess(v -> {
-                    try {
-                        PaymentWebSocketHandler.sendMessage(orderNo, status);
-                    } catch (Exception e) {
-                        log.error("[PaymentNotify] WebSocket推送失败, orderNo={}, status={}", orderNo, status, e);
-                    }
-                })
-                .then();
-    }
-
-    private Mono<Void> handlePaymentSuccess(PaymentOrder order) {
-        String orderType = order.getOrderType();
-
-        if ("STORED_CARD_RECHARGE".equals(orderType)) {
-            return handleStoredCardRecharge(order);
-        }
-
-        if ("MEMBER_CARD".equals(orderType)) {
-            return handleMemberCardPurchase(order);
-        }
-
-        return Mono.empty();
-    }
-
-    private Mono<Void> handleMemberCardPurchase(PaymentOrder order) {
-        String remark = order.getRemark();
-        log.info("[PaymentNotify] 开始处理会员卡购买, orderNo={}, memberId={}, remark={}",
-                order.getOrderNo(), order.getMemberId(), remark);
-
-        if (remark == null || remark.isEmpty()) {
-            log.warn("[PaymentNotify] 会员卡购买订单缺少remark, orderNo={}", order.getOrderNo());
-            return Mono.empty();
-        }
-
-        Long memberCardId = null;
-        Integer count = 1;
-
-        try {
-            String[] items = remark.split(";");
-            for (String item : items) {
-                String[] params = item.split(",");
-                for (String param : params) {
-                    String[] keyValue = param.split(":");
-                    if (keyValue.length == 2) {
-                        String key = keyValue[0].trim();
-                        String value = keyValue[1].trim();
-                        if ("会员卡类型ID".equals(key)) {
-                            memberCardId = Long.parseLong(value);
-                        } else if ("数量".equals(key)) {
-                            count = Integer.parseInt(value);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("[PaymentNotify] 解析会员卡购买参数异常, orderNo={}, remark={}", order.getOrderNo(), remark, e);
-            return Mono.empty();
-        }
-
-        if (memberCardId == null) {
-            log.warn("[PaymentNotify] 会员卡购买参数不完整, orderNo={}, remark={}", order.getOrderNo(), remark);
-            return Mono.empty();
-        }
-
-        final Long finalMemberCardId = memberCardId;
-        final int finalCount = count;
-        final Long sourceOrderId = order.getId();
-
-        log.info("[PaymentNotify] 处理会员卡购买: orderNo={}, memberId={}, memberCardId={}, count={}",
-                order.getOrderNo(), memberIdGlob, finalMemberCardId, finalCount);
-
-        return memberCardService.purchaseCard(memberIdGlob, finalMemberCardId, sourceOrderId)
-                .doOnSuccess(record -> log.info("[PaymentNotify] 会员卡购买完成: orderNo={}, memberId={}, memberCardRecordId={}",
-                        order.getOrderNo(), memberIdGlob, record.getMemberCardRecordId()))
-                .doOnError(e -> log.error("[PaymentNotify] 会员卡购买异常, orderNo={}", order.getOrderNo(), e))
-                .onErrorResume(e -> Mono.empty())
-                .then();
-    }
-
-    private Mono<Void> handleStoredCardRecharge(PaymentOrder order) {
-        String remark = order.getRemark();
-        log.info("[PaymentNotify] 开始处理储值卡充值, orderNo={}, memberId={}, orderType={}, remark={}",
-                order.getOrderNo(), order.getMemberId(), order.getOrderType(), remark);
-
-        if (remark == null || remark.isEmpty()) {
-            log.warn("[PaymentNotify] 储值卡充值订单缺少remark, orderNo={}", order.getOrderNo());
-            return Mono.empty();
-        }
-
-        BigDecimal rechargeAmount = null;
-        BigDecimal bonus = null;
-
-        try {
-            String[] params = remark.split("&");
-            for (String param : params) {
-                String[] keyValue = param.split("=");
-                if (keyValue.length == 2) {
-                    String key = keyValue[0];
-                    String value = keyValue[1];
-                    if ("rechargeAmount".equals(key)) {
-                        rechargeAmount = new BigDecimal(value);
-                    } else if ("bonus".equals(key)) {
-                        bonus = new BigDecimal(value);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("[PaymentNotify] 解析充值参数异常, orderNo={}, remark={}", order.getOrderNo(), remark, e);
-            return Mono.empty();
-        }
-
-        if (rechargeAmount == null) {
-            log.warn("[PaymentNotify] 储值卡充值参数不完整, orderNo={}, remark={}", order.getOrderNo(), remark);
-            return Mono.empty();
-        }
-
-        final BigDecimal finalRechargeAmount = rechargeAmount;
-        final BigDecimal finalBonus = bonus != null ? bonus : BigDecimal.ZERO;
-        final BigDecimal totalAddAmount = finalRechargeAmount.add(finalBonus);
-        Long memberId = memberIdGlob;
-        final String orderNo = order.getOrderNo();
-        final BigDecimal payAmount = order.getTransAmt();
-        final LocalDateTime now = LocalDateTime.now();
-
-        log.info("[PaymentNotify] 处理储值卡充值: orderNo={}, memberId={}, rechargeAmount={}, bonus={}, total={}, payAmount={}",
-                orderNo, memberId, finalRechargeAmount, finalBonus, totalAddAmount, payAmount);
-
-        return memberStoredCardRepository.findByMemberId(memberId)
-                .flatMap(card -> {
-                    log.info("[PaymentNotify] 会员 {} 已有储值卡(cardId={})，直接充值", memberId, card.getId());
-                    return doRecharge(memberId, orderNo, finalRechargeAmount, finalBonus, totalAddAmount, payAmount, now);
-                })
-                .switchIfEmpty(Mono.defer(() -> {
-                    log.info("[PaymentNotify] 会员 {} 首次充值，创建储值卡并充值", memberId);
-                    return memberStoredCardRepository.createStoredCard(memberId)
-                            .doOnSuccess(rows -> log.info("[PaymentNotify] 创建储值卡结果: memberId={}, affectedRows={}", memberId, rows))
-                            .then(doRecharge(memberId, orderNo, finalRechargeAmount, finalBonus, totalAddAmount, payAmount, now));
-                }))
-                .doOnError(e -> log.error("[PaymentNotify] 处理储值卡充值异常, orderNo={}", orderNo, e))
-                .onErrorResume(e -> Mono.empty());
-    }
-
-    private Mono<Void> doRecharge(Long memberId, String orderNo, BigDecimal rechargeAmount, BigDecimal bonusAmount,
-                                   BigDecimal totalAmount, BigDecimal payAmount, LocalDateTime now) {
-        log.info("[PaymentNotify] 开始充值: memberId={}, orderNo={}, rechargeAmount={}, bonusAmount={}, totalAmount={}, payAmount={}",
-                memberId, orderNo, rechargeAmount, bonusAmount, totalAmount, payAmount);
-
-        return memberStoredCardRepository.rechargeBalance(memberId, totalAmount)
-                .flatMap(rows -> {
-                    log.info("[PaymentNotify] 充值结果: memberId={}, orderNo={}, affectedRows={}", memberId, orderNo, rows);
-                    if (rows != null && rows > 0) {
-                        log.info("[PaymentNotify] 储值卡余额更新成功: memberId={}, addedAmount={}", memberId, totalAmount);
-                        return memberStoredCardRechargeRepository.createRechargeRecord(
-                                memberId, orderNo, rechargeAmount, bonusAmount, totalAmount, payAmount
-                        ).doOnSuccess(recordRows -> log.info("[PaymentNotify] 创建充值记录结果: orderNo={}, affectedRows={}", orderNo, recordRows))
-                         .then(
-                                memberStoredCardRechargeRepository.markSuccess(orderNo, now)
-                                .doOnSuccess(markRows -> log.info("[PaymentNotify] 标记充值成功结果: orderNo={}, affectedRows={}", orderNo, markRows))
-                         )
-                         .doOnSuccess(r -> {
-                            log.info("[PaymentNotify] 储值卡充值完成: orderNo={}, memberId={}, totalAmount={}", orderNo, memberId, totalAmount);
-                         }).then();
-                    } else {
-                        log.warn("[PaymentNotify] 储值卡余额更新失败(rows=0): memberId={}, orderNo={}", memberId, orderNo);
-                        return memberStoredCardRechargeRepository.createRechargeRecord(
-                                memberId, orderNo, rechargeAmount, bonusAmount, totalAmount, payAmount
-                        ).then(
-                                memberStoredCardRechargeRepository.markFailed(orderNo)
-                        ).then();
-                    }
-                });
-    }
-}

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

@@ -2,9 +2,9 @@ spring:
   cache:
     type: none
   r2dbc:
-    url: r2dbc:postgresql://localhost:5432/manage_system
+    url: r2dbc:postgresql://localhost:55432/manage_system
-    username: postgres
+    username: novalon
-    password: 123456
+    password: novalon123
     pool:
       initial-size: 5
       max-size: 20
@@ -12,9 +12,9 @@ spring:
       max-life-time: 30m
       acquire-timeout: 3s
   flyway:
-    url: jdbc:postgresql://localhost:5432/manage_system
+    url: jdbc:postgresql://localhost:55432/manage_system
-    user: postgres
+    user: novalon
-    password: 123456
+    password: novalon123
     enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
@@ -25,13 +25,6 @@ jwt:
   secret: novalon-gym-manage-jwt-secret-key-for-development-only-2026
   expiration: 86400000
 
-dcloud:
-  univerify:
-    appid: __UNI__52E2F0D
-    appkey: IKsoDGSM9l8pIws9gXtyp4
-    api-secret: ${DCLOUD_API_SECRET:}
-    api-url: https://fc-mp-339e2e1b-0096-4ddd-952d-c4e6b88048e4.next.bspapp.com/getPhoneByUniverify
-
 rate:
   limit:
     limit-for-period: 10000

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

@@ -10,12 +10,3 @@ logging:
   level:
     cn.novalon.manage: INFO
     org.springframework.r2dbc: INFO
-
-dcloud:
-  univerify:
-    appid: ${DCLOUD_APPID:__UNI__52E2F0D}
-    appkey: ${DCLOUD_APPKEY:IKsoDGSM9l8pIws9gXtyp4}
-    api-url: ${DCLOUD_API_URL:https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber}
-    timeout: ${DCLOUD_TIMEOUT:10000}
-    proxy-host: ${DCLOUD_PROXY_HOST:}
-    proxy-port: ${DCLOUD_PROXY_PORT:}

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

@@ -15,9 +15,9 @@ spring:
     exclude:
       - org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
   r2dbc:
-    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
+    url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:postgres}
+    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:123456}
+    password: ${DB_PASSWORD:novalon123}
     pool:
       initial-size: 10
       max-size: 50
@@ -25,9 +25,9 @@ spring:
       max-life-time: 1h
       acquire-timeout: 5s
   datasource:
-    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
+    url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
-    username: ${DB_USERNAME:postgres}
+    username: ${DB_USERNAME:novalon}
-    password: ${DB_PASSWORD:123456}
+    password: ${DB_PASSWORD:novalon123}
     driver-class-name: org.postgresql.Driver
   flyway:
     enabled: false
@@ -104,29 +104,3 @@ alibaba:
       template-code: 100001
       code-length: 6
       code-expire-seconds: 300
-
-dcloud:
-  univerify:
-    appid: __UNI__52E2F0D
-    appkey: IKsoDGSM9l8pIws9gXtyp4
-    api-url: https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber
-
-huifu:
-  mode: prod
-  skill-source: hfps/1.3.0
-  channel:
-    sys-id: 6666000207573586
-    product-id: XLSISV
-    huifu-id: 6666000207573586
-    rsa-private-key: ${HUIFU_CHANNEL_PRIVATE_KEY:MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNUdQE59I4bV1dIgLs2IRN3Wl8KI2yS4KpTUQWrvvlUcBTztB8rIeN5lr6Yv4VsZ1TG0FAb0D80JjxEQ1+0HizYNOQ1h2935v2r8h7rx3VTLbMOkmsg8Lb8LQRTbPaJOZfsIZMzBytYiRzWunHaMlCr800EA3q5NMj9VjHQuamxKqyzyHqfkIjA/sZ8q9atVjn8ahUjPKdrGA8b79HexHhCgOSLdK+fWw0eMCsWWYP2qECLsvZ+tjfvqSBXx1kg7womwT1VBCf+0Dx+jJPKR3mxQfz2szoucJYuXRo55kA6yCwoeNsjanLDRkPBSy3NHdKrffP6YODhRHG6KHyayyNAgMBAAECggEATIR69TEETVNCEzRgOxe9A2AYRoa6ukhSdhMFA/c5IuCR747yqh7MwtNwfVRuWRazpZUDTr0uhfT4asad9QUx5YZO54RX1EAn9XkWZ4nY8G46J/iDfapWLrp09U2KTVpfdn5hKWH3QRX7wI4AON2O49HGnSL4NjAx9q1YpYOe2bqevxmB4uD9vR/FHMjZ2qWzPaL7pId98x4DCJCiZctBQqb7gxR8EseD1Ddn2HbH5DEUjoxz2umtL+zrcGKDFBy4kM3r+10FP5jFG4fJfZFQwrzMTEkXJriau9DMRTQ83rWHzNvhdTNUuyqah74ez5V1piVEOXCPudzFsMttD2DyzQKBgQDokQH3WtcQqwFTUo+uWVVup4NoQzNZpEGIHK17afRsf9YnkoJVqjhywq1dhQT+yuyW9geJJKWpHQIAS4gGudhNK+j6d//bbvvbkOmtsdWyZ6Z2EmY8JrPkHdHAcadNJX7vrIc1xPeyci4AHhErDHc3hhD5njuSLx3DUp4iODNxKwKBgQCbjyHvP90YGjh49DWklh2NJgR2+OR6Fd0afdmwtGKeCUP5l2To6rfLBbcSRIWCON4iLME5wLLdHcm5wAQukC4dsUB5iZffp21+7hrrwUw/G0MUzFudfhZkjsDU5i+FwnVMqmsLJPUsjJTOfKsJdA2DjnwfMcgxw9FeClGveSFNJwKBgQDCpjuDECDY7oeZeYyQXGzIxKOTbEtaR8Qha/83QCM3fHd9f35evK2qP45iq6bWqnkCkMEV4/pTZNf77zvWhU2oqYvBtxYKTwW1a8BphGJbg60rPZMb3TjLQLoB3B4uz6dCaqBwPH8kd7RQnNm5siFF84vZoLozTAQZKtj3wxorKQKBgQCGKnEONHqwaw0B5T7O8VoTfxKiug/07B6C1sCGk03rF/q0rkquSKK0S/2Vl9u+cOXFe+w7r2OVKjfuKRpyPpBHs7T0HiQLFhBuRVaat2DXnN/CdG8f6rvNhwHxnYanSwx4TxN7zShYf/doEEZEJP/y01ViYkFUCpvtC+FgAo0iSQKBgFrkJGxPo6T7i5ZF7VoZWdARnypfbOl4gF9GMrXykk0fnKBDTof9Bg34a8OX54cf4yEH1ifZzVtNyzPTH9FxV88TksWRouqi1Uo6///kJI6gXROspE91TpNtNGHPgLhebA83WlFtS/H7i5G6RO+6KO0uflSImfy3Owp/ChyFUGmn}
-    rsa-public-key: ${HUIFU_CHANNEL_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjVHUBOfSOG1dXSIC7NiETd1pfCiNskuCqU1EFq775VHAU87QfKyHjeZa+mL+FbGdUxtBQG9A/NCY8RENftB4s2DTkNYdvd+b9q/Ie68d1Uy2zDpJrIPC2/C0EU2z2iTmX7CGTMwcrWIkc1rpx2jJQq/NNBAN6uTTI/VYx0LmpsSqss8h6n5CIwP7GfKvWrVY5/GoVIzynaxgPG+/R3sR4QoDki3Svn1sNHjArFlmD9qhAi7L2frY376kgV8dZIO8KJsE9VQQn/tA8foyTykd5sUH89rM6LnCWLl0aOeZAOsgsKHjbI2pyw0ZDwUstzR3Sq33z+mDg4URxuih8mssjQIDAQAB}
-    huifu-public-key: ${HUIFU_CHANNEL_HUIFU_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7PYy64gcO1Y44ntGFRdHzDJy6KnNoMLB6H5ZyCvqB2m2Bvzx18TMCjwevt5A4XF0ke9HfXRvZOL8TOaHdeiSbXWVBEpNsbQr0612U41cN688uHk4ShtoYuvSAbT0SuQULPh90BthzBrxrIuduex7qISk4d4mKvfM+tMTBQPWJc2au2yfTpisZPlKS5jg5xUCxG4UIze/xC4I92rVyVfziMm19Tzh1EXq4Hm1nXmRejgE2o2Hi/wu8Et6hj5UjZzPu3DPvzDN4AP372DP6EREYrVGYiD9qDqxx63jDqlGsdKmENXPp27gUqXX4vGD5xn0lOSXMHUQ5NUcXzdGbpWBBwIDAQAB}
-  merchant:
-    sys-id: 6666000207581039
-    product-id: XLSISV
-    huifu-id: 6666000207581039
-    rsa-private-key: ${HUIFU_MERCHANT_PRIVATE_KEY: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=}
-    rsa-public-key: ${HUIFU_MERCHANT_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnMQMK4WRfos89YMUCjq+I5wtOaGyAR25dA8xznHeAmmg1eyr9TUSSot9yYXQ7FuCRoLtenuUbc6tVc1OVVs+RCoBi+OpmjhcApJ4CVEz/ywtyVX/8LSZmApvMTRPAuxjTSKis2BL1DhH16moKVb1axrEPRacxadqz/YQZh2N8os1cj1/7k/Uvmn+U0cYmiLY90kiRoJaGhDK5yjqW/xB+ycD0ktJYgMk/zcT3zssmR3NtgL2gCDhOcvtDzFAij7iHX6Tq3o9y1aTtQK3NoUoJnQfmCD0ogVWD12ugLgJopfZqW7UopECe1Lu5V+Cck1uEMUNOqzxSpxVlSpM4rwBJQIDAQAB}
-    huifu-public-key: ${HUIFU_MERCHANT_HUIFU_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqolFneAH66z3/3gaIYIaRZOIk/UYzdsXIm0RyawYBYAOu/NJ7ul8CRIrRlt5vd98HodW2yPrXA4+VHF3AS9UE4WTDpo9qV5brhqQSr/lAuZtEwMZwUWwgdnGFMkUFd9RvyGXAqY0bsQrcQgQ6zGjZHzlMljogDR3iblG0ak5ssD2TSC2W+1cxu+id+FP6onZXlXizuClTyIRh17m7CbS6rl0P3M96MlTdCzTeBw/Y54CiegBJI2wOrm2Qa6Dg6KRc+YkaJWjuRJVJkwjk8JhSyALno9oEzuDKaAXlsQlxeIhmAy4esRrZGrMV8SG0gwUZIP8lduPjQE95lCqqJ0gQIDAQAB}
-  notify:
-    url: ${HUIFU_NOTIFY_URL:https://your-domain.com/api/payment/notify/huifu}

gym-manage-api/manage-app/src/main/resources/member-config.yml

@@ -14,10 +14,10 @@ wechat:
     aes-key: ${WECHAT_MP_AESKEY}
     callback-url: ${WECHAT_MP_CALLBACK_URL}
 
-  # 手机号加密配置（AES-128-CBC，16字节密钥和IV，Base64编码）
+  # 手机号加密配置
   phone-encryption:
-    secret-key: ${PHONE_ENCRYPTION_SECRET_KEY:MTIzNDU2Nzg5MDEyMzQ1Ng==}
+    secret-key: ${PHONE_ENCRYPTION_SECRET_KEY}
-    iv: ${PHONE_ENCRYPTION_IV:MTIzNDU2Nzg5MDEyMzQ1Ng==}
+    iv: ${PHONE_ENCRYPTION_IV}
 
 spring:
   elasticsearch:

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

@@ -60,6 +60,10 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,5 +1,8 @@
 package cn.novalon.gym.manage.common.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
@@ -24,13 +27,23 @@ public class RedisConfig {
     public ReactiveRedisTemplate<String, Object> reactiveRedisTemplate(
             ReactiveRedisConnectionFactory connectionFactory) {
         
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        objectMapper.activateDefaultTyping(
+                objectMapper.getPolymorphicTypeValidator(),
+                ObjectMapper.DefaultTyping.NON_FINAL
+        );
+
+        GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer(objectMapper);
+
         // 配置序列化上下文
         RedisSerializationContext<String, Object> serializationContext = 
             RedisSerializationContext.<String, Object>newSerializationContext()
                 .key(StringRedisSerializer.UTF_8)
-                .value(new GenericJackson2JsonRedisSerializer())
+                .value(serializer)
                 .hashKey(StringRedisSerializer.UTF_8)
-                .hashValue(new GenericJackson2JsonRedisSerializer())
+                .hashValue(serializer)
                 .build();
         
         return new ReactiveRedisTemplate<>(connectionFactory, serializationContext);

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

@@ -1,33 +0,0 @@
--- 支付订单表
-CREATE TABLE IF NOT EXISTS payment_order (
-    id BIGSERIAL PRIMARY KEY,
-    order_no VARCHAR(64) NOT NULL UNIQUE,
-    member_id BIGINT,
-    order_type VARCHAR(32),
-    goods_desc VARCHAR(256),
-    trans_amt DECIMAL(12, 2),
-    trade_type VARCHAR(32),
-    pay_status VARCHAR(16) DEFAULT 'PENDING',
-    huifu_id VARCHAR(64),
-    req_seq_id VARCHAR(64),
-    req_date VARCHAR(16),
-    hf_seq_id VARCHAR(64),
-    pay_info TEXT,
-    qr_code TEXT,
-    pay_url TEXT,
-    remark VARCHAR(512),
-    notify_url VARCHAR(512),
-    pay_time TIMESTAMP,
-    expire_time TIMESTAMP,
-    error_code VARCHAR(64),
-    error_msg VARCHAR(512),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    deleted_at TIMESTAMP
-);
-
-CREATE INDEX IF NOT EXISTS idx_payment_order_order_no ON payment_order(order_no);
-CREATE INDEX IF NOT EXISTS idx_payment_order_member_id ON payment_order(member_id);
-CREATE INDEX IF NOT EXISTS idx_payment_order_req_seq_id ON payment_order(req_seq_id);
-CREATE INDEX IF NOT EXISTS idx_payment_order_status ON payment_order(pay_status);
-CREATE INDEX IF NOT EXISTS idx_payment_order_expire_time ON payment_order(expire_time);

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

@@ -1 +0,0 @@
-ALTER TABLE payment_order ADD COLUMN IF NOT EXISTS party_order_id VARCHAR(64);