diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index deb77fe..575495d 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -440,9 +440,9 @@ namespace Home.Controllers orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId); } - if (request.PackageId > 0) + if (request.PackageId !="0") { - orderQuery = orderQuery.Where(m => m.PackageId == request.PackageId); + orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); } if (request.ETime.HasValue && request.BTime.HasValue) @@ -475,9 +475,9 @@ namespace Home.Controllers orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId); } - if (request.PackageId > 0) + if (request.PackageId != "0") { - orderQuery = orderQuery.Where(m => m.PackageId == request.PackageId); + orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); } if (request.ETime.HasValue && request.BTime.HasValue) @@ -513,9 +513,15 @@ namespace Home.Controllers exp = exp.And(m => m.PackageName == request.PackageId); } - if (request.ExpiredDay > -1) + if (request.ExpiredDay > -100) { - exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpiredDay); + 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); + } 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); + } else { + exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4); + } } if (request.ETime.HasValue && request.BTime.HasValue) diff --git a/Host/Models/AccountSearchModel.cs b/Host/Models/AccountSearchModel.cs index 5b7b911..9f5cbab 100644 --- a/Host/Models/AccountSearchModel.cs +++ b/Host/Models/AccountSearchModel.cs @@ -8,7 +8,7 @@ namespace Home.Models { public DateTime? BTime { get; set; } public DateTime? ETime { get; set; } - public int? ExpiredDay { get; set; } = -1;//OrderType + public int? ExpiredDay { get; set; } = -100;//OrderType public int ProductId { get; set; } = 0; public string PackageId { get; set; } = "0"; diff --git a/Host/Models/OrderSearchModel.cs b/Host/Models/OrderSearchModel.cs index 86c87e4..6b36327 100644 --- a/Host/Models/OrderSearchModel.cs +++ b/Host/Models/OrderSearchModel.cs @@ -11,7 +11,7 @@ namespace Home.Models public int? OrderType { get; set; } = 0;//OrderType public int ProductId { get; set; } = 0; - public int PackageId { get; set; } = 0; + public string PackageId { get; set; } = "0"; public int IsRefund { get; set; } } diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml index 05504fd..f01930f 100644 --- a/Host/Views.Mobile/User/Index.cshtml +++ b/Host/Views.Mobile/User/Index.cshtml @@ -11,9 +11,9 @@
diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml index c554ef1..1bd010c 100644 --- a/Host/Views.Mobile/User/MyAccounts.cshtml +++ b/Host/Views.Mobile/User/MyAccounts.cshtml @@ -37,9 +37,25 @@ @*
为给您带来更好的服务体验,请完善QQ号和微信号
筛选功能已优化完成,可正常使用,更加便捷。
IP账号管理
+
IP账号管理
-
为了给您带来更好的服务体验,请完善qq号和微信号。立即完善》
筛选功能已优化完成,可正常使用,更加便捷。