From 0a523457c4861d5892a5bbedbad11d2c4d167598 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: Wed, 7 May 2025 10:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=B4=B9=E7=94=A8=E8=AE=A1?= =?UTF-8?q?=E7=AE=97dic=E7=94=A8=E6=80=BB=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocumentGenerator/TradeConfirmationGenerator.cs | 4 ++-- .../TradeModule/DealModule/TradeContractGenerateService.cs | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs index 0f7a00bb..9f290925 100644 --- a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs +++ b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs @@ -143,8 +143,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator dic["开始日期"] = trade.StartDate?.ToString("yyyy年M月d日"); dic["到期日期"] = trade.ExerciseDate?.ToString("yyyy年M月d日"); bool posiLong = swapPosition?.PositionType == (int)PositionTypeFlag.Short ? false : true; - var interestRate = interestMargin?.InterestRateDefault * 100 ?? 0; - dic["交易费用"] = (double)((swapPosition?.PosiTradingFeePending * 2) ?? 0); + var interestRate = interestMargin?.InterestRateDefault * 100 ?? 0; dic["多头约定利率"] = "不适用"; dic["空头约定利率"] = "不适用"; if (posiLong) @@ -257,6 +256,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator var basicFee = (StockEqvNotionalRealSum == 0 ? 0 : (PosiTradingFeePending / StockEqvNotionalRealSum * 100)); dic["基本费率"] = (basicFee * 2).ToString("f4"); dic["交易费率"] = dic["基本费率"]; + dic["交易费用"] = PosiTradingFeePending * 2; dic["名义本金".Insert("名义本金".Length, "2?")] = StockEqvNotionalRealSum.ToString("0.##"); dic["期初预付金".Insert("期初预付金".Length, "2?")] = (StockEqvNotionalRealSum * clientMarginRate?.InitMarginRate)?.ToString("0.##"); diff --git a/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs b/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs index 78853bc3..6b5c4636 100644 --- a/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs +++ b/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs @@ -533,9 +533,6 @@ namespace YLErp.Modules.TradeModule.DealModule { var result = new SearchListResult(); var contractList = new List(); - // Fix for the issue: CS1525, CS0746, CS1003 - // The problem lies in the incorrect syntax for defining an anonymous type. - // Anonymous type members must be declared using member assignment or simple names. var query = from t in DbContext.trade.AsNoTracking().Where(x => x.TradeType == "收益互换" && x.ValidState != "InValid") join tcrs in DbContext.trade_contract_r