From f39e516a669f50f0086bf5d5d980b68800e676cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <2452821485@qq.com>
Date: Tue, 29 Apr 2025 14:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9F=BA=E6=9C=AC=E8=B4=B9?=
 =?UTF-8?q?=E7=8E=87=E5=92=8C=E5=90=8D=E4=B9=89=E6=9C=AC=E9=87=91=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=20=E4=BD=BF=E7=94=A8=E5=BC=80=E4=BB=93=E5=90=8D?=
 =?UTF-8?q?=E4=B9=89=E6=9C=AC=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DocumentGenerator/TradeConfirmationGenerator.cs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs
index 34b5cd3b..37811ae1 100644
--- a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs
+++ b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs
@@ -142,7 +142,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator
                     dic["到期日期"] = trade.ExerciseDate?.ToString("yyyy年M月d日");
                     bool posiLong = swapPosition?.PositionType == (int)PositionTypeFlag.Short ? false : true;
                     var interestRate = interestMargin?.InterestRateDefault * 100 ?? 0;
-                    var basicFee = trade.StockEqvNotionalReal == 0 ? 0 : ((double)((swapPosition?.PosiTradingFeePending) ?? 0) / trade.StockEqvNotionalReal) * 100;
+                    var basicFee = (trade.OriginalStockEqvNotional ?? 0) == 0 ? 0 : ((double)((swapPosition?.PosiTradingFeePending) ?? 0) / (trade.OriginalStockEqvNotional ?? 0)) * 1000;
                     dic["基本费率"] = (basicFee * 2).ToString("f4");
                     dic["交易费用"] = (double)((swapPosition?.PosiTradingFeePending * 2) ?? 0);
                     dic["多头约定利率"] = "不适用";
@@ -209,8 +209,8 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator
 
                 var row = new JObject();
                 row["序号"] = ++count;
-                FormatToDict("名义本金", trade.StockEqvNotionalReal, row);
-                StockEqvNotionalRealSum += trade.StockEqvNotionalReal;
+                FormatToDict("名义本金", trade.OriginalStockEqvNotional, row);
+                StockEqvNotionalRealSum += trade.OriginalStockEqvNotional ?? 0;
                 row["成交日期"] = trade.TradeDate?.ToString("【yyyy】年【M】月【d】日");
                 row["开始日期"] = trade.StartDate?.ToString("【yyyy】年【M】月【d】日");
                 row["到期日期"] = trade.ExerciseDate?.ToString("【yyyy】年【M】月【d】日");