From b36c7aa21f867058baf3b8a00da687c7b8fe5701 Mon Sep 17 00:00:00 2001 From: hjhan Date: Tue, 24 Mar 2026 10:21:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(calculation):=20=E8=A7=A3=E5=86=B3=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E4=BB=A3=E7=A0=81=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20=E7=A7=BB=E9=99=A4QDP=E7=B4=AF?= =?UTF-8?q?=E8=B4=AD=E6=9C=9F=E6=9D=83=E4=B8=AD=E7=9A=84=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=8F=82=E6=95=B0=20-=20=E4=BB=8EQdpTradeBui?= =?UTF-8?q?lder=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=B8=AD=E7=A7=BB=E9=99=A4updownPriceMode=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?-=20=E6=B3=A8=E9=87=8A=E6=8E=89=E7=B4=AF=E8=B4=AD=E6=9C=9F?= =?UTF-8?q?=E6=9D=83=E4=B8=AD=E4=B8=8D=E5=86=8D=E6=94=AF=E6=8C=81=E7=9A=84?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20-=20=E6=9B=B4=E6=96=B0Excel=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=E4=BB=A5=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=95=B0=E6=8D=AE=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs | 5 ++--- YLErpDAL/Modules/ClientModule/ClientDataService.cs | 2 +- .../TradeModule/QueryModule/OtcTradeListExportService.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs b/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs index 3b3af329..8f130398 100644 --- a/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs +++ b/YLErpDAL/Modules/CalculationModule/QdpTradeBuilder.cs @@ -2286,7 +2286,6 @@ namespace YLErp.Modules.CalculationModule annualizedFactor: param.annualizedFactor, accumuType: param.AccumuType == "子弹" ? AccumuType.bullet : AccumuType.none, settleMode: settleMode, - updownPriceMode: param.updownPriceMode, happenedObservations: happenedObservations) { UnderlyingTickers = param.underlyingTickers @@ -2450,7 +2449,6 @@ namespace YLErp.Modules.CalculationModule settleMode: settleMode, settleMode2: settleMode2, settleMode3: settleMode3, - updownPriceMode: param.updownPriceMode, happenedObservations: happenedObservations, strike2: param.Strike2, strike3: param.Strike3, @@ -2548,7 +2546,8 @@ namespace YLErp.Modules.CalculationModule result.Coupon = accumulatorOption.CouponPercent ? accumulatorOption.Coupon * (td.SpotPrice ?? 0) : accumulatorOption.Coupon; result.KOObservationDates = accumulatorOption.KOObservationDates; - result.updownPriceMode = GlobalConfig.AccumulatorCriticalMode == "updown"; + // Removed updownPriceMode as it's not supported in QDP AccumulatorOption constructor + // result.updownPriceMode = GlobalConfig.AccumulatorCriticalMode == "updown"; result.happenedObservations = request?.happenedObservations; //将累计期权引擎需要传入的notional从原来的观察日总数量更正为沽购数量 diff --git a/YLErpDAL/Modules/ClientModule/ClientDataService.cs b/YLErpDAL/Modules/ClientModule/ClientDataService.cs index 42ed48de..2f14dbe7 100644 --- a/YLErpDAL/Modules/ClientModule/ClientDataService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientDataService.cs @@ -268,7 +268,7 @@ namespace YLErp.Modules.ClientModule var ret = getExprotClientData(clientList, colNameList); - new ExcelHelper().ListToExcel>(dc.ToArray(), ret, "客户合并信息", true, out var buffer, true, dataGroupModelList.ToArray()); + new ExcelHelper().ListToExcel>(dc.ToArray(), ret, "客户合并信息", true, out var buffer, true); return buffer; } diff --git a/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs b/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs index 4682e024..b6c40412 100644 --- a/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs +++ b/YLErpDAL/Modules/TradeModule/QueryModule/OtcTradeListExportService.cs @@ -2018,8 +2018,7 @@ namespace YLErp.Modules.TradeModule.QueryModule } }); } - new ExcelHelper().ListToExcel(dc.ToArray(), list, "场外期权交易导出", true, out var buffer, false, - dataGroupModelList.ToArray() + new ExcelHelper().ListToExcel(dc.ToArray(), list, "场外期权交易导出", true, out var buffer, false ); return buffer; }