From ad716810bee803d15deb2c141c40d2557c6a249b Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 19 Sep 2022 23:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=B7=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=20=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=A1=E4=BB=B6=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/Enums.cs                       |  3 ++-
 .../ViewModels/Order/OrderListViewModel.cs        |  2 +-
 BBWY.Client/Views/Order/SD.xaml                   |  3 ++-
 BBWY.Server.Business/Order/OrderBusiness.cs       | 15 +++++++++------
 .../Dto/Request/Order/SearchOrderRequest.cs       |  7 ++++++-
 BBWY.Server.Model/Enums.cs                        |  3 ++-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 8a18c58c..0525c7ad 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -99,7 +99,8 @@
     {
         自刷 = 0,
         其他 = 1,
-        京礼金 = 2
+        京礼金 = 2,
+        刷单组 = 3
     }
 
     /// <summary>
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 62419d7a..3d94e288 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -477,7 +477,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (storageType == StorageType.SD)
             {
-                var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, string.Empty, 0M, 0M);
+                var sd = new SD(orderId, true, order.VenderRemark, order.Flag, string.Empty, null, string.Empty, globalContext.User.Name, 0M, 0M);
                 sd.Closed += Sd_Closed;
                 sd.ShowDialog();
             }
diff --git a/BBWY.Client/Views/Order/SD.xaml b/BBWY.Client/Views/Order/SD.xaml
index 085a228f..5771f383 100644
--- a/BBWY.Client/Views/Order/SD.xaml
+++ b/BBWY.Client/Views/Order/SD.xaml
@@ -77,7 +77,8 @@
             <c:BTextBox x:Name="txt_SDPayBillNo" Grid.Column="1" Grid.Row="5" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
 
             <TextBlock Text="刷单人" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="6"/>
-            <c:BTextBox x:Name="txt_SDOperator" Grid.Column="1" Grid.Row="6" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>
+            <c:BTextBox x:Name="txt_SDOperator" Grid.Column="1" Grid.Row="6" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"
+                        IsEnabled="False" DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>
 
             <TextBlock Text="标签" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="7"/>
             <ComboBox x:Name="cbx_flag" Grid.Column="1" Grid.Row="7" Height="25" Width="100"  
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 1ce40f2b..b9a24693 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -38,7 +38,7 @@ namespace BBWY.Server.Business
             freeSqlMultiDBManagerLazy = new Lazy<FreeSqlMultiDBManager>(() => serviceProvider.GetService<FreeSqlMultiDBManager>());
         }
 
-        private ISelect<Order, OrderConsignee, OrderCost> GetOrderListSelect(SearchOrderRequest searchOrderRequest)
+        private ISelect<Order, OrderConsignee, OrderCost> GetOrderListQueryConditions(SearchOrderRequest searchOrderRequest)
         {
             var select = fsql.Select<Order, OrderConsignee, OrderCost>().LeftJoin((o, ocs, oct) => o.Id == ocs.OrderId)
                                                                         .LeftJoin((o, ocs, oct) => o.Id == oct.OrderId);
@@ -72,7 +72,10 @@ namespace BBWY.Server.Business
                                .WhereIf(string.IsNullOrEmpty(searchOrderRequest.Waybill) == false, (o, ocs, oct) => o.WaybillNo == searchOrderRequest.Waybill);
             }
 
-            select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId);
+            select = select.WhereIf(searchOrderRequest.ShopId != null, (o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId)
+                           .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct) => o.SDOperator == searchOrderRequest.SDOperator);
+
+            //select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId);
 
             return select;
         }
@@ -142,12 +145,12 @@ namespace BBWY.Server.Business
                 searchOrderRequest.EndDate = searchOrderRequest.EndDate.Value.Date.AddDays(1).AddSeconds(-1);
 
 
-            var noCancelSelect = GetOrderListSelect(searchOrderRequest);
+            var noCancelSelect = GetOrderListQueryConditions(searchOrderRequest);
             var currentConditionsTotalProfit = noCancelSelect.Where((o, ocs, oct) => o.OrderState != Enums.OrderState.已取消).ToAggregate((o, ocs, oct) => oct.Sum(oct.Key.Profit));
 
-            var select = GetOrderListSelect(searchOrderRequest).OrderByDescending((o, ocs, oct) => o.StartTime)
-                                                               .Count(out var total)
-                                                               .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
+            var select = GetOrderListQueryConditions(searchOrderRequest).OrderByDescending((o, ocs, oct) => o.StartTime)
+                                                                        .Count(out var total)
+                                                                        .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
 
             var orderSourceList = select.ToList(GetOrderListField());
             var orderList = orderSourceList.Map<IList<OrderResponse>>();
diff --git a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
index 74e8e388..65bf22e6 100644
--- a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
@@ -9,7 +9,7 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public string OrderId { get; set; }
 
-        public long ShopId { get; set; }
+        public long? ShopId { get; set; }
 
         public DateTime? StartDate { get; set; }
 
@@ -65,5 +65,10 @@ namespace BBWY.Server.Model.Dto
 
         public bool IncludeExceptionOrder { get; set; }
 
+        /// <summary>
+        /// 刷单人
+        /// </summary>
+        public string SDOperator { get; set; }
+
     }
 }
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 130936aa..ded1b555 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -92,7 +92,8 @@
         {
             自刷 = 0,
             其他 = 1,
-            京礼金 = 2
+            京礼金 = 2,
+            刷单组 = 3
         }
 
         /// <summary>