From 2f793df9fe3903bc12af2b46ad8058ee94e59968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Wed, 7 May 2025 13:41:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B9=A6=E7=BC=96=E5=8F=B7=E6=97=A0=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/SwapModule/SwapTradeService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs index 5495169a..d24974aa 100644 --- a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs @@ -1050,15 +1050,14 @@ namespace YLErp.Modules.SwapModule { gsum.TradePriceSum = query.Sum(q => q.TradePrice); } - + var tradeids = retListResult.rows.Select(r => r.id).ToList(); + var list = DbContext.trade_contract_r.Where(O => tradeids.Contains(O.TradeId) && O.IsValid && O.Type == "交易确认书").AsEnumerable(); + var contractCodeDict = list.GroupBy(O => O.TradeId).ToDictionary(K => K.Key, V => V.LastOrDefault().ContractCode); //获取销售提成信息 foreach (var item in retListResult.rows) { + item.ContractCode = contractCodeDict.TryGetValue(item.id, out var code) ? code : ""; item.SalesCommission = new SalesModule.SalesCommissionDataService(OptUser).GetTradeCommissionInfo(item.id); - if (PS.Config.Is方顿 && item.SalesCommission?.Commission != null) - { - item.SalesCommission.Commission = item.SalesCommission.Commission * item.SalesCommission.SalesIds.Count(); - } } retListResult.Sum = gsum; return retListResult;