利息计算修复

2025-04-22 14:39:17 +08:00
parent cbfad5c86a
commit 299ec26174
1 changed files with 2 additions and 2 deletions
@@ -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;//不记利息