更新代码

Source/Store.Management.Api/Authentication/AuthApi.cs

@@ -1,3 +1,4 @@
+using Store.Management.Models;
 using System.ComponentModel.DataAnnotations;
 using RestSharp;
 using Store.Management.Api.Transport;
@@ -13,15 +14,6 @@ public sealed class LoginRequest
     [StringLength(100)] public string? DeviceName { get; set; }
 }
 
-public sealed class LoginResult
-{
-    public string TokenType { get; init; } = "Bearer";
-    public string Token { get; init; } = "";
-    public uint ExpiresInMinutes { get; init; }
-}
-
-public sealed record CurrentUser(string UserName, string? NickName);
-
 public sealed class AuthApi(ApiTransport transport, TokenSession session)
 {
     // 登录和退出串行执行，避免迟到的登录响应覆盖退出操作。

Source/Store.Management.Api/Models/ApiResult.cs

@@ -7,7 +7,6 @@ public sealed class ApiResult<T>
     public string? TraceId { get; init; }
     public T? Data { get; init; }
 }
-
 public sealed record PageResult<T>(long Total, IReadOnlyList<T> Items);
 
 public class PageRequest

Source/Store.Management.Api/Store.Management.Api.csproj

@@ -4,4 +4,7 @@
   <ItemGroup>
     <PackageReference Include="RestSharp" Version="112.1.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Store.Management.Models\Store.Management.Models.csproj" />
+  </ItemGroup>
 </Project>

Source/Store.Management.Api/Users/UserApi.cs

@@ -1,6 +1,7 @@
 using RestSharp;
 using Store.Management.Api.Models;
 using Store.Management.Api.Transport;
+using Store.Management.Models;
 
 namespace Store.Management.Api.Users;
 

Source/Store.Management.Api/Users/UserGroup.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Store.Management.Api.Users
-{
-	public enum UserGroup : byte
-	{
-		/// <summary>主号。</summary>
-		[Description("主号")] MainAccount = 3,
-		/// <summary>客服。</summary>
-		[Description("客服")] CustomerService = 4,
-		/// <summary>加盟（旧系统分组 5）。</summary>
-	}
-}

Source/Store.Management.Api/Users/UserModels.cs

@@ -1,3 +1,4 @@
+using Store.Management.Models;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using Store.Management.Api.Models;
@@ -32,12 +33,6 @@ public sealed class UserCreateRequest : UserEditRequest
 
 public sealed record ChangePasswordRequest(string UserName, string NewPassword, string? OldPassword = null);
 
-public enum UserAdminLevel : short
-{
-    [System.ComponentModel.Description("普通用户")] Normal = 0,
-    [System.ComponentModel.Description("超级管理员")] SuperAdmin = 1
-}
-
 public sealed class UserUpdateRequest : UserEditRequest
 {
     [Range(1, int.MaxValue)] public int Id { get; set; }
@@ -57,28 +52,3 @@ public sealed class UserBillingUpdateRequest
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public decimal? SyncLogisticsPerOrder { get; set; }
 }
-
-/// <summary>管理端当前使用的用户资料字段；不接收密码。</summary>
-public sealed class UserInfo
-{
-    public int Id { get; init; }
-    public string UserName { get; init; } = "";
-    public string? NickName { get; init; }
-    public string? Mobile { get; init; }
-    public string? CompanyName { get; init; }
-    public string? Notes { get; init; }
-    public string? ParentUserName { get; init; }
-    public int GroupId { get; init; }
-    [System.Text.Json.Serialization.JsonIgnore]
-    public UserGroup? Group => GroupId is >= byte.MinValue and <= byte.MaxValue ? (UserGroup)GroupId : null;
-    public UserAdminLevel? SaLevel { get; init; }
-    public string? OemId { get; init; }
-    public string? Authority { get; init; }
-    public int ShopPointsPerMonth { get; init; }
-    public decimal? PostagePerOrder { get; init; }
-    public decimal? RefundPostagePerOrder { get; init; }
-    public decimal? GiftOemAmountPerOrder { get; init; }
-    public decimal? SyncLogisticsPerOrder { get; init; }
-    public decimal Points { get; init; }
-    public decimal? Balance { get; init; }
-}

Source/Store.Management.Framework/Mappers/UserMapper.cs

@@ -0,0 +1,12 @@
+using Riok.Mapperly.Abstractions;
+using Store.Management.Framework.ViewModels;
+using Store.Management.Models;
+
+namespace Store.Management.Framework.Mappers;
+
+[Mapper]
+public static partial class UserMapper
+{
+    public static partial UserItemViewModel ToItemViewModel(UserInfo user);
+    public static partial IReadOnlyList<UserItemViewModel> ToItemViewModels(IReadOnlyList<UserInfo> users);
+}

Source/Store.Management.Framework/Services/UserService.cs

@@ -1,7 +1,8 @@
+using Store.Management.Models;
 using MAX.Core.DependencyInjection;
 using Store.Management.Api;
-using Store.Management.Api.Models;
 using Store.Management.Api.Users;
+using Store.Management.Api.Models;
 
 namespace Store.Management.Framework.Services;
 

Source/Store.Management.Framework/Store.Management.Framework.csproj

@@ -14,6 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Store.Management.Models\Store.Management.Models.csproj" />
+    <PackageReference Include="Riok.Mapperly" Version="4.3.1" PrivateAssets="all" />
     <PackageReference Include="HandyControl" Version="3.6.2.1" />
     <PackageReference Include="MAX.Common.WPF" Version="1.4.23" />
     <ProjectReference Include="..\Store.Management.Api\Store.Management.Api.csproj" />

Source/Store.Management.Framework/ViewModels/UserItemViewModel.cs

@@ -0,0 +1,26 @@
+using Store.Management.Models;
+
+namespace Store.Management.Framework.ViewModels;
+
+public sealed class UserItemViewModel
+{
+    public int Id { get; init; }
+    public string UserName { get; init; } = "";
+    public string? NickName { get; init; }
+    public string? Mobile { get; init; }
+    public string? CompanyName { get; init; }
+    public string? Notes { get; init; }
+    public string? ParentUserName { get; init; }
+    public int GroupId { get; init; }
+    public UserGroup? Group => GroupId is >= byte.MinValue and <= byte.MaxValue ? (UserGroup)GroupId : null;
+    public UserAdminLevel? SaLevel { get; init; }
+    public string? OemId { get; init; }
+    public string? Authority { get; init; }
+    public int ShopPointsPerMonth { get; init; }
+    public decimal? PostagePerOrder { get; init; }
+    public decimal? RefundPostagePerOrder { get; init; }
+    public decimal? GiftOemAmountPerOrder { get; init; }
+    public decimal? SyncLogisticsPerOrder { get; init; }
+    public decimal Points { get; init; }
+    public decimal? Balance { get; init; }
+}

Source/Store.Management.Models/CurrentUser.cs

@@ -0,0 +1,3 @@
+namespace Store.Management.Models;
+
+public sealed record CurrentUser(string UserName, string? NickName);

Source/Store.Management.Models/LoginResult.cs

@@ -0,0 +1,8 @@
+namespace Store.Management.Models;
+
+public sealed class LoginResult
+{
+    public string TokenType { get; init; } = "Bearer";
+    public string Token { get; init; } = "";
+    public uint ExpiresInMinutes { get; init; }
+}

Source/Store.Management.Models/Store.Management.Models.csproj

@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>

Source/Store.Management.Models/UserAdminLevel.cs

@@ -0,0 +1,7 @@
+namespace Store.Management.Models;
+
+public enum UserAdminLevel : short
+{
+    [System.ComponentModel.Description("普通用户")] Normal = 0,
+    [System.ComponentModel.Description("超级管理员")] SuperAdmin = 1
+}

Source/Store.Management.Models/UserGroup.cs

@@ -0,0 +1,9 @@
+namespace Store.Management.Models;
+
+public enum UserGroup : byte
+{
+	/// <summary>主号。</summary>
+	[System.ComponentModel.Description("主号")] MainAccount = 3,
+	/// <summary>客服。</summary>
+	[System.ComponentModel.Description("客服")] CustomerService = 4,
+}

Source/Store.Management.Models/UserInfo.cs

@@ -0,0 +1,24 @@
+namespace Store.Management.Models;
+
+/// <summary>管理端当前使用的用户资料字段；不接收密码。</summary>
+public sealed class UserInfo
+{
+    public int Id { get; init; }
+    public string UserName { get; init; } = "";
+    public string? NickName { get; init; }
+    public string? Mobile { get; init; }
+    public string? CompanyName { get; init; }
+    public string? Notes { get; init; }
+    public string? ParentUserName { get; init; }
+    public int GroupId { get; init; }
+    public UserAdminLevel? SaLevel { get; init; }
+    public string? OemId { get; init; }
+    public string? Authority { get; init; }
+    public int ShopPointsPerMonth { get; init; }
+    public decimal? PostagePerOrder { get; init; }
+    public decimal? RefundPostagePerOrder { get; init; }
+    public decimal? GiftOemAmountPerOrder { get; init; }
+    public decimal? SyncLogisticsPerOrder { get; init; }
+    public decimal Points { get; init; }
+    public decimal? Balance { get; init; }
+}

Source/Store.Management/ViewModels/UserEditorDialogViewModel.cs

@@ -1,4 +1,7 @@
-using Prism.Commands;
+using Store.Management.Framework.Mappers;
+using Store.Management.Framework.ViewModels;
+using Store.Management.Models;
+using Prism.Commands;
 using Prism.Services.Dialogs;
 using Store.Management.Api.Transport;
 using Store.Management.Api.Users;
@@ -32,7 +35,7 @@ public sealed class UserEditorDialogViewModel(IUserService userService) : Confir
         new("裂变调试"), new("学员数据"), new("定向品牌"), new("活动库存")
     ];
 
-    private UserInfo? user;
+    private UserItemViewModel? user;
     private string? passwordHash;
     private string? confirmationHash;
     private string? oldPasswordHash;
@@ -58,7 +61,7 @@ public sealed class UserEditorDialogViewModel(IUserService userService) : Confir
 
     public override void OnDialogOpened(IDialogParameters parameters)
     {
-        user = parameters.GetValue<UserInfo?>("user");
+        user = parameters.GetValue<UserItemViewModel?>("user");
         UserName = user?.UserName ?? "";
         Draft = user == null ? new UserCreateRequest() : new UserUpdateRequest
         {
@@ -146,7 +149,7 @@ public sealed class UserEditorDialogViewModel(IUserService userService) : Confir
             }
             else
             {
-                user = await userService.UpdateAsync((UserUpdateRequest)Draft);
+                user = UserMapper.ToItemViewModel(await userService.UpdateAsync((UserUpdateRequest)Draft));
                 profileSaved = true;
                 if (passwordHash != null)
                 {

Source/Store.Management/ViewModels/UserManagementPageViewModel.cs

@@ -1,8 +1,10 @@
-using Prism.Commands;
+using Store.Management.Framework.Mappers;
+using Store.Management.Framework.ViewModels;
+using Store.Management.Models;
+using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
 using Prism.Services.Dialogs;
-using Store.Management.Api.Models;
 using Store.Management.Api.Transport;
 using Store.Management.Api.Users;
 using Store.Management.Framework.Controls;
@@ -11,6 +13,7 @@ using Store.Management.Views;
 using Store.Management.Views.Dialogs;
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using Store.Management.Api.Models;
 
 namespace Store.Management.ViewModels;
 
@@ -27,8 +30,8 @@ public sealed class UserManagementPageViewModel(IUserService userService, IDialo
 	public bool CanInteract { get => _canInteract; private set => SetProperty(ref _canInteract, value); }
 	public int Page { get; private set => SetProperty(ref field, value); } = 1;
 	public int Total { get; private set => SetProperty(ref field, value); }
-	public IReadOnlyList<UserInfo> Users { get; private set => SetProperty(ref field, value); } = [];
-	public UserInfo? SelectedUser { get; set => SetProperty(ref field, value); }
+	public IReadOnlyList<UserItemViewModel> Users { get; private set => SetProperty(ref field, value); } = [];
+	public UserItemViewModel? SelectedUser { get; set => SetProperty(ref field, value); }
 
 	public AsyncDelegateCommand SearchCommand => field ??= new(() => LoadAsync(Keyword.Trim(), SelectedGroup, 1, pageSize));
 	public AsyncDelegateCommand<DataGridPageRequest> PageCommand => field ??= new(
@@ -76,7 +79,7 @@ public sealed class UserManagementPageViewModel(IUserService userService, IDialo
 			appliedGroup = group;
 			pageSize = size;
 			SelectedUser = null;
-			Users = result.Items;
+			Users = UserMapper.ToItemViewModels(result.Items);
 			Total = (int)Math.Min(result.Total, int.MaxValue);
 			Page = request.Page;
 
@@ -100,7 +103,7 @@ public sealed class UserManagementPageViewModel(IUserService userService, IDialo
 		}
 	}
 
-	private async Task OpenEditorAsync(UserInfo? user)
+	private async Task OpenEditorAsync(UserItemViewModel? user)
 	{
 		ButtonResult result = ButtonResult.None;
 		dialogs.ShowDialog(nameof(UserEditorDialog), new DialogParameters { { "user", user } },
@@ -113,7 +116,7 @@ public sealed class UserManagementPageViewModel(IUserService userService, IDialo
 
 	private async Task DeleteAsync()
 	{
-		UserInfo user = SelectedUser!;
+		UserItemViewModel user = SelectedUser!;
 		if (MessageBox.Show($"确定删除用户“{user.UserName}”？", "删除用户", MessageBoxButton.OKCancel,
 			MessageBoxImage.Warning, MessageBoxResult.Cancel) != MessageBoxResult.OK)
 		{

Source/Store.Management/Views/Dialogs/UserBillingDialog.xaml.cs

@@ -1,4 +1,5 @@
-using Prism.Commands;
+using Store.Management.Framework.ViewModels;
+using Prism.Commands;
 using Prism.Services.Dialogs;
 using Store.Management.Api.Transport;
 using Store.Management.Api.Users;
@@ -36,7 +37,7 @@ public partial class UserBillingDialog : UserControl
     }
 }
 
-public sealed class UserBillingDialogViewModel(IUserService userService) : ConfirmDialogViewModel<UserInfo>
+public sealed class UserBillingDialogViewModel(IUserService userService) : ConfirmDialogViewModel<UserItemViewModel>
 {
     public sealed class BillingField(string label, decimal? original, decimal minimum,
         Action<UserBillingUpdateRequest, decimal> apply, bool integer = false)

Source/Store.Management/Views/UserEditorDialog.xaml

@@ -4,7 +4,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:users="clr-namespace:Store.Management.Api.Users;assembly=Store.Management.Api"
+	xmlns:users="clr-namespace:Store.Management.Models;assembly=Store.Management.Models"
 	xmlns:vm="clr-namespace:Store.Management.ViewModels"
 	xmlns:wpf="MAX.WPF"
 	Width="500"

Source/Store.Management/Views/UserManagementPage.xaml

@@ -6,7 +6,7 @@
 	xmlns:f="Store.Management.Framework"
 	xmlns:hc="https://handyorg.github.io/handycontrol"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:users="clr-namespace:Store.Management.Api.Users;assembly=Store.Management.Api"
+	xmlns:users="clr-namespace:Store.Management.Models;assembly=Store.Management.Models"
 	xmlns:vm="clr-namespace:Store.Management.ViewModels"
 	xmlns:wpf="MAX.WPF"
 	Margin="5"