From 0c9cd640387bb4e6e0b57594bdd1a14f020deac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 13 May 2025 13:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E4=BA=A4=E7=B0=BF=E8=AE=B0=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97&=E6=8A=A5?= =?UTF-8?q?=E9=80=81=E5=A1=AB=E6=8A=A5=E4=B8=8B=E6=8B=89=E5=80=BC=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Framework/YLErp.Core/DBModels/Consts/ConsReport.cs | 2 +- YLErpDAL/Modules/SwapModule/SwapRateService.cs | 2 +- .../Modules/TradeModule/DealModule/TradeConfirmService.cs | 4 ++-- YLErpWeb/Controllers/tradeController.cs | 4 ++-- YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs | 2 ++ YLErpWeb/Hubs/SwapFlowCombookingHub.cs | 2 ++ YLErpWeb/Hubs/SwapFlowResetHub.cs | 2 ++ YLErpWeb/Views/trade/tradeSubmissionFields.cshtml | 4 ++-- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs b/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs index e0ada4a3..1e5559e7 100644 --- a/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs +++ b/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs @@ -1646,7 +1646,7 @@ namespace YLErp.DBModels.Consts { _performanceCollRangeMapDisplay = new ExpandoDictionary(new Dictionary() { - {"仅限本笔交易","0"}, + {"仅本笔交易","0"}, {"本笔交易对应主协议框架下的所有交易(在附件中上传履约担保协议)","1"}, {"其他情况下多笔交易(在附件中上传履约担保协议)","2"}, }); diff --git a/YLErpDAL/Modules/SwapModule/SwapRateService.cs b/YLErpDAL/Modules/SwapModule/SwapRateService.cs index 0f07b55a..bea46af2 100644 --- a/YLErpDAL/Modules/SwapModule/SwapRateService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapRateService.cs @@ -380,7 +380,7 @@ namespace YLErp.Modules.SwapModule } public void SendAllSwapRateToKafka() { - var swapRates = DbContext.swap_rate.Where(x => x.TakeEffectDate <= DateTime.Now.Date).GroupBy(g => g.ClientId).Select(g => g.OrderByDescending(o => o.TakeEffectDate).FirstOrDefault()).ToList(); + var swapRates = DbContext.swap_rate.Where(x => x.TakeEffectDate <= DateTime.Now.Date).ToList().GroupBy(g => g.ClientId).Select(g => g.OrderByDescending(o => o.TakeEffectDate).FirstOrDefault()).ToList(); var swapRateAll = DbContext.swap_rate .Where(x => x.ClientId == 0 && x.TakeEffectDate <= DateTime.Now.Date) .OrderByDescending(o => o.TakeEffectDate) diff --git a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs index 914819e6..227ed0fe 100644 --- a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs +++ b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs @@ -418,8 +418,8 @@ namespace YLErp.Modules.TradeModule.DealModule trade_Report.IsUsePerformanceColl = "否"; trade_Report.PerformanceExplain = "详见交易确认书。"; trade_Report.IsPerformanceCollInterest = "否"; - trade_Report.PerformanceCollType = "现金"; - trade_Report.PerformanceCollRange = "仅本笔交易"; + trade_Report.PerformanceCollType = "0"; + trade_Report.PerformanceCollRange = "0"; trade_Report.InitialPerformanceColl = (decimal)marinRate.InitMarginRate*100; trade_Report.RecoveryPerformanceColl = (decimal)marinRate.MaintenanceRate * 100; trade_Report.UnwindPerformanceColl = trade_Report.RecoveryPerformanceColl; diff --git a/YLErpWeb/Controllers/tradeController.cs b/YLErpWeb/Controllers/tradeController.cs index 7df611cd..6a96e468 100644 --- a/YLErpWeb/Controllers/tradeController.cs +++ b/YLErpWeb/Controllers/tradeController.cs @@ -8871,8 +8871,8 @@ namespace YLErp.Web.Controllers trade_Report.RecoveryPerformanceColl = (decimal)marinRate.MaintenanceRate * 100; trade_Report.UnwindPerformanceColl = trade_Report.RecoveryPerformanceColl; trade_Report.EodPerformanceColl = trade_Report.RecoveryPerformanceColl; - trade_Report.PerformanceCollType = "现金"; - trade_Report.PerformanceCollRange = "仅本笔交易"; + trade_Report.PerformanceCollType = "0"; + trade_Report.PerformanceCollRange = "0"; trade_Report.PerformanceRemark = "详见交易确认书及定义性文件"; #endregion } diff --git a/YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs b/YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs index 90d4c3d5..3992ff4e 100644 --- a/YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs +++ b/YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs @@ -11,6 +11,7 @@ namespace YLErp.Web.Hubs public class SwapConfirmSendEmailHub : Hub { private static bool isProcessing = false; + protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapConfirmSendEmailHub).FullName); static readonly Dictionary _dic = new Dictionary(StringComparer.OrdinalIgnoreCase); static readonly Dictionary _clientProgressDic = new Dictionary(); public async Task StartProcessing(string jsonString) @@ -77,6 +78,7 @@ namespace YLErp.Web.Hubs } catch (Exception ex) { + Log.Error("确认书发邮件报错", ex); isProcessing = false; await client.SendAsync("ExceptionMessage", ex.Message); } diff --git a/YLErpWeb/Hubs/SwapFlowCombookingHub.cs b/YLErpWeb/Hubs/SwapFlowCombookingHub.cs index c5300b24..950487d8 100644 --- a/YLErpWeb/Hubs/SwapFlowCombookingHub.cs +++ b/YLErpWeb/Hubs/SwapFlowCombookingHub.cs @@ -16,6 +16,7 @@ namespace YLErp.Web.Hubs { private static bool isProcessing = false; private static string currentStep = null; + protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapFlowCombookingHub).FullName); public async Task StartProcessing( string jsonString) { SwpFlowCombookingReq req = JsonHelper.Deserialize(jsonString); @@ -92,6 +93,7 @@ namespace YLErp.Web.Hubs } catch (Exception ex) { + Log.Error("成交簿记报错",ex); isProcessing = false; await client.SendAsync("ExceptionMessage", ex.Message); } diff --git a/YLErpWeb/Hubs/SwapFlowResetHub.cs b/YLErpWeb/Hubs/SwapFlowResetHub.cs index c18df849..92ffaef4 100644 --- a/YLErpWeb/Hubs/SwapFlowResetHub.cs +++ b/YLErpWeb/Hubs/SwapFlowResetHub.cs @@ -9,6 +9,7 @@ namespace YLErp.Web.Hubs public class SwapFlowResetHub:Hub { private static bool isProcessing = false; + protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapFlowResetHub).FullName); public async Task StartProcessing(string jsonString) { SwpFlowResetReq req = JsonHelper.Deserialize(jsonString); @@ -55,6 +56,7 @@ namespace YLErp.Web.Hubs } catch (Exception ex) { + Log.Error("簿记重置报错", ex); isProcessing = false; await client.SendAsync("ExceptionMessage", ex.Message); } diff --git a/YLErpWeb/Views/trade/tradeSubmissionFields.cshtml b/YLErpWeb/Views/trade/tradeSubmissionFields.cshtml index b3d5fee9..d3c03dd8 100644 --- a/YLErpWeb/Views/trade/tradeSubmissionFields.cshtml +++ b/YLErpWeb/Views/trade/tradeSubmissionFields.cshtml @@ -286,7 +286,7 @@ @@ -296,7 +296,7 @@