feat: ✨ 财务管理

Author: tk

assets/res/NetAdmin.Fields.ln

@@ -17,7 +17,6 @@
 以什么结束
 作业名称
 作业状态
-密
 信息
 倒序排序
 全部数据
@@ -45,6 +44,7 @@
 字典内容导出
 宕机
 客户端IP
+密
 小于
 小于等于
 小学
@@ -71,6 +71,8 @@
 接口路径
 插入种子数据
 操作系统
+支出
+收入
 数据范围
 文档内容
 文档内容导出
@@ -99,6 +101,7 @@
 用户代理
 用户名
 用户导出
+用户钱包导出
 电子邮箱
 男
 登录
@@ -111,11 +114,14 @@
 站内信导出
 等于
 等待发送
+管理员充值
+管理员扣费
 管理模块
 系统模块
 绑定手机号码
 结果非预期
 群众
+自助充值
 自定义
 范围
 菜单
@@ -128,16 +134,17 @@
 请求方式
 请求日志导出
 调试
-追踪
-追踪标识
 身份证
 运行
+追踪
+追踪标识
 通知
 邮箱号
 部门名称
 部门导出
 配置导出
 重设密码
+钱包交易导出
 链接
 错误
 随机排序

assets/res/NetAdmin.Statements.ln

@@ -5,6 +5,8 @@ XML注释文件不存在
 中文姓名
 事务已回滚
 事务已提交
+交易失败
+交易金额不正确
 人机校验请求不能为空
 人机验证未通过
 作业名称不能为空
@@ -108,6 +110,7 @@ XML注释文件不存在
 部门可见
 部门名称不能为空
 配置文件初始化完毕
+钱包余额不足
 键值不能为空
 键名称不能为空
 随机延时结束时间不正确

assets/seed-data/Sys_Menu.json

@@ -26,7 +26,7 @@
     "Id": 373837957840901,
     "Name": "sys/user",
     "ParentId": 373837917724677,
-    "Path": "/sys/user",
+    "Path": "/power/user",
     "Sort": 100,
     "Title": "用户管理",
     "Type": 1
@@ -37,7 +37,7 @@
     "Id": 373838018527237,
     "Name": "sys/role",
     "ParentId": 373837917724677,
-    "Path": "/sys/role",
+    "Path": "/power/role",
     "Sort": 99,
     "Title": "角色管理",
     "Type": 1
@@ -48,7 +48,7 @@
     "Id": 373838045605893,
     "Name": "sys/dept",
     "ParentId": 373837917724677,
-    "Path": "/sys/dept",
+    "Path": "/power/dept",
     "Sort": 98,
     "Title": "部门管理",
     "Type": 1
@@ -59,18 +59,50 @@
     "Id": 373838070898693,
     "Name": "sys/menu",
     "ParentId": 373837917724677,
-    "Path": "/sys/menu",
+    "Path": "/power/menu",
     "Sort": 97,
     "Title": "菜单管理",
     "Type": 1
   },
+  // ------------------------------  财务管理 ------------------------------
+  {
+    "Icon": "el-icon-money",
+    "Id": 690906994118665,
+    "Name": "finance",
+    "Path": "/finance",
+    "Sort": 99,
+    "Title": "财务管理",
+    "Type": 1
+  },
+  {
+    "Component": "sys/wallet",
+    "Icon": "el-icon-wallet",
+    "Id": 690907673255942,
+    "Name": "sys/wallet",
+    "ParentId": 690906994118665,
+    "Path": "/finance/wallet",
+    "Sort": 100,
+    "Title": "钱包管理",
+    "Type": 1
+  },
+  {
+    "Component": "sys/trade",
+    "Icon": "el-icon-calendar",
+    "Id": 690907673255943,
+    "Name": "sys/trade",
+    "ParentId": 690906994118665,
+    "Path": "/finance/trade",
+    "Sort": 99,
+    "Title": "交易流水",
+    "Type": 1
+  },
   // ------------------------------  系统管理 ------------------------------
   {
     "Icon": "sc-icon-App",
     "Id": 485278637670422,
     "Name": "sys",
     "Path": "/sys",
-    "Sort": 99,
+    "Sort": 98,
     "Title": "系统管理",
     "Type": 1
   },
@@ -80,7 +112,7 @@
     "Id": 380415005847557,
     "Name": "sys/config",
     "ParentId": 485278637670422,
-    "Path": "/sys/config",
+    "Path": "/system/config",
     "Sort": 100,
     "Title": "系统设置",
     "Type": 1
@@ -91,7 +123,7 @@
     "Id": 510067557638158,
     "Name": "sys/job",
     "ParentId": 485278637670422,
-    "Path": "/sys/job",
+    "Path": "/system/job",
     "Sort": 99,
     "Title": "计划作业",
     "Type": 1
@@ -102,7 +134,7 @@
     "Id": 375315654221829,
     "Name": "sys/dic",
     "ParentId": 485278637670422,
-    "Path": "/sys/dic",
+    "Path": "/system/dic",
     "Sort": 98,
     "Title": "字典管理",
     "Type": 1
@@ -113,7 +145,7 @@
     "Id": 482779610341392,
     "Name": "sys/msg",
     "ParentId": 485278637670422,
-    "Path": "/sys/msg",
+    "Path": "/system/msg",
     "Sort": 97,
     "Title": "消息管理",
     "Type": 1,
@@ -124,7 +156,7 @@
     "Id": 397880678895621,
     "Name": "sys/api",
     "ParentId": 485278637670422,
-    "Path": "/sys/api",
+    "Path": "/system/api",
     "Sort": 96,
     "Title": "接口管理",
     "Type": 1
@@ -135,7 +167,7 @@
     "Id": 374911555702789,
     "Name": "sys/cache",
     "ParentId": 485278637670422,
-    "Path": "/sys/cache",
+    "Path": "/system/cache",
     "Sort": 95,
     "Title": "缓存管理",
     "Type": 1
@@ -146,7 +178,7 @@
     "Id": 616214756757512,
     "Name": "archive",
     "Path": "/archive",
-    "Sort": 98,
+    "Sort": 97,
     "Title": "档案管理",
     "Type": 1
   },
@@ -167,7 +199,7 @@
     "Id": 374792687640581,
     "Name": "log",
     "Path": "/log",
-    "Sort": 97,
+    "Sort": 96,
     "Title": "日志管理",
     "Type": 1
   },
@@ -177,7 +209,7 @@
     "Id": 485285246504976,
     "Name": "sys/log/operation",
     "ParentId": 374792687640581,
-    "Path": "/sys/log/operation",
+    "Path": "/log/operation",
     "Sort": 100,
     "Title": "操作日志",
     "Type": 1,
@@ -188,7 +220,7 @@
     "Id": 485285246504970,
     "Name": "sys/log/login",
     "ParentId": 374792687640581,
-    "Path": "/sys/log/login",
+    "Path": "/log/login",
     "Sort": 99,
     "Title": "登录日志",
     "Type": 1,
@@ -199,7 +231,7 @@
     "Id": 373838105399301,
     "Name": "dev",
     "Path": "/dev",
-    "Sort": 96,
+    "Sort": 95,
     "Title": "开发管理",
     "Type": 1
   },

assets/seed-data/Sys_RoleApi.json

@@ -58,5 +58,25 @@
   {
     "ApiId": "api/sys/login.log/export",
     "RoleId": 371729946431493,
+  },
+  {
+    "ApiId": "api/sys/user.wallet/paged.query",
+    "RoleId": 371729946431493,
+  },
+  {
+    "ApiId": "api/sys/user.wallet/get",
+    "RoleId": 371729946431493,
+  },
+  {
+    "ApiId": "api/sys/wallet.trade/paged.query",
+    "RoleId": 371729946431493,
+  },
+  {
+    "ApiId": "api/sys/wallet.trade/count.by",
+    "RoleId": 371729946431493,
+  },
+  {
+    "ApiId": "api/sys/wallet.trade/get",
+    "RoleId": 371729946431493,
   }
 ]

assets/seed-data/Sys_RoleMenu.json

@@ -6,5 +6,25 @@
   {
     "MenuId": 374967228141573,
     "RoleId": 371729946431493
+  },
+  {
+    "MenuId": 690906994118665,
+    "RoleId": 371729946431493
+  },
+  {
+    "MenuId": 690907673255942,
+    "RoleId": 371729946431493
+  },
+  {
+    "MenuId": 374792687640581,
+    "RoleId": 371729946431493
+  },
+  {
+    "MenuId": 485285246504970,
+    "RoleId": 371729946431493
+  },
+  {
+    "MenuId": 690907673255943,
+    "RoleId": 371729946431493
   }
 ]

assets/seed-data/Sys_UserWallet.json

@@ -0,0 +1,12 @@
+[
+  {
+    "Id": 370942943322181,
+    "OwnerDeptId": 372119301627909,
+    "OwnerId": 370942943322181,
+  },
+  {
+    "Id": 560217289236492,
+    "OwnerDeptId": 372119301627909,
+    "OwnerId": 560217289236492,
+  }
+]

package.json

@@ -3,7 +3,7 @@
   "devDependencies": {
     "cz-git": "^1.11.2",
     "commitizen": "^4.3.1",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.1",
     "standard-version": "^9.5.0"
   },
   "config": {

src/backend/NetAdmin/NetAdmin.Application/Services/ServiceBase.cs

@@ -10,7 +10,7 @@ public abstract class ServiceBase<TLogger> : ServiceBase
     /// </summary>
     protected ServiceBase() //
     {
-        Logger = App.GetService<ILogger<TLogger>>();
+        Logger = S<ILogger<TLogger>>();
     }
 
     /// <summary>
@@ -29,7 +29,7 @@ public abstract class ServiceBase : IScoped, IService
     /// </summary>
     protected ServiceBase()
     {
-        UserToken = App.GetService<ContextUserToken>();
+        UserToken = S<ContextUserToken>();
         ServiceId = Guid.NewGuid();
     }
 
@@ -38,4 +38,19 @@ protected ServiceBase()
 
     /// <inheritdoc />
     public ContextUserToken UserToken { get; set; }
+
+    /// <summary>
+    ///     获取服务
+    /// </summary>
+    #pragma warning disable RCS1036
+    #pragma warning restore RCS1036
+
+    // ReSharper disable once MemberCanBeMadeStatic.Global
+    #pragma warning disable CA1822, S2325
+    protected T S<T>()
+        #pragma warning restore S2325, CA1822
+        where T : class
+    {
+        return App.GetService<T>();
+    }
 }

src/backend/NetAdmin/NetAdmin.Application/Services/Tpl/ExampleService.cs

@@ -42,8 +42,9 @@ public async Task<IOrderedEnumerable<KeyValuePair<IImmutableDictionary<string, s
                         .ToDictionaryAsync(a => a.Count())
                         .ConfigureAwait(false);
         return ret.Select(x => new KeyValuePair<IImmutableDictionary<string, string>, int>(
-                              req.RequiredFields.ToImmutableDictionary(y => y, y => typeof(Tpl_Example).GetProperty(y)!.GetValue(x.Key)!.ToString())
+                              req.RequiredFields.ToImmutableDictionary(y => y, y => typeof(Tpl_Example).GetProperty(y)!.GetValue(x.Key)?.ToString())
                             , x.Value))
+                  .Where(x => x.Key.Any(y => !y.Value.NullOrEmpty()))
                   .OrderByDescending(x => x.Value);
     }