From 52c5698d5ad068d7f0babe72d80aa47a878f0d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Tue, 13 Sep 2022 23:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E4=BD=99=E9=A2=9D=E5=8F=98=E5=8A=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E5=BD=95=E5=85=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../User/ICoreCmsUserServices.cs              |  3 ++-
 CoreCms.Net.Model/FromBody/FMUpdate.cs        | 26 +++++++++++++++++++
 .../User/CoreCmsUserServices.cs               |  5 ++--
 .../Controllers/User/CoreCmsUserController.cs |  4 +--
 .../views/user/userInfo/editBalance.html      | 12 ++++++++-
 5 files changed, 44 insertions(+), 6 deletions(-)

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
         /// </summary>
         /// <param name="id"></param>
         /// <param name="money"></param>
+        /// <param name="memo"></param>
         /// <returns></returns>
-        Task<AdminUiCallBack> UpdateBalance(int id, decimal money);
+        Task<AdminUiCallBack> UpdateBalance(int id, decimal money, string memo);
 
         /// <summary>
         ///     更新积分
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; }
     }
 
+
+    /// <summary>
+    ///     更新余额提交model
+    /// </summary>
+    public class FMUpdateUserBalance
+    {
+        /// <summary>
+        ///     序列
+        /// </summary>
+        [Required(ErrorMessage = "请输入序列")]
+        public int id { get; set; }
+
+        /// <summary>
+        ///     余额
+        /// </summary>
+        [Required(ErrorMessage = "请输入余额")]
+        public decimal balance { get; set; }
+
+        /// <summary>
+        ///     说明
+        /// </summary>
+        [Required(ErrorMessage = "请输入说明")]
+        public string memo { get; set; }
+    }
+
+
     /// <summary>
     ///     更新用户上级提交model
     /// </summary>
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
         /// </summary>
         /// <param name="id"></param>
         /// <param name="money"></param>
+        /// <param name="memo"></param>
         /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateBalance(int id, decimal money)
+        public async Task<AdminUiCallBack> 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
         /// <returns></returns>
         [HttpPost]
         [Description("修改余额提交")]
-        public async Task<AdminUiCallBack> DoEditBalance([FromBody] FMUpdateDecimalDataByIntId entity)
+        public async Task<AdminUiCallBack> 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 @@
             <div class="layui-inline">
                 <label class="layui-form-label">余额变动：</label>
                 <div class="layui-input-inline layui-inline-3">
-                    <input type="text" name="data" id="data" class="layui-input" value="" min="-{{d.params.data.balance}}" lay-verify="required|verifybalance">
+                    <input type="text" name="balance" id="balance" class="layui-input" value="" min="-{{d.params.data.balance}}" lay-verify="required|verifybalance">
                 </div>
                 <div class="layui-form-mid layui-word-aux">正数为加，负数为减</div>
             </div>
         </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">变动说明：</label>
+                <div class="layui-input-inline layui-inline-6">
+                    <input type="text" id="memo" name="memo" class="layui-input" lay-verify="required|verifyMemo">
+                </div>
+            </div>
+        </div>
 
         <div class="layui-form-item core-hidden">
             <label class="layui-form-label"></label>
@@ -38,7 +46,9 @@
 
                 form.verify({
                     verifybalance: [/\d+(\.\d{0,2})?/, '请输入数字或小数'],
+                    verifyMemo: [/^[\S]{0,255}$/, '变动说明最大只允许输入255位字符，且不能出现空格']
                 });
+
                 //重载form
                 form.render(null, 'LAY-app-CoreCmsUser-editForm');
             })