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

fix(EQD-7004): 补全分红登记日口径修复的多次付息累计测试与Trace日志

Browse Source 
原修复 9df39491 仅覆盖单次登记日(4/3)的两个单点修复，本次补全 EQD-7004 的完整验证与排查手段：

- 测试 GLMS20260105_0006 新增 4 个场景：5 期 reg_date 过滤口径各自命中正确子集；五期票息累计=5x36160=180800；auto 实现归0后下次登记日重新累加；4 期挂账累计读 144640

- 分红读取关键链路加 Debug 级日志(生产可关)：BondPaymentService.GetBondPayments(reg_date 过滤区间+命中条数)、SwapDealService.GetPreEodPositionByDate(EOD 定位+回退)、GetPreEodDividendSum(取EOD日期+PosiDividendSum)、方案C 平仓预览/收益结算两处 DividendIn 赋值

实跑 dotnet test 全 GREEN(6/6)。任务编号 EQD-7004。
This commit is contained in:
hjhan
2026-08-14 10:05:01 +08:00
parent b2cbbff9e7
commit bdba5fbecd
3 changed files with 133 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/SwapModule/SwapDealService.cs
+8 -2
View File
@@ -277,6 +277,7 @@ namespace YLErp.Modules.SwapModule
// DividendPending = "待结算分红收益"（仍挂在账上、未来才结的存量 = PosiDividendSum 全量口径，
// 见 GetPreEodDividendSum 注释的口径论证；切勿改回硬0或分摊，会落库回归）
decimal preEodDividendSum = GetPreEodDividendSum(tradeId, position.PositionId, dealDate);
Logger.Debug($"[分红-平仓预览] 方案C DividendIn=DividendPending=PosiDividendSum全量 tradeId={tradeId} positionId={position.PositionId} dealDate={dealDate:yyyy-MM-dd} 值={preEodDividendSum}");
floatEvent.DividendIn = preEodDividendSum;
floatEvent.DividendPending = preEodDividendSum;
floatEvent.UnderlyingCode = position.UnderlyingCode;
@@ -410,7 +411,9 @@ namespace YLErp.Modules.SwapModule
floatEvent.PositionId = position.PositionId;
// 方案C：分红收益改由上一收盘日 EOD PosiDividendSum 提供（单一可信源），
// 前端 getDivindIn 不再覆盖；消除"期初持仓×totalInterest"对已平仓部分的重复计入。
floatEvent.DividendIn = GetPreEodDividendSum(tradeId, position.PositionId, dealDate);
decimal preEodDividendSum = GetPreEodDividendSum(tradeId, position.PositionId, dealDate);
Logger.Debug($"[分红-收益结算] DividendIn=PosiDividendSum全量 tradeId={tradeId} positionId={position.PositionId} dealDate={dealDate:yyyy-MM-dd} 值={preEodDividendSum}");
floatEvent.DividendIn = preEodDividendSum;
floatEvent.UnderlyingCode = position.UnderlyingCode;
floatEvent.UnderlyingInstrumentType = position.UnderlyingInstrumentType;
floatEvent.CloseFee = 0;
@@ -807,7 +810,9 @@ namespace YLErp.Modules.SwapModule
protected virtual decimal GetPreEodDividendSum(int tradeId, long positionId, DateTime dealDate)
{
var preEod = GetPreEodPositionByDate(tradeId, positionId, dealDate);
return preEod == null ? 0m : preEod.PosiDividendSum;
var sum = preEod == null ? 0m : preEod.PosiDividendSum;
Logger.Debug($"[分红-读取] GetPreEodDividendSum tradeId={tradeId} positionId={positionId} dealDate={dealDate:yyyy-MM-dd} 取EOD日期={(preEod?.ValueDate):yyyy-MM-dd} PosiDividendSum={sum}");
return sum;
}
/// <summary>
@@ -821,6 +826,7 @@ namespace YLErp.Modules.SwapModule
.Where(x => x.ValueDate <= dealDate)
.OrderByDescending(o => o.ValueDate).FirstOrDefault();
var preEodDate = lastEod == null ? dealDate.AddDays(-1) : lastEod.ValueDate;
Logger.Debug($"[分红-快照定位] GetPreEodPositionByDate tradeId={tradeId} positionId={positionId} dealDate={dealDate:yyyy-MM-dd} 取<=当日EOD, 命中日期={(lastEod?.ValueDate):yyyy-MM-dd}, 回退={lastEod == null}");
return QueryPreEodPosition(tradeId, positionId, preEodDate);
}