From bd222eb7d4ddafe2a2b4004e75c96976b783c207 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 3 Jul 2023 23:32:11 +0800
Subject: [PATCH] 1

---
 BBWYB.Server.Business/Extensions/OrderStateExtension.cs      | 5 ++---
 BBWYB.Server.Business/Order/OrderBusiness.cs                 | 4 ++--
 BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs | 3 +--
 BBWYB.Server.Model/Enums.cs                                  | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
index 8cf2adc..1bf9ad0 100644
--- a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
+++ b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
@@ -21,8 +21,7 @@ namespace BBWYB.Server.Business
         {
             if (order.OrderState == Enums.OrderState.已取消 ||
                 order.OrderState == Enums.OrderState.已完成 ||
-                order.OrderState == Enums.OrderState.待付款 ||
-                order.OrderState == Enums.OrderState.待完结)
+                order.OrderState == Enums.OrderState.待付款)
                 return;
 
             if (orderSkuList == null)
@@ -106,7 +105,7 @@ namespace BBWYB.Server.Business
             if (orderPurchaseInfoList.Any(opi => opi.OrderState == Enums.PurchaseOrderState.已签收) &&
                 orderPurchaseInfoList.Count(opi => opi.OrderState == Enums.PurchaseOrderState.已签收) == orderPurchaseInfoList.Count())
             {
-                order.OrderState = Enums.OrderState.打包中;
+                order.OrderState = Enums.OrderState.待验收;
                 return;
             }
             #endregion
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 1e98780..a404352 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -54,8 +54,8 @@ namespace BBWYB.Server.Business
                     select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any());
                 }
                 select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 ||
-                                        request.OrderState == Enums.OrderState.打包中 ||
-                                        request.OrderState == Enums.OrderState.待完结 ||
+                                        request.OrderState == Enums.OrderState.待验收 ||
+                                         request.OrderState == Enums.OrderState.待核算 ||
                                         request.OrderState == Enums.OrderState.已完成 ||
                                         request.OrderState == Enums.OrderState.已取消,
                                         (o, ocs, oct) => o.OrderState == request.OrderState)
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 1178aed..74f7935 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -58,8 +58,7 @@ namespace BBWYB.Server.Business
             {
                 Enums.OrderState.已取消,
                 Enums.OrderState.已完成,
-                Enums.OrderState.待付款,
-                Enums.OrderState.待完结
+                Enums.OrderState.待付款
             };
         }
 
diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs
index bc848a1..4e3962c 100644
--- a/BBWYB.Server.Model/Enums.cs
+++ b/BBWYB.Server.Model/Enums.cs
@@ -84,6 +84,7 @@
         /// <para>已退款 = 8</para>
         /// <para>Unknow = 100</para>
         /// <para>待验收 = 140</para>
+        /// <para>待核算 = 150</para>
         /// </summary>
         public enum OrderState
         {
@@ -100,8 +101,8 @@
             暂停 = 7,
             已退款 = 8,
             Unknow = 100,
-            待验收 = 140
-
+            待验收 = 140,
+            待核算 = 150
             //待配置 = 101,
         }