新增会员卡管理

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

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

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

@@ -46,7 +46,7 @@ public interface MemberCardRepository extends R2dbcRepository<MemberCard, Long>
             "AND (:type IS NULL OR member_card_type = :type) " +
             "AND (:minPrice IS NULL OR member_card_price >= :minPrice) " +
             "AND (:maxPrice IS NULL OR member_card_price <= :maxPrice) " +
-            "ORDER BY created_at DESC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
+            "ORDER BY id ASC LIMIT :#{#pageable.pageSize} OFFSET :#{#pageable.offset}")
     Flux<MemberCard> findWithConditions(Integer status, String name, String type,
                                         Double minPrice, Double maxPrice, Pageable pageable);
 

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

@@ -257,8 +257,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)

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

@@ -0,0 +1,22 @@
+-- ============================================
+-- V30: 新增会员卡管理菜单
+-- 描述: 为会员卡管理功能创建菜单项
+-- ============================================
+
+-- 会员卡管理一级菜单（目录）
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, menu_type, perms, component, status, created_at, updated_at) VALUES
+(502, '会员卡管理', 0, 6, 'M', NULL, NULL, 1, NOW(), NOW());
+
+-- 会员卡管理子菜单（页面）
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, menu_type, perms, component, status, created_at, updated_at) VALUES
+(503, '会员卡管理', 502, 1, 'C', 'business:memberCard:list', 'member/card/index', 1, NOW(), NOW());
+
+-- 会员卡管理按钮权限
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, menu_type, perms, component, status, created_at, updated_at) VALUES
+(5031, '会员卡查询', 503, 1, 'F', 'business:memberCard:query', NULL, 1, NOW(), NOW()),
+(5032, '会员卡新增', 503, 2, 'F', 'business:memberCard:add', NULL, 1, NOW(), NOW()),
+(5033, '会员卡修改', 503, 3, 'F', 'business:memberCard:edit', NULL, 1, NOW(), NOW()),
+(5034, '会员卡删除', 503, 4, 'F', 'business:memberCard:remove', NULL, 1, NOW(), NOW());
+
+-- 重置菜单序列
+SELECT setval('sys_menu_id_seq', (SELECT COALESCE(MAX(id), 1) FROM sys_menu));