Merge branch 'glms/feature/1.4.2' into glms/feature/0812_zmr_divPower

# Conflicts:
#	YLErpDAL/Modules/EodModule/BondPaymentService.cs
#	YLErpDAL/Modules/SwapModule/SwapDealService.cs

UnitTestProject/Modules/SwapModule/BondTrsAutoSwapScenarioTest.cs

@@ -134,6 +134,17 @@ namespace YLErp.Modules.SwapModule
                 return new swap_event { id = SwapEvents.Count };
             }
 
+            /// <summary>
+            /// 捕获 SaveAutoSwapDeal 落库的 flow_event（生产写 DbContext.swap_flow_event）。
+            /// 同步到 PersistedFlowEvents 供 AS_009/010/011 断言；基类 FlowEvents 仍由它填充，
+            /// 供 GetConsumedInterest 真实计算已结利息。
+            /// </summary>
+            protected override void PersistFlowEvent(swap_flow_event flowEvent)
+            {
+                base.PersistFlowEvent(flowEvent);
+                PersistedFlowEvents.Add(flowEvent);
+            }
+
             /// <summary>
             /// 利息腿金额直接给定（付息金额），避免把 GetInterests 的计息细节混入本用例——
             /// 本文件关注的是「自动互换是否触发 / 几条 / 资金发生日 / 金额量级」，
@@ -144,9 +155,9 @@ namespace YLErp.Modules.SwapModule
             protected override List<swap_flow_event> CalcSwapInterests(
                 trade td, trade_extend tradeExtend, DateTime valueDate, DateTime unwindDate,
                 List<eod_swap_position> eodPositions, List<swap_position> positions,
-                decimal posiNotionalValue, decimal posiLongNotionalValue, decimal posiShortNotionalValue,
-                decimal closePosiNotionalValue, decimal closePrecent, int eventType, bool tdClose, bool needPrice,
-                decimal grossPrice, decimal orginPv, bool add = false, bool settment = true, bool newCalcLast = false,
+                decimal posiNotionalValue,
+                decimal closePosiNotionalValue, decimal closePrecent, int eventType, bool tdClose,
+                decimal orginPv, bool add = false, bool settment = true, bool newCalcLast = false,
                 List<swap_flow_event> closeList = null)
             {
                 return positions.Select(p => new swap_flow_event