#EQD-6948 国联民生-实现保证金规则（2）追保金额的产生与收盘计算授信和现金tag

2026-08-21 10:33:29 +08:00
parent febd0ce02e
commit 7b1f69a410
27 changed files with 874 additions and 69 deletions
@@ -795,7 +795,12 @@ namespace YLErp.Modules.EodModule.SettlementModule
            var clientSpan = client.ClientSpan;
            if (clientSpan != null)
            {
-                PayableMargin = clientSpan.WorstCastClientPayable ?? 0d;
+                // 合约维度盯市(MarginWatchRule==0)客户成交时已产生出入金，保证金不再计入占用(PayableMargin)，避免双重体现；
+                // 客户维度盯市(null/1)维持现状，计入占用。存量客户为 null，行为不变。
+                if (client.MarginWatchRule != 0)
+                {
+                    PayableMargin = clientSpan.WorstCastClientPayable ?? 0d;
+                }
                DeltaMargin = clientSpan.DeltaMargin ?? 0d;
                SwapPayableMargin = clientSpan.SwapWorstCastClientPayable ?? 0d;
                TwoSideMargin = clientSpan.TwoSideMargin ?? 0d;