From 9b4cff8a5408c9695ded29433126462c9b212ca9 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 6 Jul 2023 21:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95zhuangtia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/Sync/OrderSyncBusiness.cs | 4 ++--
 BBWYB.Server.Model/Enums.cs                     | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 5659490..67e235d 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -239,7 +239,7 @@ namespace BBWYB.Server.Business.Sync
             }
         }
 
-        private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPay, bool isPurchased)
+        private Enums.OrderState? ConvertQuanTanOrderState(string qtOrderState, bool isPay, bool isPurchased)
         {
             /*
 -1、已取消；
@@ -267,7 +267,7 @@ namespace BBWYB.Server.Business.Sync
                 return Enums.OrderState.待收货;
             if (qtOrderState == "3")
                 return Enums.OrderState.已完成;
-            return Enums.OrderState.Unknow;
+            return null;
         }
     }
 }
diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs
index d6b348d..a64c561 100644
--- a/BBWYB.Server.Model/Enums.cs
+++ b/BBWYB.Server.Model/Enums.cs
@@ -78,11 +78,7 @@
         /// <para>待发货 = 2, 部分发货 = 120</para>
         /// <para>待收货 = 3, 部分收货 = 130</para>
         /// <para>已完成 = 4</para>
-        /// <para>锁定 = 5</para>
         /// <para>已取消 = 6</para>
-        /// <para>暂停 = 7</para>
-        /// <para>已退款 = 8</para>
-        /// <para>Unknow = 100</para>
         /// <para>待验收 = 140</para>
         /// <para>待核算 = 150</para>
         /// </summary>
@@ -96,14 +92,9 @@
             待收货 = 3,
             部分收货 = 130,
             已完成 = 4,
-            锁定 = 5,
             已取消 = 6,
-            暂停 = 7,
-            已退款 = 8,
-            Unknow = 100,
             待验收 = 140,
             待核算 = 150
-            //待配置 = 101,
         }
 
         /// <summary>