From 3e5a9396896e8423cf50dbc2038d377669fe1073 Mon Sep 17 00:00:00 2001
From: hjhan <hongjun.han@yieldchain.com>
Date: Wed, 1 Jul 2026 16:47:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(swap):=20=E9=98=B6=E6=AE=B51a=20DealIn?=
 =?UTF-8?q?terests=E5=88=A9=E6=81=AF=E5=BD=92=E6=A1=A3=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=E6=94=BE=E5=BC=80(testable=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=87=86=E5=A4=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将5个利息腿归档相关方法从private改为protected,不改变生产行为:
- DealInterests(利息腿归档主调度)
- SaveEodInterestPosition(手动互换分支)
- SaveAutoEodInterestPosition(自动互换分支)
- SaveAutoEodWithCloseInterestPosition(平仓分支)
- SaveEodInterestPositionCopy(普通计息分支)

这是testable迁移第一步:先放开可见性让测试子类能调用,
后续阶段再加虚方法接缝(替换DB调用)和迁移合成测试。

参考: refactor-swap-event-testable分支 Seams模式改造
---
 YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
index 7f676dd1..f68558e0 100644
--- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
@@ -212,7 +212,7 @@ namespace YLErp.Modules.SwapModule
         /// <param name="autoInterests">自动互换集合</param>
         /// <param name="longshortCloseInterests">多空组合平仓利息腿信息</param>
         /// <param name="lastEodSwap">上一日终框架合约</param>
-        private void DealInterests(List<swap_position> interestList,
+        protected void DealInterests(List<swap_position> interestList,
             List<eod_swap_position> eodPositions,
             List<eod_swap_position> todyEodPositions,
             DateTime settleDate,
@@ -769,7 +769,7 @@ namespace YLErp.Modules.SwapModule
         /// <param name="startDate">计息开始日</param>
         /// <param name="valueDate">计息结束日</param>
         /// <param name="closeAmount">平仓金额</param>
-        private void SaveEodInterestPosition(eod_swap_position eodPayPosition,
+        protected void SaveEodInterestPosition(eod_swap_position eodPayPosition,
             eod_swap_position newEodPayPosition,
             swap_position position,
             trade td,
@@ -865,7 +865,7 @@ namespace YLErp.Modules.SwapModule
         /// <param name="preDealDate">上一平仓/互换日期</param>
         /// <param name="closeAmount">当日平仓金额</param>
         /// <param name="lastEodSwap">上一日终框架合约估值</param>
-        private List<swap_flow_event> SaveAutoEodInterestPosition(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, swap_position position, trade td, DateTime valueDate, IntervalModel interval, eod_swap lastEodSwap, decimal posiLongNotional, decimal posiShortNational, decimal grossPrice, decimal orginPv)
+        protected List<swap_flow_event> SaveAutoEodInterestPosition(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, swap_position position, trade td, DateTime valueDate, IntervalModel interval, eod_swap lastEodSwap, decimal posiLongNotional, decimal posiShortNational, decimal grossPrice, decimal orginPv)
         {
             Log.Info($"[SaveAutoEodInterestPosition] 开始执行 - valueDate: {valueDate:yyyy-MM-dd}, td.id: {td?.id}, position.id: {position?.id}");
 
@@ -1006,7 +1006,7 @@ namespace YLErp.Modules.SwapModule
         /// <param name="closeAmount">当日平仓金额</param>
         /// <param name="lastEodSwap">上一日终框架合约估值</param>
         /// <param name="unwintotal">平仓主信息</param>
-        private List<swap_flow_event> SaveAutoEodWithCloseInterestPosition(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, swap_position position, trade td, DateTime valueDate, IntervalModel interval, decimal posiLongNotional, decimal posiShortNational, List<swap_flow_event> flowEvents, decimal closeNational, bool autoSwap, decimal grossPrice, decimal orginPv)
+        protected List<swap_flow_event> SaveAutoEodWithCloseInterestPosition(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, swap_position position, trade td, DateTime valueDate, IntervalModel interval, decimal posiLongNotional, decimal posiShortNational, List<swap_flow_event> flowEvents, decimal closeNational, bool autoSwap, decimal grossPrice, decimal orginPv)
         {
             Log.Info($"eodPayPosition is {JsonHelper.Serialize(eodPayPosition, false)},newEodPayPosition is {JsonHelper.Serialize(newEodPayPosition, false)}");
             var tradeExtend = td.trade_extend.ExtendObj;
@@ -1139,7 +1139,7 @@ namespace YLErp.Modules.SwapModule
         /// <param name="preSettleDate">上一交易日</param>
         /// <param name="valueDate">当前结算日</param>
         /// <param name="td">互换交易主干</param>
-        private void SaveEodInterestPositionCopy(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, DateTime valueDate, trade td, swap_position position, eod_swap lastEodSwap, bool needPrice, decimal posiLongNational, decimal posiShortNational, decimal grossPrice, decimal orginPv)
+        protected void SaveEodInterestPositionCopy(eod_swap_position eodPayPosition, eod_swap_position newEodPayPosition, DateTime valueDate, trade td, swap_position position, eod_swap lastEodSwap, bool needPrice, decimal posiLongNational, decimal posiShortNational, decimal grossPrice, decimal orginPv)
         {
             Log.Info($"eodPayPosition is {JsonHelper.Serialize(eodPayPosition, false)},newEodPayPosition is {JsonHelper.Serialize(newEodPayPosition, false)}");
             List<IntervalModel> intervals = position.SwapIntervalList;