From ccb9c055a572263947559958b019ac4a34c6e637 Mon Sep 17 00:00:00 2001
From: zzh <1368735060@qq.com>
Date: Sat, 24 Oct 2026 11:31:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E5=8D=95=E5=88=97=E8=A1=A8=20e?=
 =?UTF-8?q?nrichment=20=E6=94=B9=E4=B8=BA=E9=A1=BA=E5=BA=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E9=81=BF=E5=85=8D=20MySqlConnection=20?=
 =?UTF-8?q?=E5=B9=B6=E5=8F=91=E5=A4=8D=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Services/Orders/OrderService.Helpers.cs   | 78 +++++++------------
 1 file changed, 26 insertions(+), 52 deletions(-)

diff --git a/src/Oms.Application/Services/Orders/OrderService.Helpers.cs b/src/Oms.Application/Services/Orders/OrderService.Helpers.cs
index 9e91592..c64ecff 100644
--- a/src/Oms.Application/Services/Orders/OrderService.Helpers.cs
+++ b/src/Oms.Application/Services/Orders/OrderService.Helpers.cs
@@ -298,7 +298,7 @@ public partial class OrderService
     }
 
     /// <summary>
-    /// 列表页专用映射：不加载申报明细/费用明细，并行 enrichment，减小 JSON 与 DB 开销。
+    /// 列表页专用映射：不加载申报明细/费用明细，批量 enrichment，减小 JSON 与 DB 开销。
     /// </summary>
     private async Task<List<OrderOutput>> MapOrderListOutputsAsync(IReadOnlyCollection<Order> orders)
     {
@@ -335,58 +335,32 @@ public partial class OrderService
             .Distinct()
             .ToArray();
 
-        var sendersTask = OrderRepository.GetSendersByOrderIdsAsync(orderIds);
-        var recipientsTask = OrderRepository.GetRecipientsByOrderIdsAsync(orderIds);
-        var weightsTask = OrderRepository.GetWeightsByOrderIdsAsync(orderIds);
-        var receivableSumTask = OrderRepository.GetReceivableSumByOrderIdsAsync(orderIds);
-        var warehousesTask = warehouseIds.Length == 0
-            ? Task.FromResult(new List<WarehouseAddress>())
-            : WarehouseAddressRepository.GetListAsync(x => warehouseIds.Contains(x.Id));
-        var productsTask = productCodes.Length == 0
-            ? Task.FromResult(new List<SalesProduct>())
-            : SalesProductRepository.GetListAsync(x => productCodes.Contains(x.ProductCode));
-        var channelsTask = channelCodes.Length == 0
-            ? Task.FromResult(new List<ServiceChannel>())
-            : ServiceChannelRepository.GetListAsync(x => channelCodes.Contains(x.ChannelCode));
-        var countriesTask = countryCodes.Length == 0
-            ? Task.FromResult(new List<Country>())
-            : CountryRepository.GetListAsync(x => countryCodes.Contains(x.CountryCode));
-        var auditUserNameTask = UserDisplayNameResolver.ResolveManyAsync(
+        // SqlSugarScope 共用同一 MySqlConnection，不能 Task.WhenAll 并发查库（会报 already in use）
+        var senders = await OrderRepository.GetSendersByOrderIdsAsync(orderIds);
+        var recipients = await OrderRepository.GetRecipientsByOrderIdsAsync(orderIds);
+        var weights = await OrderRepository.GetWeightsByOrderIdsAsync(orderIds);
+        var receivableSumMap = await OrderRepository.GetReceivableSumByOrderIdsAsync(orderIds);
+        var warehouses = warehouseIds.Length == 0
+            ? []
+            : await WarehouseAddressRepository.GetListAsync(x => warehouseIds.Contains(x.Id));
+        var products = productCodes.Length == 0
+            ? []
+            : await SalesProductRepository.GetListAsync(x => productCodes.Contains(x.ProductCode));
+        var channels = channelCodes.Length == 0
+            ? []
+            : await ServiceChannelRepository.GetListAsync(x => channelCodes.Contains(x.ChannelCode));
+        var countries = countryCodes.Length == 0
+            ? []
+            : await CountryRepository.GetListAsync(x => countryCodes.Contains(x.CountryCode));
+        var auditUserNameMap = await UserDisplayNameResolver.ResolveManyAsync(
             orders.SelectMany(x => new[] { x.CreateUserId, x.UpdateUserId }));
-        var customersTask = customerIds.Length == 0
-            ? Task.FromResult(new List<Customer>())
-            : CustomerRepository.GetListAsync(x => customerIds.Contains(x.Id));
-        var pickupOrdersTask = pickupOrderIds.Length == 0
-            ? Task.FromResult(new List<PickupOrder>())
-            : PickupOrderRepository.GetListAsync(x => pickupOrderIds.Contains(x.Id));
-        var bindSummaryTask = LoadStockBindListSummariesAsync(orderIds);
-
-        await Task.WhenAll(
-            sendersTask,
-            recipientsTask,
-            weightsTask,
-            receivableSumTask,
-            warehousesTask,
-            productsTask,
-            channelsTask,
-            countriesTask,
-            auditUserNameTask,
-            customersTask,
-            pickupOrdersTask,
-            bindSummaryTask);
-
-        var senders = await sendersTask;
-        var recipients = await recipientsTask;
-        var weights = await weightsTask;
-        var receivableSumMap = await receivableSumTask;
-        var warehouses = await warehousesTask;
-        var products = await productsTask;
-        var channels = await channelsTask;
-        var countries = await countriesTask;
-        var auditUserNameMap = await auditUserNameTask;
-        var customers = await customersTask;
-        var pickupOrders = await pickupOrdersTask;
-        var bindSummaryMap = await bindSummaryTask;
+        var customers = customerIds.Length == 0
+            ? []
+            : await CustomerRepository.GetListAsync(x => customerIds.Contains(x.Id));
+        var pickupOrders = pickupOrderIds.Length == 0
+            ? []
+            : await PickupOrderRepository.GetListAsync(x => pickupOrderIds.Contains(x.Id));
+        var bindSummaryMap = await LoadStockBindListSummariesAsync(orderIds);
 
         var senderMap = senders.GroupBy(x => x.OrderId).ToDictionary(x => x.Key, x => x.First());
         var recipientMap = recipients.GroupBy(x => x.OrderId).ToDictionary(x => x.Key, x => x.First());