新增刷单组枚举

订单查询接口条件改动

BBWY.Client/Models/Enums.cs

@@ -99,7 +99,8 @@
     {
         自刷 = 0,
         其他 = 1,
-        京礼金 = 2
+        京礼金 = 2,
+        刷单组 = 3
     }
 
     /// <summary>

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();
             }

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"  

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)
+            var select = GetOrderListQueryConditions(searchOrderRequest).OrderByDescending((o, ocs, oct) => o.StartTime)
-                                                               .Count(out var total)
+                                                                        .Count(out var total)
-                                                               .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
+                                                                        .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
 
             var orderSourceList = select.ToList(GetOrderListField());
             var orderList = orderSourceList.Map<IList<OrderResponse>>();

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; }
+
     }
 }

BBWY.Server.Model/Enums.cs

@@ -92,7 +92,8 @@
         {
             自刷 = 0,
             其他 = 1,
-            京礼金 = 2
+            京礼金 = 2,
+            刷单组 = 3
         }
 
         /// <summary>