wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【筛选功能】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000051

Browse Source
This commit is contained in:
wanyongkang
2020-10-20 19:00:51 +08:00
parent 785af6ee95
commit 4eb421f9f8
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs
View File

@@ -130,13 +130,13 @@ namespace Hncore.Pass.Vpn.Controllers
|| m.PackageName.Contains(request.KeyWord) || m.PackageName.Contains(request.KeyWord)
|| m.Account.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)
{ {
@@ -146,6 +146,10 @@ namespace Hncore.Pass.Vpn.Controllers
{ {
expr = expr.And(m => m.EndTime>=request.BTime&&m.EndTime<=request.ETime); 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 > -1)
{ {
if (request.ExpirdDay == 0) if (request.ExpirdDay == 0)

8
Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
View File

@@ -68,13 +68,13 @@ namespace Hncore.Pass.Vpn.Controllers
||m.UserName.Contains(request.KeyWord) ||m.UserName.Contains(request.KeyWord)
||m.PackageName.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) if (request.OrderTypes != null && request.OrderTypes.Count > 0)
{ {

6
Services/Hncore.Pass.Vpn/Request/Product/AccountPageRequest.cs
View File

@@ -20,6 +20,12 @@ namespace Hncore.Pass.Vpn.Request.Product
public DateTime? BTime { get; set; } public DateTime? BTime { get; set; }
public DateTime? ETime { get; set; } public DateTime? ETime { get; set; }
public DateTime? BkTime { get; set; }
public DateTime? EkTime { get; set; }
public List<int> ProductIds { get; set; }
public List<string> PackageNames { get; set; }
} }
} }

4
Services/Hncore.Pass.Vpn/Request/Product/OrderQueryRequest.cs
View File

@@ -17,5 +17,9 @@ namespace Hncore.Pass.Vpn.Request.Product
public int? PackageId { get; set; } public int? PackageId { get; set; }
public List<int> ProductIds { get; set; }
public List<string> PackageNames { get; set; }
} }
} }

2
Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
View File

@@ -113,7 +113,7 @@ namespace Hncore.Pass.Vpn.Service
//主要是用来定时执行的 //主要是用来定时执行的
public async Task<List<ProductAccountEntity>> GetExpireingAccountsTime(int day) public async Task<List<ProductAccountEntity>> 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<ProductAccountEntity>(sql); return this.m_DbContext.SqlQuery<ProductAccountEntity>(sql);
} }