From 299ec26174d400f5c25fc0df45ff4d638a2dbf9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 22 Apr 2025 14:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E6=81=AF=E8=AE=A1=E7=AE=97=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs b/YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs index 96ce7534..048d72a0 100644 --- a/YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapTradeBaseService.cs @@ -388,7 +388,7 @@ namespace YLErp.Modules.SwapModule calcLast = td.trade_extend.ExtendObj.InterestCalcMode.EndsWith("1");//算尾 } interestStart = calcFirst ? interestStart : interestStart.AddDays(1); - if (preSettleDate.HasValue) + if (preSettleDate.HasValue && preSettleDate >= interestStart) { interestStart = preSettleDate.Value; } @@ -396,7 +396,7 @@ namespace YLErp.Modules.SwapModule { interestEnd = interestEnd.AddDays(-1); } - if (interestStart > interestEnd) + if (interestStart > interestEnd || td.StartDate > interestStart) { interestStart = interestEnd; return true;//不记利息