新增查询条件

BBWYB.Server.API/Controllers/OrderController.cs

@@ -151,7 +151,17 @@ namespace BBWYB.Server.API.Controllers
         [AllowAnonymous]
         public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request)
         {
-             orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+            orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+        }
+
+        /// <summary>
+        /// 设置/取消特殊单
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void SetSpecialOrder([FromBody] SetSpecialOrderRequest request)
+        {
+            orderBusiness.SetSpecialOrder(request);
         }
     }
 }

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -136,7 +136,10 @@ namespace BBWYB.Server.Business
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
-                               .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName);
+                               .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName)
+                               .WhereIf(request.IsOnlyDisplaySpecialOrder == 1, (o, ocs, oct) => o.IsSpecialOrder == 1)
+                               .WhereIf(request.IsOnlyDisplaySendQiYue == 1, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
+                               .WhereIf(request.IsOnlyDisplayPurchaserSendInStore == 1, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.厂商代发入仓);
             }
 
             select = select.WhereIf(request.ShopId != null, (o, ocs, oct) => o.ShopId == request.ShopId);
@@ -180,6 +183,7 @@ namespace BBWYB.Server.Business
                 IsWaitPack = o.IsWaitPack,
                 IntoStoreType = o.IntoStoreType,
                 PayTime = o.PayTime,
+                IsSpecialOrder = o.IsSpecialOrder,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,
@@ -822,5 +826,10 @@ namespace BBWYB.Server.Business
         {
             qikuManager.QikuPublishOrderSkuPackConfigState(request);
         }
+
+        public void SetSpecialOrder(SetSpecialOrderRequest request)
+        {
+            fsql.Update<Order>(request.OrderId).Set(o => o.IsSpecialOrder, request.IsSpecialOrder).ExecuteAffrows();
+        }
     }
 }

BBWYB.Server.Model/Db/Order/Order.cs

@@ -260,8 +260,9 @@ namespace BBWYB.Server.Model.Db
         public Enums.IntoStoreType? IntoStoreType { get; set; }
 
         /// <summary>
-        /// 
+        /// 是否为特殊单
         /// </summary>
+        [Column(DbType = "int(1)", IsNullable = true)]
         public int? IsSpecialOrder { get; set; }
     }
 

BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs

@@ -76,28 +76,43 @@
         public bool IsWaitConfig { get; set; }
 
         /// <summary>
-        /// 是否仅显示待采购超时,是=1否=0,只在订单状态为【待采购和部分采购】时生效
+        /// 是否仅显示待采购超时,是=1否=0,null则不处理该条件,只在订单状态为【待采购和部分采购】时生效
         /// </summary>
         public int? IsOnlyDisplayPurchaseTimeOut { get; set; }
 
         /// <summary>
-        /// 是否仅显示待发货超时,是=1否=0,只在订单状态为【待发货和部分发货】时生效
+        /// 是否仅显示待发货超时,是=1否=0,null则不处理该条件,只在订单状态为【待发货和部分发货】时生效
         /// </summary>
         public int? IsOnlyDisplayDeliveryTimeout { get; set; }
 
         /// <summary>
-        /// 是否仅显示待配置-需修改,是=1否=0,只在【IsWaitConfig=true】时生效
+        /// 是否仅显示待配置-需修改,是=1否=0,null则不处理该条件,只在【IsWaitConfig=true】时生效
         /// </summary>
         public int? IsOnlyDisplayPackConfigEditState { get; set; }
 
         /// <summary>
-        /// 是否仅显示配置超时,是=1否=0,只在【IsWaitConfig=true】时生效(优先)
+        /// 是否仅显示配置超时,是=1否=0,null则不处理该条件,只在【IsWaitConfig=true】时生效(优先)
         /// </summary>
         public int? IsOnlyDisplayCerConfigTimeOut { get; set; }
 
         /// <summary>
-        /// 是否仅显示核算超时,是=1否=0,只在订单状态为【待核算】时生效
+        /// 是否仅显示核算超时,是=1否=0,null则不处理该条件,只在订单状态为【待核算】时生效
         /// </summary>
         public int? IsOnlyDisplayCheckComputationTimeOut { get; set; }
+
+        /// <summary>
+        /// 是否仅显示发回齐越,是=1否=0,null则不处理该条件
+        /// </summary>
+        public int? IsOnlyDisplaySendQiYue { get; set; }
+
+        /// <summary>
+        /// 是否仅显示厂家代发入仓,是=1否=0,null则不处理该条件
+        /// </summary>
+        public int? IsOnlyDisplayPurchaserSendInStore { get; set; }
+
+        /// <summary>
+        /// 是否仅显示特殊单,是=1否=0,null则不处理该条件
+        /// </summary>
+        public int? IsOnlyDisplaySpecialOrder { get; set; }
     }
 }

BBWYB.Server.Model/Dto/Request/Order/SetSpecialOrderRequest.cs

@@ -0,0 +1,12 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class SetSpecialOrderRequest
+    {
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 是=1 否=1
+        /// </summary>
+        public int IsSpecialOrder { get; set; }
+    }
+}

BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

@@ -156,6 +156,11 @@
         public Enums.AutoEditOrderPriceType? IsAutoEditOrderPrice { get; set; }
 
         public IList<OrderMessageResponse> OrderMessageList { get; set; }
+
+        /// <summary>
+        /// 是否为特殊单 是=1 否=0
+        /// </summary>
+        public int? IsSpecialOrder { get; set; }
     }
 
     public class OrderListResponse