#EQD-6947 国联民生-保证金计算整体改造-实现第一版盯市规则（不支持同一客户多部门）（1）保证金规则的设置阶段3

2026-08-20 14:20:29 +08:00
parent 2e58ca2498
commit febd0ce02e
19 changed files with 1378 additions and 772 deletions
@@ -909,7 +909,12 @@ namespace YLErp.Modules.EodModule.SettlementModule
                var clientSpan = clientSpanList == null || clientSpanList.Count == 0 ? null : clientSpanList.FirstOrDefault(t => t.ClientId == client.id && t.ValueDate == balanceDate && t.SpanType == ClientSpan.SpanType_Eod);
                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;
                    SwapUnPayableMargin = clientSpan.SwapUnMargin ?? 0d;