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

先锋踢线

Browse Source
This commit is contained in:
“wanyongkang”
2021-10-11 14:49:15 +08:00
parent cab4c5086a
commit 0676870204
4 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,7 +451,12 @@ namespace Hncore.Pass.Vpn.Controllers
[AllowAnonymous]
public virtual async Task<ApiResult> KillOut(int productId, string id)
{
return Success(await m_agentService.KillOut(productId, id));
var status = await m_agentService.KillOut(productId, id);
if (status) {
return Success(status);
} else {
return Error("");
}
}
[HttpGet]
@@ -459,7 +464,7 @@ namespace Hncore.Pass.Vpn.Controllers
{
Expression<Func<ProductAccountEntity, bool>> expr = m => 1 == 1;
expr = expr.And(m => m.DeleteTag == 0);
if (request.UserId > 0)
{
expr = expr.And(m => m.UserId == request.UserId);
@@ -471,13 +476,13 @@ namespace Hncore.Pass.Vpn.Controllers
|| m.PackageName.Contains(request.KeyWord)
|| m.Account.Contains(request.KeyWord));
}
if (request.ProductIds != null && request.ProductIds.Count > 0)
if (request.ProductId != null && request.ProductId > 0)
{
expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId));
expr = expr.And(m =>m.ProductId==request.ProductId);
}
if (request.PackageNames != null && request.PackageNames.Count > 0)
if (request.PackageName != null)
{
expr = expr.And(m =>request.PackageNames.Contains((string)m.PackageName));
expr = expr.And(m =>request.PackageName==m.PackageName);
}
if (request.AccountTypes!=null&&request.AccountTypes.Count>0)
{
@@ -491,58 +496,23 @@ namespace Hncore.Pass.Vpn.Controllers
{
expr = expr.And(m => m.StartTime>=request.BkTime&&m.StartTime<=request.EkTime);
}
if (request.ExpirdDay > -1)
if (request.ExpirdDay > -100)
{
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);
}
}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);
}
// 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>