From cdd1d6d4cc65d1e2f576e22833cf199afa74dce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 5 Feb 2021 10:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=98=E5=AE=9D=E7=AD=9B=E9=80=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Hncore.Pass.Sells/Controllers/TaoBaoController.cs     | 8 ++++++++
 .../Hncore.Pass.Sells/Request/Coupon/TaoBaoRequest.cs     | 1 +
 2 files changed, 9 insertions(+)

diff --git a/Services/Hncore.Pass.Sells/Controllers/TaoBaoController.cs b/Services/Hncore.Pass.Sells/Controllers/TaoBaoController.cs
index d1f492e..e4595f8 100644
--- a/Services/Hncore.Pass.Sells/Controllers/TaoBaoController.cs
+++ b/Services/Hncore.Pass.Sells/Controllers/TaoBaoController.cs
@@ -50,6 +50,10 @@ namespace Hncore.Pass.Live.Controllers
                 expr = expr.Or(m => m.Tid.Contains(request.KeyWord));
                 expr = expr.Or(m => m.BuyerNick.Contains(request.KeyWord));             
             }
+            if (request.shop.Has())
+            {
+                expr = expr.And(m => m.SellerNick.Contains(request.shop));           
+            }
             if (request.BTime.HasValue && request.ETime.HasValue)
             {
                 expr = expr.And(m => m.Created >= request.BTime && m.Created <= request.ETime);
@@ -70,6 +74,10 @@ namespace Hncore.Pass.Live.Controllers
             {
                 expr = expr.And(m => m.CreateDate >= request.BTime && m.CreateDate <= request.ETime);
             }
+            if (request.shop.Has())
+            {
+                expr = expr.And(m => m.SellerNick.Contains(request.shop));           
+            }
             var ret = await m_SellerTaoBaoService.Query(expr).ToListAsync();
 
 
diff --git a/Services/Hncore.Pass.Sells/Request/Coupon/TaoBaoRequest.cs b/Services/Hncore.Pass.Sells/Request/Coupon/TaoBaoRequest.cs
index cc7df56..94f4435 100644
--- a/Services/Hncore.Pass.Sells/Request/Coupon/TaoBaoRequest.cs
+++ b/Services/Hncore.Pass.Sells/Request/Coupon/TaoBaoRequest.cs
@@ -9,5 +9,6 @@ namespace Hncore.Pass.Sells.Request.RedeemCode
         public DateTime? BTime { get; set; }
 
         public DateTime? ETime { get; set; }
+        public string shop { get; set; }
     }
 }