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

# Conflicts: # YLErpDAL/Modules/EodModule/BondPaymentService.cs # YLErpDAL/Modules/SwapModule/SwapDealService.cs
2026-08-20 16:21:13 +08:00
parent ff7e540084 286a834aa5
commit 582cb2c7c5
158 changed files with 7931 additions and 3252 deletions
@@ -68,7 +68,7 @@ namespace YLErp.Modules.SwapModule
        /// 捕获真实收盘产生的 swap_flow_event（生产写 DbContext.swap_flow_event）。
        /// 与 PersistEodSwapPosition 同理，这里只收集不写库，供 GetConsumedInterest 真实计算。
        /// </summary>
-        protected void PersistFlowEvent(swap_flow_event flowEvent)
+        protected override void PersistFlowEvent(swap_flow_event flowEvent)
        {
            if (flowEvent.id == 0) flowEvent.id = _nextId++;
            FlowEvents.Add(flowEvent);
@@ -111,5 +111,16 @@ namespace YLErp.Modules.SwapModule
            ClientCashCalls.Add((amount, action));
            return _nextId++;
        }
+
+        /// <summary>
+        /// AddClientCashInCashOut 生产实现会查 DataCacheProvider.GetClientDataSource().GetData(ClientId)，
+        /// 纯内存测试无客户缓存会抛"客户信息未找到"。与 AddClientCash 同构 no-op，
+        /// 仅捕获调用记录，供断言使用。
+        /// </summary>
+        public override int AddClientCashInCashOut(OtcTradeBase td, double amount, string action, DateTime valueDate)
+        {
+            ClientCashCalls.Add((amount, action));
+            return _nextId++;
+        }
    }
 }