From e4f92ad848a7244982cd33d524422a82d6df71c6 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 16 Oct 2025 09:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=88=9B=E5=BB=BA=E5=BB=B6?=
 =?UTF-8?q?=E6=9C=9F=E8=AE=B0=E5=BD=95=E6=97=B6=E5=A6=82=E6=9E=9C=E5=B7=B2?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E4=BB=8E=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=AE=A1=E7=AE=97=E5=BB=B6=E6=9C=9F=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/funds/delay/ProductDelayServiceImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java
index a9d71f507..01689ceb0 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/delay/ProductDelayServiceImpl.java
@@ -72,7 +72,7 @@ public class ProductDelayServiceImpl implements ProductDelayService {
         /**
          * 查询是否有前序的延期记录：
          * 1、如果有记录，延期有效期在其记录上叠加
-         * 2、如果没有记录，取购买记录的结束时间作为延期的开始时间
+         * 2、如果没有记录，取购买记录的结束时间作为延期的开始时间，如果结束时间已经过期了，那么从今天开始算
          */
         ProductDelayRecordDO lastDelayRecordDO = productDelayRecordMapper.selectOne(new LambdaQueryWrapper<ProductDelayRecordDO>()
                 .eq(ProductDelayRecordDO::getOrganId, organId)
@@ -82,10 +82,14 @@ public class ProductDelayServiceImpl implements ProductDelayService {
         Integer delayDuration = productDelaySaveReqVO.getDelayDuration();
         Integer delayDurationUnit = productDelaySaveReqVO.getDelayDurationUnit();
         LocalDate endTime;
+        LocalDate now = LocalDate.now();
         if(ObjectUtil.isNotNull(lastDelayRecordDO)) {
             endTime = lastDelayRecordDO.getDelayTime();
         } else {
             endTime = purchaseRecordDO.getEndTime();
+            if (endTime.isBefore(now)) {
+                endTime = now;
+            }
         }
 
         // 计算延期后有效时间