From 681479c99a715efdbf8aa97ba2b843ac4a2bdff6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 30 Jun 2023 14:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E5=AE=9A=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DataRepairController.cs       | 11 ++++++
 .../Extensions/OrderStateExtension.cs         | 35 +++++++++++++------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/BBWYB.Server.API/Controllers/DataRepairController.cs b/BBWYB.Server.API/Controllers/DataRepairController.cs
index a14d0c6..af2ca5e 100644
--- a/BBWYB.Server.API/Controllers/DataRepairController.cs
+++ b/BBWYB.Server.API/Controllers/DataRepairController.cs
@@ -46,5 +46,16 @@ namespace BBWYB.Server.API.Controllers
         {
             dataRepairBusiness.RepairOrderState(orderId);
         }
+
+        /// <summary>
+        /// 修复订单状态
+        /// </summary>
+        /// <param name="orderId"></param>
+        [HttpPost]
+        public void BatchRepairOrderState([FromBody] IList<string> orderIds)
+        {
+            foreach (var orderId in orderIds)
+                dataRepairBusiness.RepairOrderState(orderId);
+        }
     }
 }
diff --git a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
index f57b86f..8cf2adc 100644
--- a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
+++ b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
@@ -59,12 +59,19 @@ namespace BBWYB.Server.Business
 
             #region 部分发货
             if (orderPurchaseInfoList.Any(opi => opi.OrderState == Enums.PurchaseOrderState.待收货 ||
-                                                 opi.OrderState == Enums.PurchaseOrderState.部分发货) &&
-                orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.待收货 ||
-                                                   opi.OrderState == Enums.PurchaseOrderState.部分发货) < orderPurchaseInfoList.Count())
+                                                 opi.OrderState == Enums.PurchaseOrderState.部分发货))
             {
-                order.OrderState = Enums.OrderState.部分发货;
-                return;
+                if (orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.待收货 ||
+                                                       opi.OrderState == Enums.PurchaseOrderState.部分发货) < orderPurchaseInfoList.Count())
+                {
+                    order.OrderState = Enums.OrderState.部分发货;
+                    return;
+                }
+                if (orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.部分发货) == orderPurchaseInfoList.Count())
+                {
+                    order.OrderState = Enums.OrderState.部分发货;
+                    return;
+                }
             }
             #endregion
 
@@ -78,12 +85,20 @@ namespace BBWYB.Server.Business
 
             #region 部分收货
             if (orderPurchaseInfoList.Any(opi => opi.OrderState == Enums.PurchaseOrderState.已签收 ||
-                                                 opi.OrderState == Enums.PurchaseOrderState.部分收货) &&
-                orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.已签收 ||
-                                                   opi.OrderState == Enums.PurchaseOrderState.部分收货) < orderPurchaseInfoList.Count())
+                                                 opi.OrderState == Enums.PurchaseOrderState.部分收货))
             {
-                order.OrderState = Enums.OrderState.部分收货;
-                return;
+                if (orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.已签收 ||
+                                                       opi.OrderState == Enums.PurchaseOrderState.部分收货) < orderPurchaseInfoList.Count())
+                {
+                    order.OrderState = Enums.OrderState.部分收货;
+                    return;
+                }
+
+                if (orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.部分收货) == orderPurchaseInfoList.Count())
+                {
+                    order.OrderState = Enums.OrderState.部分收货;
+                    return;
+                }
             }
             #endregion