From 2ded3a4068e4dd4c13e32e4eada710149328ae53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= Date: Tue, 25 Aug 2026 14:05:50 +0800 Subject: [PATCH] =?UTF-8?q?#EQD-5618=20=E5=9B=BD=E8=81=94=E6=B0=91?= =?UTF-8?q?=E7=94=9F-=E3=80=90TRS=E3=80=91=E3=80=90=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B9=A6=E3=80=91-=20=E8=BF=BD=E4=BF=9D?= =?UTF-8?q?=E7=BA=BF=E6=A2=AF=E5=BA=A6=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B9=B3=E4=BB=93=E7=BA=BF=E4=B8=8E=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E7=BA=BF=E3=80=81=E6=8E=88=E4=BF=A1=E7=8E=B0=E9=87=91=E6=AF=94?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TradeConfirmationGenerator.cs | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs index 7b864e62..9335d06f 100644 --- a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs +++ b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json.Linq; +using YLErp.BLL; using YLErp.Core.Helpers; using YLErp.DBModels; using YLErp.DBModels.Consts; @@ -315,9 +316,40 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator dic["初始保障金率"] = ((double)initRate * 100).ToString("N4"); dic["维持保障金率"] = ((double)maintainRate * 100).ToString("N4"); - // 期初预付比例和金额 - dic["期初预付比例"] = ((double)initRate * 100).ToString("0.##"); - dic["期初预付金额"] = ((trade.OriginalStockEqvNotional ?? 0) * (double)initRate).ToString("N2"); + // 期初预付/期初现金交换：预付=初始预付金腿合计（模板口径：可全部或部分授信替代）， + // 现金=资金记录实付现金（ClientCashInCashOut：Action=应付预付金且 Money<0 即客户期初实付； + // 授信部分不产生资金流水，平仓返还为正数、追加保证金是独立Action，均不落入该口径） + var notional = trade.OriginalStockEqvNotional ?? 0; + var initialLegs = swapPositions.Where(x => x.InterestMode == (int)InterestModeEnum.初始预付金).ToList(); + var initialLegIds = initialLegs.Select(x => x.id).ToList(); + double cashPaid; + using (var db = new YLContext()) + { + cashPaid = db.ClientCashInCashOut + .Where(x => x.TradeId == trade.id && x.Action == ClientCashInCashOut.系统操作_应付预付金 + && x.ValidState != ConsGlobal.InValid && x.Money < 0 + && (x.Deal == 0 || initialLegIds.Contains(x.Deal))) + .Sum(x => x.Money) ?? 0; + } + var cashRatio = notional == 0 ? 0 : -cashPaid / notional * 100; + dic["期初现金交换比例"] = cashRatio.ToString("0.##"); + dic["期初现金交换金额"] = (-cashPaid).ToString("N2"); + + // 期初预付比例和金额：有应付腿取腿合计（合约录入值），无应付腿（无预付金模板/合约维度盯市）走模板率兜底 + var totalPayable = initialLegs + .Select(x => x.InterestPrincipalFix * (x.InterestDirection == 1 ? 1m : -1m)) + .Where(x => x > 0) + .Sum(); + if (totalPayable > 0) + { + dic["期初预付比例"] = (notional == 0 ? 0 : (double)totalPayable / notional * 100).ToString("0.##"); + dic["期初预付金额"] = ((double)totalPayable).ToString("N2"); + } + else + { + dic["期初预付比例"] = ((double)initRate * 100).ToString("0.##"); + dic["期初预付金额"] = (notional * (double)initRate).ToString("N2"); + } bool posiLong = IsCustomerLong(swapPosition); var maintainRatePercent = (double)maintainRate * 100; // A(%) @@ -441,9 +473,7 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator } // 期初预付金利率（InterestMode == 初始预付金） - var initialMarginPosition = swapPositions - .Where(x => x.InterestMode == (int)InterestModeEnum.初始预付金) - .FirstOrDefault(); + var initialMarginPosition = initialLegs.FirstOrDefault(); dic["期初预付金利率"] = initialMarginPosition != null ? ((double)initialMarginPosition.InterestRateDefault * 100).ToString("N4") : "0.0000"; @@ -507,18 +537,9 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator } // 基本费率 = PosiTradingFeePending / 名义本金 * 100 - var notional = trade.OriginalStockEqvNotional ?? 0; var tradingFee = (double)swapPosition.PosiTradingFeePending; var basicFeeRate = notional == 0 ? 0 : tradingFee / notional * 100; dic["基本费率"] = basicFeeRate.ToString("0.####"); - - // 期初现金交换比例和金额（使用初始预付金数据） - dic["期初现金交换比例"] = initialMarginPosition != null - ? ((double)initialMarginPosition.InterestRateDefault * 100).ToString("N4") - : "0.0000"; - dic["期初现金交换金额"] = initialMarginPosition != null - ? ((double)initialMarginPosition.InterestPrincipalFix).ToString("N2") - : "0.00"; } else {