Merge branch 'glms/feature/1.4.2-0806' into glms/feature/1.4.2

2026-08-06 14:45:37 +08:00
parent 0f46cbba17 15bf1a90ab
commit 9f6224f44e
3 changed files with 64 additions and 1 deletions
@@ -144,6 +144,10 @@ namespace YLErp.Modules.SwapModule
            if (unwindData.FlowEvents.Any(x => !string.IsNullOrEmpty(x.UnderlyingCode)))
            {
                CalcCloseAmount(unwindData);
+                if (eventType == (int)SwapEventTypeEnum.互换)
+                {
+                    unwindData.SwapMarginAmount = 0;
+                }
                return;
            }

@@ -2013,7 +2017,7 @@ namespace YLErp.Modules.SwapModule
            }
            string action = eventType == (int)SwapEventTypeEnum.互换 ? ClientCashInCashOut.系统操作_互换 : ClientCashInCashOut.系统操作_平仓费;
            int clientCashId = AddClientCash(td, Convert.ToDouble(-swapEvent.unwindData.SwapRealizedPnL), action, swapEvent.unwindData.ValueDate);
-            if (swapEvent.unwindData.SwapMarginAmount != 0)
+            if (eventType == (int)SwapEventTypeEnum.平仓 && swapEvent.unwindData.SwapMarginAmount != 0)
            {
                AddClientCash(td, Convert.ToDouble(swapEvent.unwindData.SwapMarginAmount), ClientCashInCashOut.系统操作_应付预付金, swapEvent.unwindData.ValueDate);
            }