From 4138a6ec36b20fc5e5fd3692bde83b4fd78dc483 Mon Sep 17 00:00:00 2001 From: hjhan Date: Thu, 2 Jul 2026 08:47:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(swap):=20DealFloatPositions=E6=B5=AE?= =?UTF-8?q?=E5=8A=A8=E8=85=BF=E5=BD=92=E6=A1=A3=E6=96=B9=E6=B3=95=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E6=80=A7=E6=94=BE=E5=BC=80(testable=E8=BF=81=E7=A7=BB?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4个方法private→protected,不改变生产行为: - DealFloatPositions(浮动腿归档主调度) - CopyEodPosition(无平仓复制前日) - UpdateEodPosition(有平仓更新) - SaveCurrentEodInitalPosi(首日初始化) 这4个方法本身无直接DB调用(数据从参数传入), 但CopyEodPosition/UpdateEodPosition依赖外部数据源 (UnderlyingCodePrice/BondPaymentService/DataCacheProvider), 需后续加接缝才能完整测试。 SaveCurrentEodInitalPosi是纯计算可直接测。 验证: 104个测试全通过。 --- YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index f719194d..0a8046e5 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -445,7 +445,7 @@ namespace YLErp.Modules.SwapModule /// /// /// - private List DealFloatPositions(List posiList, + protected List DealFloatPositions(List posiList, List realPosiList, List eodPositions, List todyEodPositions, @@ -1480,7 +1480,7 @@ namespace YLErp.Modules.SwapModule /// 当日日终归档信息 /// 当日平仓/互换事件信息 /// 交易信息 - private eod_swap_position CopyEodPosition(eod_swap_position eod, eod_swap_position curretEod, trade td, DateTime valueDate, DateTime preSettleDate) + protected eod_swap_position CopyEodPosition(eod_swap_position eod, eod_swap_position curretEod, trade td, DateTime valueDate, DateTime preSettleDate) { if (curretEod == null) { @@ -1560,7 +1560,7 @@ namespace YLErp.Modules.SwapModule /// /// /// - private eod_swap_position UpdateEodPosition(swap_position swapPosition, eod_swap_position eod, eod_swap_position curretEod, trade td, DateTime valueDate, DateTime preSettleDate, List unwindEvents) + protected eod_swap_position UpdateEodPosition(swap_position swapPosition, eod_swap_position eod, eod_swap_position curretEod, trade td, DateTime valueDate, DateTime preSettleDate, List unwindEvents) { if (curretEod == null) { @@ -1734,7 +1734,7 @@ namespace YLErp.Modules.SwapModule /// /// /// - private eod_swap_position SaveCurrentEodInitalPosi(swap_position position, trade td, DateTime settleDate, DateTime preSettleDate, List unwindEvents) + protected eod_swap_position SaveCurrentEodInitalPosi(swap_position position, trade td, DateTime settleDate, DateTime preSettleDate, List unwindEvents) { eod_swap_position curretEod = new eod_swap_position(); var um = DataCacheProvider.GetUnderlyingDataSource().GetData(position.UnderlyingCode);