diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
index aac7fd15..7b044ac1 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
@@ -32,6 +32,7 @@ using CoreCms.Net.WeChat.Service.HttpClients;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using NPOI.HSSF.UserModel;
using NPOI.SS.Util;
@@ -1700,6 +1701,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
return jm;
}
+
var result = await _coreCmsOrderServices.CancelOrder(entity.id);
jm.code = result.status ? 0 : 1;
jm.msg = result.msg;
@@ -1708,6 +1710,40 @@ namespace CoreCms.Net.Web.Admin.Controllers
}
#endregion
+ #region 取消订单并退款============================================================
+ // POST: Api/CoreCmsOrder/CancelOrderAndRefund/10
+ ///
+ /// 取消订单并退款
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Description("取消订单并退款")]
+ public async Task CancelOrderAndRefund([FromBody] FMStringId entity)
+ {
+ var jm = new AdminUiCallBack();
+
+ if (entity.id.Length == 0)
+ {
+ jm.msg = "请提交要取消的订单号";
+ return jm;
+ }
+
+ if (string.IsNullOrEmpty(entity.id))
+ {
+ jm.msg = "请提交要取消的订单号";
+ return jm;
+ }
+
+ var result = await _coreCmsOrderServices.CancelOrderAndRefund(entity.id);
+ jm.code = result.status ? 0 : 1;
+ jm.msg = result.msg;
+
+ return jm;
+ }
+ #endregion
+
+
#region 批量删除订单============================================================
// POST: Api/CoreCmsOrder/DeleteOrder/10
///