From 4e3185dc8f282242f195b8f30306144dcc84f51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 28 May 2021 11:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=92=8C?=
 =?UTF-8?q?=E7=94=B5=E8=84=91=E7=AB=AF=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91=20https://www.tapd.cn/39598945/prong/stories/view/113?=
 =?UTF-8?q?9598945001000223?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/UserController.cs                             | 1 +
 .../Hncore.Pass.Vpn/Controllers/ProductAccountController.cs    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs
index ad62581..5c0f1e5 100644
--- a/Host/Controllers/UserController.cs
+++ b/Host/Controllers/UserController.cs
@@ -526,6 +526,7 @@ namespace Home.Controllers
                 } else if (request.ExpiredDay==-6) {
                     exp = exp.And(m => m.EndTime < DateTime.Now);
                 }
+                exp = exp.And(m => m.PackageName != "测试卡");
             }
 
             if (request.ETime.HasValue && request.BTime.HasValue)
diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
index c82cf8c..c04f282 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
@@ -165,7 +165,8 @@ namespace Hncore.Pass.Vpn.Controllers
                     expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4);
                 }else if (request.ExpirdDay > 0){
                     expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= request.ExpirdDay && m.EndTime > DateTime.Now);
-                }           
+                }      
+                expr = expr.And(m => m.PackageName != "测试卡");     
                // expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
             }
             var ret = await m_AccountService.PageDesc(request.PageIndex, request.PageSize, expr,true,m=>m.Id);