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 @@
/// 待发货 = 2, 部分发货 = 120
/// 待收货 = 3, 部分收货 = 130
/// 已完成 = 4
- /// 锁定 = 5
/// 已取消 = 6
- /// 暂停 = 7
- /// 已退款 = 8
- /// Unknow = 100
/// 待验收 = 140
/// 待核算 = 150
///
@@ -96,14 +92,9 @@
待收货 = 3,
部分收货 = 130,
已完成 = 4,
- 锁定 = 5,
已取消 = 6,
- 暂停 = 7,
- 已退款 = 8,
- Unknow = 100,
待验收 = 140,
待核算 = 150
- //待配置 = 101,
}
///