From f972a3f668eb1c534df17f8aa86336701af60c93 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 12 Sep 2023 16:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=9D=A1=E4=BB=B6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/Order/OrderBusiness.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 0ba7854..0b95bf7 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -71,7 +71,7 @@ namespace BBWYB.Server.Business
                                           .WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId)
                                           .WhereIf(request.IsWaitConfig && request.IsOnlyDisplayPackConfigEditState != 1, osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null)
                                           .WhereIf(request.IsWaitConfig && request.IsOnlyDisplayPackConfigEditState == 1, osku => osku.PackConfigState == Enums.PackConfigState.需修改);
-                    select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && 
+                    select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 &&
                                                                                    o.OrderState != Enums.OrderState.已完成 &&
                                                                                    o.IntoStoreType == Enums.IntoStoreType.发回齐越 &&
                                                                                    o.IsPurchased == true)
@@ -828,12 +828,12 @@ namespace BBWYB.Server.Business
             return new OrderCountByStateResponse()
             {
                 WaitPayCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待付款)?.OrderCount ?? 0,
-                WaitPurchaseCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.等待采购 ||
-                                                                        o.OrderState == Enums.OrderState.部分采购)?.OrderCount ?? 0,
-                WaitShipmentCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待发货 ||
-                                                                        o.OrderState == Enums.OrderState.部分发货)?.OrderCount ?? 0,
-                WaitReceiveCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待收货 ||
-                                                                       o.OrderState == Enums.OrderState.部分收货)?.OrderCount ?? 0,
+                WaitPurchaseCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.等待采购 ||
+                                                               o.OrderState == Enums.OrderState.部分采购).Sum(o => o.OrderCount),
+                WaitShipmentCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.待发货 ||
+                                                               o.OrderState == Enums.OrderState.部分发货).Sum(o => o.OrderCount),
+                WaitReceiveCount = orderCountGroup.Where(o => o.OrderState == Enums.OrderState.待收货 ||
+                                                              o.OrderState == Enums.OrderState.部分收货).Sum(o => o.OrderCount),
                 WaitCheckCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待验收)?.OrderCount ?? 0,
                 WaitComputationCount = orderCountGroup.FirstOrDefault(o => o.OrderState == Enums.OrderState.待核算)?.OrderCount ?? 0,
                 WaitConfigCount = waitConfigCount,