From 6d07ec2b2b29a46fb4710cb89f2864950e39ad09 Mon Sep 17 00:00:00 2001
From: Administrator <admin@hyql.xyz>
Date: Mon, 13 Jul 2026 08:51:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=97=B6=E9=80=89=E6=8B=A9=E5=8D=A1=E7=B1=BB=E5=9E=8B(?=
 =?UTF-8?q?=E6=9C=88=E5=8D=A1/=E5=AD=A3=E5=8D=A1/=E5=B9=B4=E5=8D=A1/?=
 =?UTF-8?q?=E6=97=A0=E9=99=90=E6=9C=9F)=EF=BC=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=B0=E6=9C=9F=E6=97=A5=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edu/situ/stlserver/model/dto/MemberAddDTO.java  |  2 ++
 .../stlserver/service/impl/MemberServiceImpl.java   | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/situ/stlserver/model/dto/MemberAddDTO.java b/src/main/java/edu/situ/stlserver/model/dto/MemberAddDTO.java
index a2cdf87..eab6c2b 100644
--- a/src/main/java/edu/situ/stlserver/model/dto/MemberAddDTO.java
+++ b/src/main/java/edu/situ/stlserver/model/dto/MemberAddDTO.java
@@ -13,6 +13,8 @@ public class MemberAddDTO {
     private Integer sex;
     private String phone;
     private String level;
+    private String cardType;
+    private Integer price;
     private String remark;
     private MultipartFile file;
 }
diff --git a/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java b/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java
index 9f6397d..65911fd 100644
--- a/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java
+++ b/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java
@@ -74,10 +74,21 @@ public class MemberServiceImpl implements MemberService {
         member.setLevel(memberAddDTO.getLevel());
         member.setRemark(memberAddDTO.getRemark());
         member.setStartDate(DateUtil.today());
-        member.setEndDate(null);
         member.setRemainCount(null);
         member.setTotalSpend(0);
 
+        // 根据卡类型计算到期日期
+        String cardType = memberAddDTO.getCardType();
+        if ("月卡".equals(cardType)) {
+            member.setEndDate(DateUtil.offsetDay(DateUtil.date(), 30).toString().substring(0, 10));
+        } else if ("季卡".equals(cardType)) {
+            member.setEndDate(DateUtil.offsetDay(DateUtil.date(), 90).toString().substring(0, 10));
+        } else if ("年卡".equals(cardType)) {
+            member.setEndDate(DateUtil.offsetDay(DateUtil.date(), 365).toString().substring(0, 10));
+        } else {
+            member.setEndDate(null); // 无限期
+        }
+
         if (memberAddDTO.getFile() != null && !memberAddDTO.getFile().isEmpty()) {
             try {
                 String avatar = saveAvatar(memberAddDTO.getFile());