From 505491dd2699ca5bfe8334a15499a081bfd26dce Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 6 Nov 2025 19:07:09 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9ABUG=E4=BF=AE=E5=A4=8D=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  | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 63437704b..3c591bb4d 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
@@ -43,7 +43,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -486,7 +485,8 @@ public class StoreServiceImpl implements IStoreService {
         }
         // 更新服务到期时间 在原服务时间基础上 往后推 1年
         Date serviceEndTime = ObjectUtils.isNotEmpty(store.getServiceEndTime()) ? store.getServiceEndTime() : new Date();
-        store.setServiceEndTime(Date.from(serviceEndTime.toInstant().plus(12, ChronoUnit.MONTHS)));
+        store.setServiceEndTime(Date.from(serviceEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
+                .plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()));
         int count = this.storeMapper.updateById(store);
         // 更新redis 中的 store信息
         this.redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store);
@@ -520,7 +520,8 @@ public class StoreServiceImpl implements IStoreService {
         }
         // 更新服务到期时间 在原服务时间基础上 往后推 1年
         Date serviceEndTime = ObjectUtils.isNotEmpty(store.getServiceEndTime()) ? store.getServiceEndTime() : new Date();
-        store.setServiceEndTime(Date.from(serviceEndTime.toInstant().plus(12, ChronoUnit.MONTHS)));
+        store.setServiceEndTime(Date.from(serviceEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
+                .plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()));
         // 更新redis 中的 store信息
         this.redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store);
         return this.storeMapper.updateById(store);