调整订单状态判定算法

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);
+        }
     }
 }

BBWYB.Server.Business/Extensions/OrderStateExtension.cs

@@ -59,13 +59,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.部分发货))
+            {
+                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
 
             #region 待收货
@@ -78,13 +85,21 @@ 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.部分收货))
+            {
+                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
 
             #region 打包中