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;//不记利息