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】日");