diff --git a/CoreCms.Net.IServices/User/ICoreCmsUserServices.cs b/CoreCms.Net.IServices/User/ICoreCmsUserServices.cs index a552ca91..a144f7f9 100644 --- a/CoreCms.Net.IServices/User/ICoreCmsUserServices.cs +++ b/CoreCms.Net.IServices/User/ICoreCmsUserServices.cs @@ -32,8 +32,9 @@ namespace CoreCms.Net.IServices /// /// /// + /// /// - Task UpdateBalance(int id, decimal money); + Task UpdateBalance(int id, decimal money, string memo); /// /// 更新积分 diff --git a/CoreCms.Net.Model/FromBody/FMUpdate.cs b/CoreCms.Net.Model/FromBody/FMUpdate.cs index f3596bef..0e89fb2d 100644 --- a/CoreCms.Net.Model/FromBody/FMUpdate.cs +++ b/CoreCms.Net.Model/FromBody/FMUpdate.cs @@ -154,6 +154,32 @@ namespace CoreCms.Net.Model.FromBody public string memo { get; set; } } + + /// + /// 更新余额提交model + /// + public class FMUpdateUserBalance + { + /// + /// 序列 + /// + [Required(ErrorMessage = "请输入序列")] + public int id { get; set; } + + /// + /// 余额 + /// + [Required(ErrorMessage = "请输入余额")] + public decimal balance { get; set; } + + /// + /// 说明 + /// + [Required(ErrorMessage = "请输入说明")] + public string memo { get; set; } + } + + /// /// 更新用户上级提交model /// diff --git a/CoreCms.Net.Services/User/CoreCmsUserServices.cs b/CoreCms.Net.Services/User/CoreCmsUserServices.cs index cd53bbf6..90502a66 100644 --- a/CoreCms.Net.Services/User/CoreCmsUserServices.cs +++ b/CoreCms.Net.Services/User/CoreCmsUserServices.cs @@ -85,8 +85,9 @@ namespace CoreCms.Net.Services /// /// /// + /// /// - public async Task UpdateBalance(int id, decimal money) + public async Task UpdateBalance(int id, decimal money, string memo) { var jm = new AdminUiCallBack(); @@ -105,7 +106,7 @@ namespace CoreCms.Net.Services balance.userId = model.id; balance.balance = newMoney; balance.createTime = DateTime.Now; - balance.memo = UserHelper.GetMemo(balance.type, money); + balance.memo = !string.IsNullOrEmpty(memo) ? memo : UserHelper.GetMemo(balance.type, money); balance.money = money; balance.sourceId = GlobalEnumVars.UserBalanceSourceTypes.Admin.ToString(); diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs index 2f8497bc..d07e5273 100644 --- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs @@ -992,9 +992,9 @@ namespace CoreCms.Net.Web.Admin.Controllers /// [HttpPost] [Description("修改余额提交")] - public async Task DoEditBalance([FromBody] FMUpdateDecimalDataByIntId entity) + public async Task DoEditBalance([FromBody] FMUpdateUserBalance entity) { - var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.data); + var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo); return jm; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html index a73a3f98..c05c02ae 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html @@ -12,11 +12,19 @@
- +
正数为加,负数为减
+
+
+ +
+ +
+
+
@@ -38,7 +46,9 @@ form.verify({ verifybalance: [/\d+(\.\d{0,2})?/, '请输入数字或小数'], + verifyMemo: [/^[\S]{0,255}$/, '变动说明最大只允许输入255位字符,且不能出现空格'] }); + //重载form form.render(null, 'LAY-app-CoreCmsUser-editForm'); })