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

【管理端修改】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000225

Browse Source
This commit is contained in:
“wanyongkang”
2021-05-28 18:18:11 +08:00
parent 8558a808dc
commit 40a690bded
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,6 +188,27 @@ namespace Hncore.Pass.Vpn.Controllers
if (request.KeyWord.Has()) if (request.KeyWord.Has())
{ {
Expression<Func<ProductAccountEntity, bool>> expr = m => (m.Account== request.KeyWord||m.UserCode== request.KeyWord) && m.DeleteTag==0; 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 ret = await m_AccountService.PageDesc(request.PageIndex, request.PageSize, expr, true, m => m.Id);
var data = ret.ToApiResult(); var data = ret.ToApiResult();
return data; return data;