修复成交日算了利息
This commit is contained in:
@@ -325,7 +325,7 @@ namespace YLErp.Modules.SwapModule
|
||||
/// <param name="interestMode">计息方式</param>
|
||||
/// <param name="interestStart">计息开始日期</param>
|
||||
/// <param name="interestEnd">计息结束日期</param>
|
||||
public bool InitInterestDate(DateTime valueDate, DateTime? preSettleDate, trade td, bool tdClose,bool calcLastNew, out DateTime interestStart, out DateTime interestEnd)
|
||||
public bool InitInterestDate(DateTime valueDate, DateTime? preSettleDate, trade td, bool tdClose, out DateTime interestStart, out DateTime interestEnd)
|
||||
{
|
||||
interestStart = td.StartDate.Value;
|
||||
var exerciseDate = td.ExerciseDate.Value;
|
||||
@@ -343,7 +343,7 @@ namespace YLErp.Modules.SwapModule
|
||||
{
|
||||
interestStart = preSettleDate.Value;
|
||||
}
|
||||
if ((interestEnd == exerciseDate && !calcLast)|| !calcLastNew)
|
||||
if ((interestEnd == exerciseDate && !calcLast))
|
||||
{
|
||||
interestEnd = interestEnd.AddDays(-1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user