From 4eb421f9f8b2210bcb038479e443bafa2a3d7d9d Mon Sep 17 00:00:00 2001 From: wanyongkang <937888580@qq.com> Date: Tue, 20 Oct 2020 19:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=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?9598945001000051?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ProductAccountController.cs | 12 ++++++++---- .../Controllers/ProductOrderController.cs | 8 ++++---- .../Request/Product/AccountPageRequest.cs | 6 ++++++ .../Request/Product/OrderQueryRequest.cs | 4 ++++ .../Hncore.Pass.Vpn/Service/ProductAccountService.cs | 2 +- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs index 78f6fff..c0015dc 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs @@ -130,13 +130,13 @@ namespace Hncore.Pass.Vpn.Controllers || 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) { @@ -146,6 +146,10 @@ namespace Hncore.Pass.Vpn.Controllers { 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) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs index 4ea3d5e..8b21552 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs @@ -68,13 +68,13 @@ namespace Hncore.Pass.Vpn.Controllers ||m.UserName.Contains(request.KeyWord) ||m.PackageName.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.OrderTypes != null && request.OrderTypes.Count > 0) { diff --git a/Services/Hncore.Pass.Vpn/Request/Product/AccountPageRequest.cs b/Services/Hncore.Pass.Vpn/Request/Product/AccountPageRequest.cs index 6edb0fd..b3956be 100644 --- a/Services/Hncore.Pass.Vpn/Request/Product/AccountPageRequest.cs +++ b/Services/Hncore.Pass.Vpn/Request/Product/AccountPageRequest.cs @@ -20,6 +20,12 @@ namespace Hncore.Pass.Vpn.Request.Product public DateTime? BTime { get; set; } public DateTime? ETime { get; set; } + public DateTime? BkTime { get; set; } + public DateTime? EkTime { get; set; } + + public List ProductIds { get; set; } + + public List PackageNames { get; set; } } } diff --git a/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs b/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs index 7d1b7c4..aa7aa02 100644 --- a/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs +++ b/Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs @@ -17,5 +17,9 @@ namespace Hncore.Pass.Vpn.Request.Product public int? PackageId { get; set; } + public List ProductIds { get; set; } + + public List PackageNames { get; set; } + } } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs index 3f4a8f8..0ac105e 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs @@ -113,7 +113,7 @@ namespace Hncore.Pass.Vpn.Service //主要是用来定时执行的 public async Task> GetExpireingAccountsTime(int day) { - var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} GROUP BY UserId"; + var sql = $"select * from product_account where DATEDIFF(EndTime,now())={day} AND PackageName!='测试卡' AND PackageName!='天卡' GROUP BY UserId"; return this.m_DbContext.SqlQuery(sql); }