From 18c4739ce0b9e90fc6797ae9b5cbcec041bc1128 Mon Sep 17 00:00:00 2001
From: Administrator <admin@hyql.xyz>
Date: Mon, 13 Jul 2026 09:01:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=90=8E=E8=B0=83=E7=94=A8=E7=BB=AD=E8=B4=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=88=B0=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MemberServiceImpl.java       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

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 65911fd..f5b6bd1 100644
--- a/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java
+++ b/src/main/java/edu/situ/stlserver/service/impl/MemberServiceImpl.java
@@ -74,21 +74,10 @@ 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());
@@ -98,6 +87,20 @@ public class MemberServiceImpl implements MemberService {
             }
         }
         memberMapper.insert(member);
+
+        // 根据卡类型调用续费设置到期日期
+        String cardType = memberAddDTO.getCardType();
+        Integer days = null;
+        if ("月卡".equals(cardType)) {
+            days = 30;
+        } else if ("季卡".equals(cardType)) {
+            days = 90;
+        } else if ("年卡".equals(cardType)) {
+            days = 365;
+        }
+        if (days != null) {
+            memberMapper.renew(member.getId(), days);
+        }
     }
 
     private String saveAvatar(MultipartFile file) throws Exception {