diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs index d6f86144..69fbc26e 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs @@ -2475,15 +2475,25 @@ namespace CoreCms.Net.Web.WebApi.Controllers where = where.And(p => p.serviceOrderId == entity.id); var dt = DateTime.Now; - if (service.validityType == 2 && status == (int)GlobalEnumVars.ServicesTicketStatus.过期) + //限制时间段的数据 + if (service.validityType == (int)GlobalEnumVars.ServicesValidityType.TimeFrame && status == (int)GlobalEnumVars.ServicesTicketStatus.过期) { - where = where.And(p => dt > p.validityEndTime); + where = where.And(p => dt > p.validityEndTime && p.status == (int)GlobalEnumVars.ServicesTicketStatus.正常); } - else if (service.validityType == 2 && status != (int)GlobalEnumVars.ServicesTicketStatus.过期) + else if (service.validityType == (int)GlobalEnumVars.ServicesValidityType.TimeFrame && status == (int)GlobalEnumVars.ServicesTicketStatus.正常) { where = where.And(p => p.validityStartTime < dt && p.validityEndTime > dt && p.status == status); } + else if (service.validityType == (int)GlobalEnumVars.ServicesValidityType.TimeFrame && status == (int)GlobalEnumVars.ServicesTicketStatus.作废 || service.validityType == (int)GlobalEnumVars.ServicesValidityType.TimeFrame && status == (int)GlobalEnumVars.ServicesTicketStatus.已核销) + { + where = where.And(p => p.status == status); + } + //不限制时间段的数据 + if (service.validityType == (int)GlobalEnumVars.ServicesValidityType.Unlimited) + { + where = where.And(p => p.status == status); + } var tickets = await _userServicesTicketServices.QueryPageAsync(where, p => p.createTime, OrderByType.Asc, entity.page, entity.limit); if (tickets.Any())