wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 22:43:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-03-22

Browse Source 
### 1.4.1 开源社区版：
无
### 0.3.1 专业版：
【新增】前端全局配置增加不同海报类型的全局配置，方便调用。
【修复】修复拼团订单详情分享他人参团的异常问题。
【修复】修复个人服务码列表，点击不弹出弹窗的问题。
【修复】商家中心核销服务码界面显示异常的问题。#I4YR6N
【修复】修复自定义交易组件维护商品选择品牌数据未关联的问题。
This commit is contained in:
JianWeie
2022-03-22 01:08:27 +08:00
parent 37c3ff7bf3
commit c5a5d808b7
17 changed files with 307 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CoreCms.Net.Web.WebApi/Controllers/ServiceController.cs
View File

@@ -296,8 +296,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
jm.msg = "未查询到服务券";
return jm;
}
ticket.statusStr = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.ServicesTicketStatus>(ticket.status);
var enumModel = EnumHelper.GetEnumberEntity<GlobalEnumVars.ServicesTicketStatus>(ticket.status);
ticket.statusStr = enumModel.title;
var service = await _servicesServices.QueryByClauseAsync(p => p.id == ticket.serviceId);
var serviceOrder =
@@ -338,7 +338,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
return jm;
}
if (ticket.status != (int)GlobalEnumVars.ServicesTicketStatus.Normal)
if (ticket.status != (int)GlobalEnumVars.ServicesTicketStatus.正常)
{
jm.msg = "服务券状态不支持核销";
return jm;
@@ -383,7 +383,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
isDel = false
};
ticket.status = (int)GlobalEnumVars.ServicesTicketStatus.Verification;
ticket.status = (int)GlobalEnumVars.ServicesTicketStatus.已核销;
ticket.verificationTime = DateTime.Now;
ticket.isVerification = true;
var up = await _userServicesTicketServices.UpdateAsync(ticket);