This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user