From 40a690bded84432dd748ffd66d837463f090ca09 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 18:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91=20https://www.tapd.cn/39598945/prong/stories?=
 =?UTF-8?q?/view/1139598945001000225?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ProductAccountController.cs   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
index c04f282..c1e2706 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
@@ -188,6 +188,27 @@ namespace Hncore.Pass.Vpn.Controllers
             if (request.KeyWord.Has())
             {
                 Expression<Func<ProductAccountEntity, bool>> expr = m => (m.Account== request.KeyWord||m.UserCode== request.KeyWord) && m.DeleteTag==0;
+                if (request.ProductIds != null && request.ProductIds.Count > 0)
+                {
+                    expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId));
+                }
+                if (request.ExpirdDay > -100)
+                {
+                    if (request.ExpirdDay == 0)
+                    {
+                        expr = expr.And(m => m.EndTime.Value < DateTime.Now);
+                    }else if(request.ExpirdDay == -2){
+                        expr = expr.And(m => m.EndTime.Value > DateTime.Now);
+                    } else if (request.ExpirdDay < 0 && request.ExpirdDay>-4) {
+                        expr = expr.And(m => Math.Ceiling((DateTime.Now - m.EndTime).Value.TotalDays) <= Math.Abs(request.ExpirdDay) && m.EndTime < DateTime.Now);
+                    } else if (request.ExpirdDay==-4) {
+                        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);
                 var data = ret.ToApiResult();
                 return data;