Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#EQD-7247 客户维度：维持保证金计算不正确

Browse Source
This commit is contained in:
锦麟 王
2026-08-28 16:20:54 +08:00
parent 601eb2bed7
commit 3d631e0a07
3 changed files with 197 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTestProject/Modules/CalcModules/MarginTemplateV2RateHelperFallbackTest.cs
+51 -2
View File
@@ -55,7 +55,7 @@ namespace YLErp.Modules.CalcModules
db.SaveChanges();
}
private margin_template_v2 AddTemplate(string name, bool isDefault, bool isForClient, string tradeTypes = "收益互换", bool isValid = true, int ruleType = (int)MarginRuleTypeEnum.区间追保结构)
private margin_template_v2 AddTemplate(string name, bool isDefault, bool isForClient, string tradeTypes = "收益互换", bool isValid = true, int ruleType = (int)MarginRuleTypeEnum.区间追保结构, string bookIds = null, DateTime? valueDate = null)
{
var t = new margin_template_v2
{
@@ -65,7 +65,8 @@ namespace YLErp.Modules.CalcModules
IsValid = isValid,
TradeTypes = tradeTypes,
RuleType = ruleType,
ValueDate = EffectiveDate
ValueDate = valueDate ?? EffectiveDate,
BookIds = bookIds
};
db.margin_template_v2.Add(t);
db.SaveChanges();
@@ -179,6 +180,54 @@ namespace YLErp.Modules.CalcModules
Assert.AreEqual(0.03m, rate.MaintainRate.Value);
}
/// <summary>
/// 双全局默认并存（2026-08-28 裁定回归，复刻 dev 274/275 结构）：
/// 同生效日下通配模板（无簿记限制）id 更新排前，限定簿记且匹配的模板排后——
/// 原口径"先按生效日/id 取最新再验簿记"使通配恒胜、限定簿记模板永不生效；
/// 新口径簿记条件满足者优先。需一笔隔离的真实交易（有簿记账户、无交易绑定，客户无客户级绑定）。
/// </summary>
[TestMethod]
public void TF_009_双全局默认_限定簿记匹配优先于通配()
{
var boundTradeIds = db.trade_margin_template.AsNoTracking().Select(x => x.TradeId).ToList();
var boundClientIds = db.client_margin_template.AsNoTracking()
.Where(x => x.ClientId > 0).Select(x => x.ClientId).Distinct().ToList();
var levelBoundNames = db.client_margin_template.AsNoTracking()
.Where(x => x.ClientId == 0 && x.ClientLevel != null && x.ClientLevel != "")
.Select(x => x.ClientLevel).Distinct().ToList();
int tradeId, assetId, tradeClientId;
using (var clientDb = DbContextFactory.GetClientDbContext(OptUserInfo.SystemUser))
{
var excludedLevelIds = clientDb.clientlevel.AsNoTracking()
.Where(l => levelBoundNames.Contains(l.LevelName)).Select(l => l.id).ToList();
var excludedClientIds = clientDb.client.AsNoTracking()
.Where(c => boundClientIds.Contains(c.id) || (c.LevelId != null && excludedLevelIds.Contains(c.LevelId ?? 0)))
.Select(c => c.id).ToList();
var picked = db.trade.AsNoTracking()
.Where(t => t.AssetId > 0 && t.ValidState != "InValid"
&& !boundTradeIds.Contains(t.id) && !excludedClientIds.Contains(t.ClientId))
.OrderByDescending(t => t.id)
.Select(t => new { t.id, t.AssetId, t.ClientId }).FirstOrDefault();
if (picked == null)
{
Assert.Inconclusive("dev 库无可用的隔离测试交易（有簿记账户且交易/客户均无绑定）");
return;
}
tradeId = picked.id;
assetId = picked.AssetId;
tradeClientId = picked.ClientId;
}
//同生效日（今日，晚于 dev 既有默认模板）双全局默认：通配后建（id 更大排前）
var generic = AddTemplate(Marker + "全局通配", isDefault: true, isForClient: false, valueDate: DateTime.Today);
var bookScoped = AddTemplate(Marker + "全局限定簿记", isDefault: true, isForClient: false, bookIds: assetId.ToString(), valueDate: DateTime.Today);
var resolved = MarginTemplateV2RateHelper.ResolveTieredTemplate(tradeId, tradeClientId, DateTime.Today, db);
Assert.IsNotNull(resolved);
Assert.IsTrue(resolved.Name.StartsWith(Marker), $"应命中本用例创建的标记模板，实际命中模板{resolved.id}（dev 出现同日/更晚生效默认模板会干扰，请重跑）");
Assert.AreEqual(bookScoped.id, resolved.id, "限定簿记且匹配的全局默认应优先于同生效日的通配全局默认");
}
private void AssertGlobal(margin_template_v2 resolved, margin_template_v2 expected)
{
Assert.IsNotNull(resolved);