From e796692efba26bea17f38d7cb6abb2c6087f4ecf Mon Sep 17 00:00:00 2001 From: gongpei Date: Mon, 10 Nov 2025 16:53:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E7=9A=84=E6=88=90=E4=BA=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExchangeTradeSyncApiService.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/YLErpDAL/Modules/ExchangeTradeModule/ExchangeTradeSyncApiService.cs b/YLErpDAL/Modules/ExchangeTradeModule/ExchangeTradeSyncApiService.cs index 8d7aa29f..06353b88 100644 --- a/YLErpDAL/Modules/ExchangeTradeModule/ExchangeTradeSyncApiService.cs +++ b/YLErpDAL/Modules/ExchangeTradeModule/ExchangeTradeSyncApiService.cs @@ -21,7 +21,7 @@ namespace YLErp.Modules.ExchangeTradeModule } - public int Save(ExchangeTradeSaveApiReq req,string tradeSource) + public int Save(ExchangeTradeSaveApiReq req, string tradeSource) { if (req.TradeDate == DateTime.MinValue) { @@ -76,7 +76,7 @@ namespace YLErp.Modules.ExchangeTradeModule if (req.TradeNumber.EndsWith("_dzrh_")) { var lastTradeDate = QdpCalendarHelper.GetNonHolidayDefore(req.TradeDate.AddDays(-1)); - if(DbContext.ExchangeTrade.Any(x => (x.TradeDate == req.TradeDate || x.TradeDate == lastTradeDate) && x.TradeNumber == req.TradeNumber)) + if (DbContext.ExchangeTrade.Any(x => (x.TradeDate == req.TradeDate || x.TradeDate == lastTradeDate) && x.TradeNumber == req.TradeNumber)) { return 0; } @@ -134,7 +134,7 @@ namespace YLErp.Modules.ExchangeTradeModule } //将req转换交易对象 - private ExchangeTrade PrepareReqTrad(ExchangeTradeSaveApiReq req,string tradeSource= "下单同步") + private ExchangeTrade PrepareReqTrad(ExchangeTradeSaveApiReq req, string tradeSource = "下单同步") { var td = new ExchangeTrade { @@ -275,7 +275,8 @@ namespace YLErp.Modules.ExchangeTradeModule a.VarietyIds, a.TraderIds, BookId = b != null ? b.id : 0, - BookName = b != null ? b.Name : "" + BookName = b != null ? b.Name : "", + a.Description }; var accbooks = query.ToList(); @@ -330,7 +331,7 @@ namespace YLErp.Modules.ExchangeTradeModule } } td.TraderId = trader?.Id ?? UserId; - td.TraderName = trader?.Name ?? UserName ?? "系统"; + td.TraderName = (trader == null && !string.IsNullOrWhiteSpace(accbook?.Description)) ? accbook.Description.Trim() : trader?.Name ?? UserName ?? "系统"; } } }