From aa17f4e29bf92f5738102c8b09b431c50223189f Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 6 Nov 2025 19:01:16 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=B4=AD=E4=B9=B0=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E6=AD=A3=E5=BC=8F=E4=BC=9A=E5=91=98=E5=AE=8C=E5=96=84?= =?UTF-8?q?=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 | 6 ++++-- 1 file changed, 4 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 c1042e87e..63437704b 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 @@ -485,7 +485,8 @@ public class StoreServiceImpl implements IStoreService { store.setStoreStatus(StoreStatus.FORMAL_USE.getValue()); } // 更新服务到期时间 在原服务时间基础上 往后推 1年 - store.setServiceEndTime(Date.from(store.getServiceEndTime().toInstant().plus(1, ChronoUnit.YEARS))); + Date serviceEndTime = ObjectUtils.isNotEmpty(store.getServiceEndTime()) ? store.getServiceEndTime() : new Date(); + store.setServiceEndTime(Date.from(serviceEndTime.toInstant().plus(12, ChronoUnit.MONTHS))); int count = this.storeMapper.updateById(store); // 更新redis 中的 store信息 this.redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store); @@ -518,7 +519,8 @@ public class StoreServiceImpl implements IStoreService { store.setStoreStatus(StoreStatus.FORMAL_USE.getValue()); } // 更新服务到期时间 在原服务时间基础上 往后推 1年 - store.setServiceEndTime(Date.from(store.getServiceEndTime().toInstant().plus(1, ChronoUnit.YEARS))); + Date serviceEndTime = ObjectUtils.isNotEmpty(store.getServiceEndTime()) ? store.getServiceEndTime() : new Date(); + store.setServiceEndTime(Date.from(serviceEndTime.toInstant().plus(12, ChronoUnit.MONTHS))); // 更新redis 中的 store信息 this.redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store); return this.storeMapper.updateById(store);