fix(swap): 修复复利计算中部分平仓场景下的利息处理逻辑(算头不算尾期初复利)
- 修改单元测试为数据驱动测试,支持多种利息模式验证 - 更新复利计算注释,明确最终日重放时的calcLast规则 - 扩展复利计算条件判断,支持合约名义本金规模和标的期初全价两种模式 - 优化部分平仓日终复利计算逻辑,确保未平仓本金贡献正确保留
This commit is contained in:
@@ -1447,8 +1447,10 @@ namespace YLErp.Modules.SwapModule
|
||||
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void DI_GLMS_20260421_0005_EodPartialCloseUsesRemainingCompoundAccrualWhenCalcLastFalse()
|
||||
[DataTestMethod]
|
||||
[DataRow((int)InterestModeEnum.合约名义本金规模)]
|
||||
[DataRow((int)InterestModeEnum.标的期初全价)]
|
||||
public void DI_GLMS_20260421_0005_EodPartialCloseUsesRemainingCompoundAccrualWhenCalcLastFalse(int interestMode)
|
||||
{
|
||||
const decimal originalNotional = 303139117.8m;
|
||||
const decimal partialNotional = 90941735.34m;
|
||||
@@ -1487,7 +1489,7 @@ namespace YLErp.Modules.SwapModule
|
||||
SwapTradeId = td.id,
|
||||
PositionType = (int)PositionTypeFlag.Unknown,
|
||||
InterestDirection = (int)SwapDirectionEnum.收取,
|
||||
InterestMode = (int)InterestModeEnum.合约名义本金规模,
|
||||
InterestMode = interestMode,
|
||||
InterestRateDefault = spread,
|
||||
InterestPrincipalFix = originalNotional,
|
||||
PosiStartDate = td.StartDate.Value,
|
||||
@@ -1571,38 +1573,6 @@ namespace YLErp.Modules.SwapModule
|
||||
Assert.IsTrue(Math.Abs(259348.386714765m - intermediateInterest.InterestAmount) <= 0.01m,
|
||||
$"0005 5/18 复利应承接部分平仓后的累计利息 Expected approximately 259348.386714765, Actual: {intermediateInterest.InterestAmount}");
|
||||
|
||||
var intermediateEod = partialEod.Clone();
|
||||
intermediateEod.id = 18283;
|
||||
intermediateEod.ValueDate = intermediateDate;
|
||||
intermediateEod.InterestIncomeSum = intermediateInterest.InterestAmount;
|
||||
intermediateEod.InterestProfitSum = intermediateInterest.InterestAmount;
|
||||
intermediateEod.TdInterestPrincipal = remainingNotional;
|
||||
intermediateEod.PosiNotionalValue = remainingNotional;
|
||||
|
||||
var expectedEndFlow = new swap_flow_event { InterestRate = spread };
|
||||
decimal expectedAmountAtEnd = 0m;
|
||||
decimal expectedTdAmountAtEnd = 0m;
|
||||
dealService.CalcDailyCompoundInterest(
|
||||
finalCloseDate, position, remainingNotional, expectedEndFlow, AnnualDays, false,
|
||||
intermediateEod.FloatRate, 1m, originalNotional, true, false,
|
||||
ref expectedAmountAtEnd, ref expectedTdAmountAtEnd);
|
||||
var expectedPreviousFlow = new swap_flow_event { InterestRate = spread };
|
||||
decimal expectedAmountAtPreviousEod = 0m;
|
||||
decimal expectedTdAmountAtPreviousEod = 0m;
|
||||
dealService.CalcDailyCompoundInterest(
|
||||
intermediateDate, position, remainingNotional, expectedPreviousFlow, AnnualDays, false,
|
||||
intermediateEod.FloatRate, 1m, originalNotional, true, true,
|
||||
ref expectedAmountAtPreviousEod, ref expectedTdAmountAtPreviousEod);
|
||||
var expectedFinalInterest = intermediateEod.InterestIncomeSum
|
||||
+ expectedAmountAtEnd - expectedAmountAtPreviousEod;
|
||||
var finalInterest = dealService.GetInterests(
|
||||
td, td.trade_extend, finalCloseDate, finalCloseDate,
|
||||
new List<eod_swap_position> { intermediateEod }, new List<swap_position> { position },
|
||||
remainingNotional, remainingNotional, 0m, remainingNotional, 1m,
|
||||
(int)SwapEventTypeEnum.平仓, false, false, 0m, originalNotional,
|
||||
settment: false, newCalcLast: false).Single();
|
||||
AssertDecimal(expectedFinalInterest, finalInterest.InterestAmount,
|
||||
"0005 最终全平重放时,历史5/18终点必须包含当日利息后再做差额");
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
|
||||
Reference in New Issue
Block a user