From 06b694672023b3948867904d9f451a3dd2a5091b 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 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ProductAccountController.cs   | 65 ++++++++++++++++---
 1 file changed, 57 insertions(+), 8 deletions(-)

diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
index 1ca006e..faa3943 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
@@ -351,26 +351,38 @@ namespace Hncore.Pass.Vpn.Controllers
         {
 
             Expression<Func<ProductAccountEntity, bool>> expr = m => 1 == 1;
+
             if (request.UserId > 0)
             {
                 expr = expr.And(m => m.UserId == request.UserId);
             }
             if (request.KeyWord.Has())
             {
-                expr = expr.And(m => m.Account.Contains(request.KeyWord));
+                expr = expr.And(m => m.UserCode.Contains(request.KeyWord)
+                || m.ProductName.Contains(request.KeyWord)
+                || m.PackageName.Contains(request.KeyWord)
+                || m.Account.Contains(request.KeyWord));
             }
-            if (request.ProductId.HasValue)
+            if (request.ProductIds != null && request.ProductIds.Count > 0)
             {
-                expr = expr.And(m => m.ProductId == request.ProductId);
+                expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId));
             }
-            if (request.PackageId.HasValue)
+            if (request.PackageNames != null && request.PackageNames.Count > 0)
             {
-                expr = expr.And(m => m.PackageId == request.PackageId);
+                expr = expr.And(m =>request.PackageNames.Contains((string)m.PackageName));
             }
-            if (request.AccountTypes != null && request.AccountTypes.Count > 0)
+            if (request.AccountTypes!=null&&request.AccountTypes.Count>0)
             {
                 expr = expr.And(m => request.AccountTypes.Contains(m.AccountType));
             }
+            if (request.BTime.HasValue && request.ETime.HasValue)
+            {
+                expr = expr.And(m => m.EndTime>=request.BTime&&m.EndTime<=request.ETime);
+            }
+            if (request.BkTime.HasValue && request.EkTime.HasValue)
+            {
+                expr = expr.And(m => m.StartTime>=request.BkTime&&m.StartTime<=request.EkTime);
+            }
             if (request.ExpirdDay > -1)
             {
                 if (request.ExpirdDay == 0)
@@ -383,9 +395,46 @@ namespace Hncore.Pass.Vpn.Controllers
                     startTime = startTime < DateTime.Now ? DateTime.Now : startTime;
                     var EndTime = DateTime.Now.End().AddDays(request.ExpirdDay);
                     expr = expr.And(m => m.EndTime >= startTime && m.EndTime <= EndTime);
-                }
-                // expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
+                }               
+               // expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
             }
+
+
+            // if (request.UserId > 0)
+            // {
+            //     expr = expr.And(m => m.UserId == request.UserId);
+            // }
+            // if (request.KeyWord.Has())
+            // {
+            //     expr = expr.And(m => m.Account.Contains(request.KeyWord));
+            // }
+            // if (request.ProductId.HasValue)
+            // {
+            //     expr = expr.And(m => m.ProductId == request.ProductId);
+            // }
+            // if (request.PackageId.HasValue)
+            // {
+            //     expr = expr.And(m => m.PackageId == request.PackageId);
+            // }
+            // if (request.AccountTypes != null && request.AccountTypes.Count > 0)
+            // {
+            //     expr = expr.And(m => request.AccountTypes.Contains(m.AccountType));
+            // }
+            // if (request.ExpirdDay > -1)
+            // {
+            //     if (request.ExpirdDay == 0)
+            //     {
+            //         expr = expr.And(m => m.EndTime.Value < DateTime.Now);
+            //     }
+            //     else
+            //     {
+            //         var startTime = DateTime.Now.Begin().AddDays(request.ExpirdDay);
+            //         startTime = startTime < DateTime.Now ? DateTime.Now : startTime;
+            //         var EndTime = DateTime.Now.End().AddDays(request.ExpirdDay);
+            //         expr = expr.And(m => m.EndTime >= startTime && m.EndTime <= EndTime);
+            //     }
+            //     // expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay);
+            // }
             var ret = await m_AccountService.PageDesc(request.PageIndex,10000, expr, true, m => m.Id);
 
             var data = new ExcelData<ProductAccountEntity>