商品优化功能，筛选功能优化

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -583,7 +583,7 @@ namespace AllBase.Model.DBModel
 		/// </summary>
 		public string supplier_remark_exception { get; set; }
 		/// <summary>
-		/// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正 3 礼物单发货失败
+		/// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正 3 礼物单发货失败 4 礼物单已购买但微信发货失败 5 礼物单发货中
 		/// </summary>
 		public int? gift_order_status
 		{
@@ -595,8 +595,12 @@ namespace AllBase.Model.DBModel
 					GiftOrderStatusStr = "礼品单已购买";
 				else if (value == 3)
 					GiftOrderStatusStr = "礼品单购买失败";
+				else if (value == 4)
+					GiftOrderStatusStr = "礼物单已购买但微信发货失败";
+				else if (value == 5)
+					GiftOrderStatusStr = "礼物单发货中";
 				else
-					GiftOrderStatusStr = "";
+					GiftOrderStatusStr = "礼品单状态错误";
 				return;
 			}
 		}
@@ -773,6 +777,8 @@ namespace AllBase.Model.DBModel
 			// 直发或者云改直已购买且未退货，从异常单移除
 			if (orderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
 				return false;
+			if (gift_order_status == 1 || gift_order_status == 2)
+				return false;
 
 			if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
 				return true;