交易查询确认书编号无值修复

2025-05-07 13:41:57 +08:00
parent ecdb3a176f
commit 2f793df9fe
1 changed files with 4 additions and 5 deletions
@@ -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;