wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-22 18:17:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

接口端【修复】：修复【我购买的服务商品卡】里面的核销码切换失效的问题。

Browse Source
This commit is contained in:
jianweie code
2024-11-18 21:48:39 +08:00
parent b51d784e13
commit eb2d9c997a
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CoreCms.Net.Web.WebApi/Controllers/UserController.cs
View File

@@ -2475,15 +2475,25 @@ namespace CoreCms.Net.Web.WebApi.Controllers
where = where.And(p => p.serviceOrderId == entity.id); where = where.And(p => p.serviceOrderId == entity.id);
var dt = DateTime.Now; 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); 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); var tickets = await _userServicesTicketServices.QueryPageAsync(where, p => p.createTime, OrderByType.Asc, entity.page, entity.limit);
if (tickets.Any()) if (tickets.Any())