From 8aa12977d814a09baa95be1513e08b54a2f45aa2 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 13 Nov 2025 12:39:37 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E6=AD=A3=E5=BC=8F=E7=89=88=E4=BC=9A=E5=91=98=E8=B0=83?=
 =?UTF-8?q?=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
index 3c591bb4d..973c188ce 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
@@ -483,8 +483,8 @@ public class StoreServiceImpl implements IStoreService {
         if (Objects.equals(store.getStoreStatus(), StoreStatus.TRIAL_PERIOD.getValue())) {
             store.setStoreStatus(StoreStatus.FORMAL_USE.getValue());
         }
-        // 更新服务到期时间 在原服务时间基础上 往后推 1年
-        Date serviceEndTime = ObjectUtils.isNotEmpty(store.getServiceEndTime()) ? store.getServiceEndTime() : new Date();
+        // 如果是试用时间 大于 当前时间在，则以试用时间为准 反之则以当前时间为准
+        Date serviceEndTime = Optional.ofNullable(store.getServiceEndTime()).filter(date -> date.after(new Date())).orElse(new Date());
         store.setServiceEndTime(Date.from(serviceEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
                 .plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()));
         int count = this.storeMapper.updateById(store);