From 8a82beece72b3598035f76407762bea222262a17 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 2 Apr 2023 00:57:57 +0800
Subject: [PATCH] =?UTF-8?q?1)=20=E8=AE=A2=E5=8D=95=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5IsGift,=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E8=B5=A0=E5=93=81=202)=20=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=B5=A0=E5=93=81=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/Order/OrderBusiness.cs | 4 +++-
 BBWY.Server.Model/Db/Order/Order.cs         | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 48fa7d9e..59f0c485 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -86,7 +86,8 @@ namespace BBWY.Server.Business
             }
 
             select = select.WhereIf(searchOrderRequest.ShopId != null, (o, ocs, oct, sh) => o.ShopId == searchOrderRequest.ShopId)
-                           .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct, sh) => o.SDOperator == searchOrderRequest.SDOperator);
+                           .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct, sh) => o.SDOperator == searchOrderRequest.SDOperator)
+                           .Where((o, ocs, oct, sh) => o.IsGift == false);
 
             //select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId);
 
@@ -276,6 +277,7 @@ namespace BBWY.Server.Business
 
             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)
+                           .Where((o, ocs, oct) => o.IsGift == false)
                            .OrderByDescending((o, ocs, oct) => o.StartTime);
 
             var orderSourceList = select.ToList((o, ocs, oct) => new ExportOrderResponse()
diff --git a/BBWY.Server.Model/Db/Order/Order.cs b/BBWY.Server.Model/Db/Order/Order.cs
index 1ed909df..e6649953 100644
--- a/BBWY.Server.Model/Db/Order/Order.cs
+++ b/BBWY.Server.Model/Db/Order/Order.cs
@@ -179,6 +179,12 @@ namespace BBWY.Server.Model.Db
         [Column(DbType = "bit")]
         public bool IsAfterSaleOrder { get; set; } = false;
 
+        /// <summary>
+        /// 是否为赠品
+        /// </summary>
+        [Column(DbType = "bit")]
+        public bool IsGift { get; set; } = false;
+
         #region 订单成本
         /// <summary>
         /// 平台扣点金额