From 8ad6c9b244e112c0b4e5e78c855a922325968f93 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 18 Sep 2022 19:22:53 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Models/Enums.cs                 | 2 +-
 BBWY.Client/Models/Order/Order.cs           | 8 +++++---
 BBWY.Client/Views/Order/OrderList.xaml      | 1 -
 BBWY.Server.Business/Order/OrderBusiness.cs | 9 +++++----
 BBWY.Server.Model/Enums.cs                  | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index f6300212..8a18c58c 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -98,7 +98,7 @@
     public enum SDType
     {
         自刷 = 0,
-        精准打标 = 1,
+        其他 = 1,
         京礼金 = 2
     }
 
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index aa084909..52faa95f 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -214,9 +214,11 @@ namespace BBWY.Client.Models
         {
             get
             {
-                return StorageType != null && StorageType != Models.StorageType.SD &&
-                       ((OrderCost?.BeforeTotalCost ?? 0M) == 0M ||
-                       (OrderCost?.BeforeTotalCost ?? 0M) > OrderSellerPrice + FreightPrice);
+                var beforeTotalCost = OrderCost?.BeforeTotalCost ?? 0M;
+                return OrderState != OrderState.已取消 && StorageType != Models.StorageType.SD &&
+                       ((StorageType != null && beforeTotalCost == 0M) ||
+                        (beforeTotalCost > OrderSellerPrice + FreightPrice) ||
+                        (StorageType == null && OrderState != OrderState.等待采购));
             }
         }
 
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 8c146025..739b2efe 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -589,7 +589,6 @@
                                     </ListBox.ItemTemplate>
                                 </ListBox>
 
-
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" HorizontalAlignment="Right"/>
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right"/>
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="4" HorizontalAlignment="Right"/>
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index c7ad6641..23019a2d 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -60,10 +60,11 @@ namespace BBWY.Server.Business
                 select = select.WhereIf(searchOrderRequest.OrderState != null, (o, ocs, oct) => o.OrderState == searchOrderRequest.OrderState)
                                .WhereIf(searchOrderRequest.StartDate != null, (o, ocs, oct) => o.StartTime >= searchOrderRequest.StartDate)
                                .WhereIf(searchOrderRequest.EndDate != null, (o, ocs, oct) => o.StartTime <= searchOrderRequest.EndDate)
-                               .WhereIf(searchOrderRequest.IncludeExceptionOrder, (o, ocs, oct) => o.StorageType != null && o.StorageType != Enums.StorageType.SD &&
-                                                                                                (oct.PurchaseAmount == 0M ||
-                                                                                                oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice))
-                               //.WhereIf(searchOrderRequest.IsContainsAfterSaleOrder != null, (o, ocs, oct) => o.IsAfterSaleOrder == searchOrderRequest.IsContainsAfterSaleOrder)
+                               .WhereIf(searchOrderRequest.IncludeExceptionOrder,
+                                        (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.StorageType != Enums.StorageType.SD &&
+                                                         ((o.StorageType != null && oct.PurchaseAmount == 0M) ||
+                                                         (oct.PurchaseAmount + oct.DeliveryExpressFreight > o.OrderSellerPrice + o.FreightPrice) ||
+                                                         (o.StorageType == null && o.OrderState != Enums.OrderState.等待采购)))
                                .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct) => o.StorageType == Enums.StorageType.代发)
                                .WhereIf(searchOrderRequest.ExcludeCanceled, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消)
                                .WhereIf(searchOrderRequest.ExcludeSD && !searchOrderRequest.OnlyDF, (o, ocs, oct) => o.StorageType == null || o.StorageType != Enums.StorageType.SD)
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 8f61b85f..130936aa 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -91,7 +91,7 @@
         public enum SDType
         {
             自刷 = 0,
-            精准打标 = 1,
+            其他 = 1,
             京礼金 = 2
         }