From 4206bd535609a398968d8bb71f91a1120afeffb4 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 22 May 2026 10:26:33 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=88=B0?=
 =?UTF-8?q?=E4=BB=8A=E5=A4=A9=E4=B9=8B=E5=90=8E=E7=9A=84=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SubscriptionPlanServiceImpl.java      | 18 ++++++++++++++----
 src/main/resources/messages_en.properties      |  2 ++
 src/main/resources/messages_zh.properties      |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
index 4ddd7470..6fd30f94 100644
--- a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
@@ -169,7 +169,7 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
     }
 
     /**
-     * 处理结束时间（只能延长）
+     * 处理结束时间，不允许订阅结束时间早于当前时间和订阅开始时间
      */
     private void handlePeriodEnd(UpdateSubscriptionPlanDTO dto, SubscriptionPlan plan) {
         Long newEnd = dto.getCurrentPeriodEnd();
@@ -177,15 +177,25 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
             return;
         }
 
-        if (newEnd < plan.getCurrentPeriodEnd()) {
+        long currentTimeSec = System.currentTimeMillis() / 1000;
+        long startTime = plan.getCurrentPeriodStart();
+
+        // 检查是否早于开始时间（不能等于，否则周期长度为0）
+        if (newEnd <= startTime) {
             throw new BusinessException(
-                    "the.subscription.end.date.can.be.extended.only.not.reduced"
+                    "end.time.cannot.be.earlier.than.or.equal.to.start.time"
+            );
+        }
+
+        // 检查是否早于当前时间（不能等于，否则立即过期）
+        if (newEnd <= currentTimeSec) {
+            throw new BusinessException(
+                    "end.time.cannot.be.earlier.than.or.equal.to.the.current.time"
             );
         }
 
         plan.setCurrentPeriodEnd(newEnd);
     }
-
     /**
      * 处理账号数量
      */
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 3e045acd..cb7e1dac 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -210,6 +210,8 @@ please.specify.the.organizationId=Please specify the organizationId.
 switch.failed.sub-account.not.under.your.active.subscription=Switch failed. Sub-account not under your active subscription.
 Sub-accounts.cannot.be.admins=Sub-accounts in a subscription cannot be designated as admins.
 only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified=Only subscription plans with a PENDING status can have their start time modified.
+end.time.cannot.be.earlier.than.or.equal.to.start.time=End time cannot be earlier than or equal to start time.
+end.time.cannot.be.earlier.than.or.equal.to.the.current.time=End time cannot be earlier than or equal to the current time.
 the.subscription.end.date.can.be.extended.only.not.reduced=The subscription end date can be extended only, not reduced.
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=Total sub-account quota cannot be lower than existing sub-accounts.
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=The credit limit set cannot be lower than the amount of credits already used.
diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties
index f60b9270..98d1c160 100644
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -206,6 +206,8 @@ please.specify.the.organizationId=请指定organizationId
 switch.failed.sub-account.not.under.your.active.subscription=切换失败，该子账号不属于您当前管理的订阅计划
 Sub-accounts.cannot.be.admins=在订阅中的子账号不能被指定为管理员
 only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified=只有PENDING状态的订阅计划可以修改订阅开始时间
+end.time.cannot.be.earlier.than.or.equal.to.start.time=订阅结束时间不能早于或等于开始时间
+end.time.cannot.be.earlier.than.or.equal.to.the.current.time=结束时间不能早于或等于当前时间
 the.subscription.end.date.can.be.extended.only.not.reduced=订阅的到期时间不能缩短，只能延长
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=设置的子账号总数量不能低于现存已添加的子账号数量
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=设置的积分上限不能低于已使用的积分量