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

【手机端和电脑端筛选功能】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000223

Browse Source
This commit is contained in:
“wanyongkang”
2021-05-28 11:03:39 +08:00
parent fcc855c586
commit 2496381c0a
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Host/Controllers/UserController.cs
View File

@@ -516,11 +516,15 @@ namespace Home.Controllers
if (request.ExpiredDay > -100) if (request.ExpiredDay > -100)
{ {
if (request.ExpiredDay > 0){ if (request.ExpiredDay > 0){
exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= request.ExpiredDay && Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) >=0); exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= request.ExpiredDay && m.EndTime > DateTime.Now);
} else if (request.ExpiredDay < 0 && request.ExpiredDay!=-4) { } else if (request.ExpiredDay < 0 && request.ExpiredDay>-4) {
exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) >= request.ExpiredDay && Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <=0); exp = exp.And(m => Math.Ceiling((DateTime.Now - m.EndTime).Value.TotalDays) <= Math.Abs(request.ExpiredDay) && m.EndTime < DateTime.Now);
} else { } else if (request.ExpiredDay==-4) {
exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4); exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4);
} else if (request.ExpiredDay==-5) {
exp = exp.And(m => m.EndTime > DateTime.Now);
} else if (request.ExpiredDay==-6) {
exp = exp.And(m => m.EndTime < DateTime.Now);
} }
} }

2
Host/Models/AccountSearchModel.cs
View File

@@ -8,7 +8,7 @@ namespace Home.Models
{ {
public DateTime? BTime { get; set; } public DateTime? BTime { get; set; }
public DateTime? ETime { get; set; } public DateTime? ETime { get; set; }
public int? ExpiredDay { get; set; } = -100;//OrderType public int ExpiredDay { get; set; } = -100;//OrderType
public int ProductId { get; set; } = 0; public int ProductId { get; set; } = 0;
public string PackageId { get; set; } = "0"; public string PackageId { get; set; } = "0";

2
Host/Views.Mobile/User/MyAccounts.cshtml
View File

@@ -54,6 +54,8 @@
<option :value="-1">已经到期1天内</option> <option :value="-1">已经到期1天内</option>
<option :value="-3">已经到期3天内</option> <option :value="-3">已经到期3天内</option>
<option :value="-4">已经到期3天以上</option> <option :value="-4">已经到期3天以上</option>
<option :value="-5">全部未过期</option>
<option :value="-6">全部已过期</option>
</select> </select>
</div> </div>
<div class="col-sm-4 col-xs-4"> <div class="col-sm-4 col-xs-4">

2
Host/Views/User/MyAccounts.cshtml
View File

@@ -311,6 +311,8 @@
<option :value="-1">已经到期1天内</option> <option :value="-1">已经到期1天内</option>
<option :value="-3">已经到期3天内</option> <option :value="-3">已经到期3天内</option>
<option :value="-4">已经到期3天以上</option> <option :value="-4">已经到期3天以上</option>
<option :value="-5">全部未过期</option>
<option :value="-6">全部已过期</option>
</select> </select>
</div> </div>
</div> </div>

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

@@ -152,19 +152,20 @@ namespace Hncore.Pass.Vpn.Controllers
{ {
expr = expr.And(m => m.StartTime>=request.BkTime&&m.StartTime<=request.EkTime); expr = expr.And(m => m.StartTime>=request.BkTime&&m.StartTime<=request.EkTime);
} }
if (request.ExpirdDay > -1) if (request.ExpirdDay > -100)
{ {
if (request.ExpirdDay == 0) if (request.ExpirdDay == 0)
{ {
expr = expr.And(m => m.EndTime.Value < DateTime.Now); expr = expr.And(m => m.EndTime.Value < DateTime.Now);
} }else if(request.ExpirdDay == -2){
else expr = expr.And(m => m.EndTime.Value > DateTime.Now);
{ } else if (request.ExpirdDay < 0 && request.ExpirdDay>-4) {
var startTime = DateTime.Now.Begin().AddDays(request.ExpirdDay); expr = expr.And(m => Math.Ceiling((DateTime.Now - m.EndTime).Value.TotalDays) <= Math.Abs(request.ExpirdDay) && m.EndTime < DateTime.Now);
startTime = startTime < DateTime.Now ? DateTime.Now : startTime; } else if (request.ExpirdDay==-4) {
var EndTime = DateTime.Now.End().AddDays(request.ExpirdDay); expr = expr.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4);
expr = expr.And(m => m.EndTime >= startTime && m.EndTime <= EndTime); }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 => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpirdDay); // 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);