From 7c08c685d0c2b79f7196eda861229af1c9cbd099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=B6=E8=88=9F=E5=B9=B4?= <3147056268@qq.com> Date: Wed, 27 May 2026 16:51:05 +0800 Subject: [PATCH] =?UTF-8?q?membercard=E4=B8=8Emember-reguster=E5=90=88?= =?UTF-8?q?=E5=B9=B6=EF=BC=8C=E8=83=BD=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=92=8C=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/dto/CreateMemberCardRequest.java | 61 ++++++++++++++ .../member/dto/PurchaseCardRequest.java | 32 ++++++++ .../manage/member/dto/RefundCardRequest.java | 21 +++++ .../manage/member/dto/RenewCardRequest.java | 35 ++++++++ .../member/dto/UpdateMemberCardRequest.java | 60 ++++++++++++++ .../gym/manage/member/dto/UseCardRequest.java | 23 ++++++ .../member/{card => }/entity/MemberCard.java | 3 +- .../{card => }/entity/MemberCardRecord.java | 5 +- .../entity/MemberCardTransaction.java | 3 +- .../{card => }/entity/RefundApplication.java | 5 +- .../member/{card => }/enums/BizType.java | 2 +- .../member/{card => }/enums/CardEvent.java | 2 +- .../enums/MemberCardRecordStatus.java | 2 +- .../{card => }/enums/MemberCardType.java | 2 +- .../member/{card => }/enums/RefundStatus.java | 2 +- .../{card => }/enums/TransactionType.java | 2 +- .../handler/DistributedLockService.java | 2 +- .../handler/ExpirationReminderService.java | 4 +- .../{card => }/handler/MemberCardHandler.java | 7 +- .../handler/MemberCardRecordHandler.java | 8 +- .../handler/MemberCardScheduledHandler.java | 8 +- .../handler/MemberCardStateMachine.java | 8 +- .../handler/MemberCardTransactionHandler.java | 8 +- .../{card => }/handler/RefundSagaHandler.java | 16 ++-- .../MemberCardRecordRepository.java | 4 +- .../repository/MemberCardRepository.java | 4 +- .../MemberCardTransactionRepository.java | 4 +- .../RefundApplicationRepository.java | 4 +- .../service/IMemberCardRecordService.java | 4 +- .../service/IMemberCardService.java | 6 +- .../IMemberCardTransactionService.java | 6 +- .../service/IRefundApplicationService.java | 4 +- .../impl/MemberCardRecordServiceImpl.java | 8 +- .../service/impl/MemberCardServiceImpl.java | 32 ++++---- .../MemberCardTransactionServiceImpl.java | 10 +-- .../impl/RefundApplicationServiceImpl.java | 10 +-- .../{card => }/util/BeanConvertUtil.java | 2 +- .../manage/member/vo/MemberCardRecordVO.java | 71 ++++++++++++++++ .../member/vo/MemberCardTransactionVO.java | 81 +++++++++++++++++++ .../gym/manage/member/vo/MemberCardVO.java | 77 ++++++++++++++++++ .../manage/member/vo/RefundApplicationVO.java | 77 ++++++++++++++++++ .../gym/manage/app/config/SystemRouter.java | 6 +- 42 files changed, 631 insertions(+), 100 deletions(-) create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/CreateMemberCardRequest.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/PurchaseCardRequest.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RefundCardRequest.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RenewCardRequest.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UpdateMemberCardRequest.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UseCardRequest.java rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/entity/MemberCard.java (93%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/entity/MemberCardRecord.java (90%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/entity/MemberCardTransaction.java (94%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/entity/RefundApplication.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/BizType.java (87%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/CardEvent.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/MemberCardRecordStatus.java (88%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/MemberCardType.java (87%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/RefundStatus.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/enums/TransactionType.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/DistributedLockService.java (96%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/ExpirationReminderService.java (98%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/MemberCardHandler.java (96%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/MemberCardRecordHandler.java (95%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/MemberCardScheduledHandler.java (92%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/MemberCardStateMachine.java (93%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/MemberCardTransactionHandler.java (96%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/handler/RefundSagaHandler.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/repository/MemberCardRecordRepository.java (97%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/repository/MemberCardRepository.java (97%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/repository/MemberCardTransactionRepository.java (97%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/repository/RefundApplicationRepository.java (93%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/IMemberCardRecordService.java (89%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/IMemberCardService.java (88%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/IMemberCardTransactionService.java (93%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/IRefundApplicationService.java (84%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/impl/MemberCardRecordServiceImpl.java (90%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/impl/MemberCardServiceImpl.java (93%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/impl/MemberCardTransactionServiceImpl.java (92%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/service/impl/RefundApplicationServiceImpl.java (91%) rename gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/{card => }/util/BeanConvertUtil.java (96%) create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardRecordVO.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardTransactionVO.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardVO.java create mode 100644 gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/RefundApplicationVO.java diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/CreateMemberCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/CreateMemberCardRequest.java new file mode 100644 index 0000000..6acb34d --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/CreateMemberCardRequest.java @@ -0,0 +1,61 @@ +package cn.novalon.gym.manage.member.dto +; + +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 创建会员卡类型请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class CreateMemberCardRequest { + + /** + * 会员卡名称 + */ + @NotBlank(message = "会员卡名称不能为空") + private String memberCardName; + + /** + * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡 + */ + @NotBlank(message = "会员卡类型不能为空") + private String memberCardType; + + /** + * 会员卡价格 + */ + @NotNull(message = "会员卡价格不能为空") + private BigDecimal memberCardPrice; + + /** + * 有效天数（时长卡用） + */ + private Integer memberCardValidityDays; + + /** + * 总次数（次卡用） + */ + private Integer memberCardTotalTimes; + + /** + * 面额（储值卡用） + */ + private BigDecimal memberCardAmount; + + /** + * 状态：0-下架, 1-上架 + */ + private Integer memberCardStatus = 1; + + /** + * 扩展配置（JSON格式） + */ + private String extraConfig; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/PurchaseCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/PurchaseCardRequest.java new file mode 100644 index 0000000..fe6bdc6 --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/PurchaseCardRequest.java @@ -0,0 +1,32 @@ +package cn.novalon.gym.manage.member.dto; + +import lombok.Data; + +import jakarta.validation.constraints.NotNull; + +/** + * 购买会员卡请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class PurchaseCardRequest { + + /** + * 会员ID + */ + @NotNull(message = "会员ID不能为空") + private Long memberId; + + /** + * 会员卡类型ID + */ + @NotNull(message = "会员卡类型ID不能为空") + private Long memberCardId; + + /** + * 来源订单ID + */ + private Long sourceOrderId; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RefundCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RefundCardRequest.java new file mode 100644 index 0000000..93a2045 --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RefundCardRequest.java @@ -0,0 +1,21 @@ +package cn.novalon.gym.manage.member.dto; + +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; + +/** + * 退款申请请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class RefundCardRequest { + + /** + * 退款原因 + */ + @NotBlank(message = "退款原因不能为空") + private String reason; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RenewCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RenewCardRequest.java new file mode 100644 index 0000000..a56479b --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/RenewCardRequest.java @@ -0,0 +1,35 @@ +package cn.novalon.gym.manage.member.dto; + +import lombok.Data; + +import jakarta.validation.constraints.NotNull; + +/** + * 续费会员卡请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class RenewCardRequest { + + /** + * 增加的次数 + */ + private Integer addTimes; + + /** + * 增加的金额 + */ + private Double addAmount; + + /** + * 增加的天数 + */ + private Integer addDays; + + /** + * 来源订单ID + */ + private Long sourceOrderId; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UpdateMemberCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UpdateMemberCardRequest.java new file mode 100644 index 0000000..dc39d7f --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UpdateMemberCardRequest.java @@ -0,0 +1,60 @@ +package cn.novalon.gym.manage.member.dto; + +import lombok.Data; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 更新会员卡类型请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class UpdateMemberCardRequest { + + /** + * 会员卡名称 + */ + @NotBlank(message = "会员卡名称不能为空") + private String memberCardName; + + /** + * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡 + */ + @NotBlank(message = "会员卡类型不能为空") + private String memberCardType; + + /** + * 会员卡价格 + */ + @NotNull(message = "会员卡价格不能为空") + private BigDecimal memberCardPrice; + + /** + * 有效天数（时长卡用） + */ + private Integer memberCardValidityDays; + + /** + * 总次数（次卡用） + */ + private Integer memberCardTotalTimes; + + /** + * 面额（储值卡用） + */ + private BigDecimal memberCardAmount; + + /** + * 状态：0-下架, 1-上架 + */ + private Integer memberCardStatus; + + /** + * 扩展配置（JSON格式） + */ + private String extraConfig; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UseCardRequest.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UseCardRequest.java new file mode 100644 index 0000000..33df8dc --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/dto/UseCardRequest.java @@ -0,0 +1,23 @@ +package cn.novalon.gym.manage.member.dto; + +import lombok.Data; + +/** + * 使用会员卡请求 DTO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +public class UseCardRequest { + + /** + * 扣减的次数 + */ + private Integer deductTimes; + + /** + * 扣减的金额 + */ + private Double deductAmount; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCard.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCard.java similarity index 93% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCard.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCard.java index 684d401..6d2bd40 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCard.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCard.java @@ -1,6 +1,5 @@ -package cn.novalon.gym.manage.member.card.entity; +package cn.novalon.gym.manage.member.entity; -import cn.novalon.gym.manage.member.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardRecord.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardRecord.java similarity index 90% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardRecord.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardRecord.java index 98d5e4b..06d00f3 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardRecord.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardRecord.java @@ -1,7 +1,6 @@ -package cn.novalon.gym.manage.member.card.entity; +package cn.novalon.gym.manage.member.entity; -import cn.novalon.gym.manage.member.card.enums.MemberCardRecordStatus; -import cn.novalon.gym.manage.member.entity.BaseEntity; +import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardTransaction.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardTransaction.java similarity index 94% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardTransaction.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardTransaction.java index 29abd08..debc15a 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/MemberCardTransaction.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/MemberCardTransaction.java @@ -1,6 +1,5 @@ -package cn.novalon.gym.manage.member.card.entity; +package cn.novalon.gym.manage.member.entity; -import cn.novalon.gym.manage.member.entity.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/RefundApplication.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/RefundApplication.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/RefundApplication.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/RefundApplication.java index 88547bc..74c9e83 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/entity/RefundApplication.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/entity/RefundApplication.java @@ -1,7 +1,6 @@ -package cn.novalon.gym.manage.member.card.entity; +package cn.novalon.gym.manage.member.entity; -import cn.novalon.gym.manage.member.card.enums.RefundStatus; -import cn.novalon.gym.manage.member.entity.BaseEntity; +import cn.novalon.gym.manage.member.enums.RefundStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/BizType.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/BizType.java similarity index 87% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/BizType.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/BizType.java index b53f839..492891f 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/BizType.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/BizType.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 会员卡流水关联业务类型枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/CardEvent.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/CardEvent.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/CardEvent.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/CardEvent.java index db3f8ee..dcf94cc 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/CardEvent.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/CardEvent.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 会员卡状态机事件枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardRecordStatus.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardRecordStatus.java similarity index 88% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardRecordStatus.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardRecordStatus.java index fe27fe7..91bf7df 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardRecordStatus.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardRecordStatus.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 会员卡记录状态枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardType.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardType.java similarity index 87% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardType.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardType.java index 207d1ff..7cf18e6 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/MemberCardType.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/MemberCardType.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 会员卡类型枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/RefundStatus.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/RefundStatus.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/RefundStatus.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/RefundStatus.java index c350f31..dbd56ea 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/RefundStatus.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/RefundStatus.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 退款申请状态枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/TransactionType.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/TransactionType.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/TransactionType.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/TransactionType.java index 5ae8c94..7345b80 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/enums/TransactionType.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/enums/TransactionType.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.enums; +package cn.novalon.gym.manage.member.enums; /** * 会员卡流水操作类型枚举 diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/DistributedLockService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/DistributedLockService.java similarity index 96% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/DistributedLockService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/DistributedLockService.java index c7098af..3fc995e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/DistributedLockService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/DistributedLockService.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/ExpirationReminderService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/ExpirationReminderService.java similarity index 98% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/ExpirationReminderService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/ExpirationReminderService.java index c063de9..ef6cead 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/ExpirationReminderService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/ExpirationReminderService.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardHandler.java similarity index 96% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardHandler.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardHandler.java index b697999..9d052e2 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardHandler.java @@ -1,8 +1,7 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCard; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.service.IMemberCardService; +import cn.novalon.gym.manage.member.entity.MemberCard; +import cn.novalon.gym.manage.member.service.IMemberCardService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardRecordHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardRecordHandler.java similarity index 95% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardRecordHandler.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardRecordHandler.java index 7928a7c..6d5b091 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardRecordHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardRecordHandler.java @@ -1,8 +1,8 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.service.IMemberCardRecordService; -import cn.novalon.gym.manage.member.card.service.IMemberCardService; +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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardScheduledHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardScheduledHandler.java similarity index 92% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardScheduledHandler.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardScheduledHandler.java index 0c4181f..047afc3 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardScheduledHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardScheduledHandler.java @@ -1,9 +1,7 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.enums.CardEvent; -import cn.novalon.gym.manage.member.card.enums.MemberCardRecordStatus; -import cn.novalon.gym.manage.member.card.repository.MemberCardRecordRepository; +import cn.novalon.gym.manage.member.enums.CardEvent; +import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardStateMachine.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardStateMachine.java similarity index 93% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardStateMachine.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardStateMachine.java index 94c8738..3547a80 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardStateMachine.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardStateMachine.java @@ -1,8 +1,8 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.enums.CardEvent; -import cn.novalon.gym.manage.member.card.enums.MemberCardRecordStatus; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.enums.CardEvent; +import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardTransactionHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardTransactionHandler.java similarity index 96% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardTransactionHandler.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardTransactionHandler.java index 771248a..23f964e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/MemberCardTransactionHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/MemberCardTransactionHandler.java @@ -1,9 +1,9 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; import cn.hutool.db.PageResult; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; -import cn.novalon.gym.manage.member.card.enums.TransactionType; -import cn.novalon.gym.manage.member.card.service.IMemberCardTransactionService; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.enums.TransactionType; +import cn.novalon.gym.manage.member.service.IMemberCardTransactionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Validator; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/RefundSagaHandler.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/RefundSagaHandler.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/RefundSagaHandler.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/RefundSagaHandler.java index fd42204..de914c7 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/handler/RefundSagaHandler.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/handler/RefundSagaHandler.java @@ -1,12 +1,12 @@ -package cn.novalon.gym.manage.member.card.handler; +package cn.novalon.gym.manage.member.handler; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; -import cn.novalon.gym.manage.member.card.enums.CardEvent; -import cn.novalon.gym.manage.member.card.enums.MemberCardRecordStatus; -import cn.novalon.gym.manage.member.card.enums.TransactionType; -import cn.novalon.gym.manage.member.card.repository.MemberCardRecordRepository; -import cn.novalon.gym.manage.member.card.service.IMemberCardTransactionService; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.enums.CardEvent; +import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus; +import cn.novalon.gym.manage.member.enums.TransactionType; +import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; +import cn.novalon.gym.manage.member.service.IMemberCardTransactionService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRecordRepository.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRecordRepository.java similarity index 97% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRecordRepository.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRecordRepository.java index b18f53c..b3ce72e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRecordRepository.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRecordRepository.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.repository; +package cn.novalon.gym.manage.member.repository; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; import org.springframework.data.domain.Pageable; import org.springframework.data.r2dbc.repository.Modifying; import org.springframework.data.r2dbc.repository.Query; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRepository.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRepository.java similarity index 97% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRepository.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRepository.java index c45dd9e..b3820ae 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardRepository.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardRepository.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.repository; +package cn.novalon.gym.manage.member.repository; -import cn.novalon.gym.manage.member.card.entity.MemberCard; +import cn.novalon.gym.manage.member.entity.MemberCard; import org.springframework.data.domain.Pageable; import org.springframework.data.r2dbc.repository.Modifying; import org.springframework.data.r2dbc.repository.Query; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardTransactionRepository.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardTransactionRepository.java similarity index 97% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardTransactionRepository.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardTransactionRepository.java index 7f33e53..8f9d040 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/MemberCardTransactionRepository.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/MemberCardTransactionRepository.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.repository; +package cn.novalon.gym.manage.member.repository; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; import org.springframework.data.domain.Pageable; import org.springframework.data.r2dbc.repository.Modifying; import org.springframework.data.r2dbc.repository.Query; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/RefundApplicationRepository.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/RefundApplicationRepository.java similarity index 93% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/RefundApplicationRepository.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/RefundApplicationRepository.java index ae9f288..5c4e4c1 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/repository/RefundApplicationRepository.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/repository/RefundApplicationRepository.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.repository; +package cn.novalon.gym.manage.member.repository; -import cn.novalon.gym.manage.member.card.entity.RefundApplication; +import cn.novalon.gym.manage.member.entity.RefundApplication; import org.springframework.data.r2dbc.repository.Query; import org.springframework.data.r2dbc.repository.R2dbcRepository; import org.springframework.stereotype.Repository; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardRecordService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardRecordService.java similarity index 89% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardRecordService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardRecordService.java index 32348f5..52eb9fc 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardRecordService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardRecordService.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.service; +package cn.novalon.gym.manage.member.service; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; import org.springframework.data.domain.Pageable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardService.java similarity index 88% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardService.java index ec5a3c3..14517b4 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardService.java @@ -1,7 +1,7 @@ -package cn.novalon.gym.manage.member.card.service; +package cn.novalon.gym.manage.member.service; -import cn.novalon.gym.manage.member.card.entity.MemberCard; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCard; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; import org.springframework.data.domain.Pageable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardTransactionService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardTransactionService.java similarity index 93% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardTransactionService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardTransactionService.java index 516b393..fd7ac94 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IMemberCardTransactionService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IMemberCardTransactionService.java @@ -1,7 +1,7 @@ -package cn.novalon.gym.manage.member.card.service; +package cn.novalon.gym.manage.member.service; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; -import cn.novalon.gym.manage.member.card.enums.TransactionType; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.enums.TransactionType; import org.springframework.data.domain.Pageable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IRefundApplicationService.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IRefundApplicationService.java similarity index 84% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IRefundApplicationService.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IRefundApplicationService.java index 669a42b..0c77335 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/IRefundApplicationService.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/IRefundApplicationService.java @@ -1,6 +1,6 @@ -package cn.novalon.gym.manage.member.card.service; +package cn.novalon.gym.manage.member.service; -import cn.novalon.gym.manage.member.card.entity.RefundApplication; +import cn.novalon.gym.manage.member.entity.RefundApplication; import reactor.core.publisher.Mono; /** diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardRecordServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java similarity index 90% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardRecordServiceImpl.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java index 874a342..ce477f2 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardRecordServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java @@ -1,8 +1,8 @@ -package cn.novalon.gym.manage.member.card.service.impl; +package cn.novalon.gym.manage.member.service.impl; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.repository.MemberCardRecordRepository; -import cn.novalon.gym.manage.member.card.service.IMemberCardRecordService; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; +import cn.novalon.gym.manage.member.service.IMemberCardRecordService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java similarity index 93% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardServiceImpl.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java index 939704d..e7831ea 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java @@ -1,20 +1,20 @@ -package cn.novalon.gym.manage.member.card.service.impl; +package cn.novalon.gym.manage.member.service.impl; -import cn.novalon.gym.manage.member.card.entity.MemberCard; -import cn.novalon.gym.manage.member.card.entity.MemberCardRecord; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; -import cn.novalon.gym.manage.member.card.enums.CardEvent; -import cn.novalon.gym.manage.member.card.enums.MemberCardRecordStatus; -import cn.novalon.gym.manage.member.card.enums.MemberCardType; -import cn.novalon.gym.manage.member.card.enums.TransactionType; -import cn.novalon.gym.manage.member.card.handler.DistributedLockService; -import cn.novalon.gym.manage.member.card.handler.ExpirationReminderService; -import cn.novalon.gym.manage.member.card.handler.MemberCardStateMachine; -import cn.novalon.gym.manage.member.card.handler.RefundSagaHandler; -import cn.novalon.gym.manage.member.card.repository.MemberCardRecordRepository; -import cn.novalon.gym.manage.member.card.repository.MemberCardRepository; -import cn.novalon.gym.manage.member.card.service.IMemberCardService; -import cn.novalon.gym.manage.member.card.service.IMemberCardTransactionService; +import cn.novalon.gym.manage.member.entity.MemberCard; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.enums.CardEvent; +import cn.novalon.gym.manage.member.enums.MemberCardRecordStatus; +import cn.novalon.gym.manage.member.enums.MemberCardType; +import cn.novalon.gym.manage.member.enums.TransactionType; +import cn.novalon.gym.manage.member.handler.DistributedLockService; +import cn.novalon.gym.manage.member.handler.ExpirationReminderService; +import cn.novalon.gym.manage.member.handler.MemberCardStateMachine; +import cn.novalon.gym.manage.member.handler.RefundSagaHandler; +import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; +import cn.novalon.gym.manage.member.repository.MemberCardRepository; +import cn.novalon.gym.manage.member.service.IMemberCardService; +import cn.novalon.gym.manage.member.service.IMemberCardTransactionService; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardTransactionServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardTransactionServiceImpl.java similarity index 92% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardTransactionServiceImpl.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardTransactionServiceImpl.java index 6b5bc21..987ed5a 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/MemberCardTransactionServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardTransactionServiceImpl.java @@ -1,9 +1,9 @@ -package cn.novalon.gym.manage.member.card.service.impl; +package cn.novalon.gym.manage.member.service.impl; -import cn.novalon.gym.manage.member.card.entity.MemberCardTransaction; -import cn.novalon.gym.manage.member.card.enums.TransactionType; -import cn.novalon.gym.manage.member.card.repository.MemberCardTransactionRepository; -import cn.novalon.gym.manage.member.card.service.IMemberCardTransactionService; +import cn.novalon.gym.manage.member.entity.MemberCardTransaction; +import cn.novalon.gym.manage.member.enums.TransactionType; +import cn.novalon.gym.manage.member.repository.MemberCardTransactionRepository; +import cn.novalon.gym.manage.member.service.IMemberCardTransactionService; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/RefundApplicationServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java similarity index 91% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/RefundApplicationServiceImpl.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java index 48fb6ae..7097f3e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/service/impl/RefundApplicationServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java @@ -1,9 +1,9 @@ -package cn.novalon.gym.manage.member.card.service.impl; +package cn.novalon.gym.manage.member.service.impl; -import cn.novalon.gym.manage.member.card.entity.RefundApplication; -import cn.novalon.gym.manage.member.card.enums.RefundStatus; -import cn.novalon.gym.manage.member.card.repository.RefundApplicationRepository; -import cn.novalon.gym.manage.member.card.service.IRefundApplicationService; +import cn.novalon.gym.manage.member.entity.RefundApplication; +import cn.novalon.gym.manage.member.enums.RefundStatus; +import cn.novalon.gym.manage.member.repository.RefundApplicationRepository; +import cn.novalon.gym.manage.member.service.IRefundApplicationService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/util/BeanConvertUtil.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/BeanConvertUtil.java similarity index 96% rename from gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/util/BeanConvertUtil.java rename to gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/BeanConvertUtil.java index 493fa85..19d780e 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/card/util/BeanConvertUtil.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/BeanConvertUtil.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.card.util; +package cn.novalon.gym.manage.member.util; import cn.hutool.core.bean.BeanUtil; import org.springframework.stereotype.Component; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardRecordVO.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardRecordVO.java new file mode 100644 index 0000000..db4aed9 --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardRecordVO.java @@ -0,0 +1,71 @@ +package cn.novalon.gym.manage.member.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * 会员卡记录响应 VO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MemberCardRecordVO { + + /** + * 会员卡记录ID + */ + private Long memberCardRecordId; + + /** + * 会员ID + */ + private Long memberId; + + /** + * 会员卡类型ID + */ + private Long memberCardId; + + /** + * 会员卡名称 + */ + private String memberCardName; + + /** + * 状态：ACTIVE-有效, USED_UP-用完, EXPIRED-过期, REFUNDED-已退款 + */ + private String status; + + /** + * 剩余次数 + */ + private Integer remainingTimes; + + /** + * 剩余金额 + */ + private Double remainingAmount; + + /** + * 到期时间 + */ + private LocalDateTime expireTime; + + /** + * 购买时间 + */ + private LocalDateTime purchaseTime; + + /** + * 创建时间 + */ + private LocalDateTime createdAt; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardTransactionVO.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardTransactionVO.java new file mode 100644 index 0000000..50d4038 --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardTransactionVO.java @@ -0,0 +1,81 @@ +package cn.novalon.gym.manage.member.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * 会员卡交易流水响应 VO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MemberCardTransactionVO { + + /** + * 交易ID + */ + private Long id; + + /** + * 会员卡记录ID + */ + private Long memberCardRecordId; + + /** + * 会员ID + */ + private Long memberId; + + /** + * 会员卡类型ID + */ + private Long memberCardId; + + /** + * 操作类型：PURCHASE-购买, DEDUCT-扣次/扣费, RENEW-续费, REFUND-退款, EXPIRE-过期 + */ + private String operationType; + + /** + * 变动次数 + */ + private Integer changeAmount; + + /** + * 变动金额 + */ + private Double changeBalance; + + /** + * 变动后剩余次数 + */ + private Integer afterRemainingCount; + + /** + * 变动后剩余金额 + */ + private Double afterRemainingBalance; + + /** + * 关联业务类型 + */ + private String relatedBizType; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private LocalDateTime createdAt; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardVO.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardVO.java new file mode 100644 index 0000000..6165bf0 --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/MemberCardVO.java @@ -0,0 +1,77 @@ +package cn.novalon.gym.manage.member.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 会员卡类型响应 VO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MemberCardVO { + + /** + * 会员卡ID + */ + private Long memberCardId; + + /** + * 会员卡名称 + */ + private String memberCardName; + + /** + * 会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡 + */ + private String memberCardType; + + /** + * 会员卡价格 + */ + private BigDecimal memberCardPrice; + + /** + * 有效天数（时长卡用） + */ + private Integer memberCardValidityDays; + + /** + * 总次数（次卡用） + */ + private Integer memberCardTotalTimes; + + /** + * 面额（储值卡用） + */ + private BigDecimal memberCardAmount; + + /** + * 状态：0-下架, 1-上架 + */ + private Integer memberCardStatus; + + /** + * 扩展配置（JSON格式） + */ + private String extraConfig; + + /** + * 创建时间 + */ + private LocalDateTime createdAt; + + /** + * 更新时间 + */ + private LocalDateTime updatedAt; +} diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/RefundApplicationVO.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/RefundApplicationVO.java new file mode 100644 index 0000000..9f6d99c --- /dev/null +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/vo/RefundApplicationVO.java @@ -0,0 +1,77 @@ +package cn.novalon.gym.manage.member.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 退款申请响应 VO + * + * @author 付嘉 + * @date 2026-05-27 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RefundApplicationVO { + + /** + * 申请ID + */ + private Long id; + + /** + * 会员卡记录ID + */ + private Long recordId; + + /** + * 会员ID + */ + private Long memberId; + + /** + * 状态：PENDING-待审核, APPROVED-已批准, REJECTED-已拒绝, PROCESSING-处理中, SUCCESS-成功, FAILED-失败 + */ + private String status; + + /** + * 退款原因 + */ + private String reason; + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 审核时间 + */ + private LocalDateTime auditTime; + + /** + * 审核人ID + */ + private Long auditorId; + + /** + * 审核备注 + */ + private String auditRemark; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 创建时间 + */ + private LocalDateTime createdAt; +} diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java index 5df39d9..996c1d1 100644 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java @@ -2,9 +2,9 @@ package cn.novalon.gym.manage.app.config; import cn.novalon.gym.manage.file.handler.SysFileHandler; -import cn.novalon.gym.manage.member.card.handler.MemberCardHandler; -import cn.novalon.gym.manage.member.card.handler.MemberCardRecordHandler; -import cn.novalon.gym.manage.member.card.handler.MemberCardTransactionHandler; +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.WechatAuthHandler; import cn.novalon.gym.manage.notify.handler.SysNoticeHandler;