Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(swap)+test: 删 GetInterests/CalcSwapInterests 死参数 needPrice/grossPrice；补工厂→接缝映射钉子

Browse Source 
死参数收口（另一半）：
- SwapDealService.GetInterests 删 needPrice/grossPrice（体内零消费，2026-08 验证）；
  InitSwapDealInterest.needPrice 同为死参数一并删
- SwapEodPositionService.CalcSwapInterests 签名+转发同步；两个 EOD 生产调用点
  (SaveAutoEodInterestPosition/SaveEodInterestPositionCopy) 重排实参；
  CalcEodPostCloseSettleInterests/GetIntradayUnwindInterests 委托同步
- 14 个测试文件 ~44 处直调点机械更新（8 处 override 签名 + 36 处调用实参）
- 注意：EOD 编排链(DealInterests→Save*家族)的 grossPrice(期初不含费价)有真实用途，保留未动

新增钉子：CalcEodPostCloseSettleInterests 工厂→接缝参数映射测试——
CalcSwapInterestsCapture 捕获 stub 断言 EodPostCloseSettle 的完整转发契约
（posi=平仓后剩余/closePosi=平掉额/恒1/settment:false/orginPv 等 11 项）。
该段位置转发含三个相邻同型 decimal，编译器不查错位，此测试兜底。

验证：定向 241 测试通过（含 T0/T1 Excel 验证期望值、EntrySemantics 精确值钉子——
任何 decimal 错位即红）；全量 903=145失败/746通过/12跳过，与基线逐位一致。
This commit is contained in:
hjhan
2026-08-14 16:57:56 +08:00
parent 018d7e777f
commit 4a3fee9292
20 changed files with 172 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTestProject/Modules/SwapModule/MultiStepConservationTest.cs
+6 -6
View File
@@ -120,7 +120,7 @@ namespace YLErp.Modules.SwapModule
var interests = service.GetInterests(td, td.trade_extend, unwindDate, unwindDate,
new List<eod_swap_position>(), new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
add: false, settment: false, newCalcLast: false);
return interests.Count > 0 ? interests[0].InterestAmount : 0m;
}
@@ -143,7 +143,7 @@ namespace YLErp.Modules.SwapModule
var interests = service.GetInterests(td, td.trade_extend, valueDate, valueDate,
new List<eod_swap_position> { preEod }, new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
add: false, settment: true, newCalcLast: false);
if (interests.Count == 0) return (0m, 0m);
return (interests[0].TdInterestAmount, interests[0].InterestAmount);
@@ -314,7 +314,7 @@ namespace YLErp.Modules.SwapModule
var i5 = svc5.GetInterests(td, td.trade_extend, day5, day5,
new List<eod_swap_position>(), new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
settment: false);
decimal swap1 = i5.Count > 0 ? i5[0].InterestAmount : 0m;
@@ -323,7 +323,7 @@ namespace YLErp.Modules.SwapModule
var i10 = svc10.GetInterests(td, td.trade_extend, day10, day10,
new List<eod_swap_position>(), new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
settment: false);
decimal swap2 = i10.Count > 0 ? i10[0].InterestAmount : 0m;
@@ -333,7 +333,7 @@ namespace YLErp.Modules.SwapModule
var i15 = svc15.GetInterests(td, td.trade_extend, day15, day15,
new List<eod_swap_position>(), new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
settment: false);
decimal finalUnwind = i15.Count > 0 ? i15[0].InterestAmount : 0m;
@@ -363,7 +363,7 @@ namespace YLErp.Modules.SwapModule
var interests = svc.GetInterests(td, td.trade_extend, unwindDate, unwindDate,
new List<eod_swap_position>(), new List<swap_position> { position },
Principal, Principal, Principal, Principal, 1m,
(int)SwapEventTypeEnum.平仓, false, false, Principal, Principal,
(int)SwapEventTypeEnum.平仓, false, Principal,
settment: false);
return interests.Count > 0 ? interests[0].InterestAmount : 0m;
}