IUser新增会员Id字段，供会员表使用

新增EntityMember、EntityMemberWithTenant会员实体供会员业务表使用

src/platform/ZhonTai.Admin/Core/Auth/ClaimAttributes.cs

@@ -10,6 +10,11 @@ public static class ClaimAttributes
     /// </summary>
     public const string UserId = "sub";
 
+    /// <summary>
+    /// 会员Id
+    /// </summary>
+    public const string MemberId = "mi";
+
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -14,6 +14,11 @@ public interface IUser
     /// </summary>
     long Id { get; }
 
+    /// <summary>
+    /// 会员Id
+    /// </summary>
+    long MemberId { get; }
+
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using ZhonTai.Admin.Domain.User.Dto;
 using ZhonTai.Admin.Core.Consts;
 using ZhonTai.Admin.Tools.Cache;
-using ZhonTai.Admin.Services.User;
 using ZhonTai.Admin.Domain.Tenant;
 
 namespace ZhonTai.Admin.Core.Auth;
@@ -39,6 +38,22 @@ public class User : IUser
         }
     }
 
+    /// <summary>
+    /// 会员Id
+    /// </summary>
+    public virtual long MemberId
+    {
+        get
+        {
+            var id = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.MemberId);
+            if (id != null && id.Value.NotNull())
+            {
+                return id.Value.ToLong();
+            }
+            return 0;
+        }
+    }
+
     /// <summary>
     /// 用户名
     /// </summary>

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -167,6 +167,12 @@ public class DbHelper
         {
             switch (e.Property.Name)
             {
+                case "MemberId":
+                    if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
+                    {
+                        e.Value = user.MemberId;
+                    }
+                    break;
                 case "OwnerId":
                 case "CreatedUserId":
                     if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)

src/platform/ZhonTai.Admin/Core/Entities/EntityAdd.cs

@@ -15,21 +15,21 @@ public class EntityAdd<TKey> : Entity<TKey>, IEntityAdd<TKey> where TKey : struc
     /// </summary>
     [Description("创建者Id")]
     [Column(Position = -22, CanUpdate = false)]
-    public long? CreatedUserId { get; set; }
+    public virtual long? CreatedUserId { get; set; }
 
     /// <summary>
     /// 创建者
     /// </summary>
     [Description("创建者")]
     [Column(Position = -21, CanUpdate = false), MaxLength(50)]
-    public string CreatedUserName { get; set; }
+    public virtual string CreatedUserName { get; set; }
 
     /// <summary>
     /// 创建时间
     /// </summary>
     [Description("创建时间")]
     [Column(Position = -20, CanUpdate = false, ServerTime = DateTimeKind.Local)]
-    public DateTime? CreatedTime { get; set; }
+    public virtual DateTime? CreatedTime { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityData.cs

@@ -13,14 +13,14 @@ public class EntityData<TKey> : EntityBase, IData
     /// </summary>
     [Description("拥有者Id")]
     [Column(Position = -41)]
-    public long? OwnerId { get; set; }
+    public virtual long? OwnerId { get; set; }
 
     /// <summary>
     /// 拥有者部门Id
     /// </summary>
     [Description("拥有者部门Id")]
     [Column(Position = -40)]
-    public long? OwnerOrgId { get; set; }
+    public virtual long? OwnerOrgId { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityDelete.cs

@@ -13,7 +13,7 @@ public class EntityDelete<TKey> : EntityUpdate, IDelete
     /// </summary>
     [Description("是否删除")]
     [Column(Position = -9)]
-    public bool IsDeleted { get; set; } = false;
+    public virtual bool IsDeleted { get; set; } = false;
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityMember.cs

@@ -0,0 +1,39 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.ComponentModel;
+
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 实体会员
+/// </summary>
+public class EntityMember<TKey> : Entity<TKey>, IMember, IDelete
+{
+    /// <summary>
+    /// 会员Id
+    /// </summary>
+    [Description("会员Id")]
+    [Column(Position = -23, CanUpdate = false)]
+    public virtual long? MemberId { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    [Description("创建时间")]
+    [Column(Position = -20, CanUpdate = false, ServerTime = DateTimeKind.Local)]
+    public virtual DateTime? CreatedTime { get; set; }
+
+    /// <summary>
+    /// 是否删除
+    /// </summary>
+    [Description("是否删除")]
+    [Column(Position = -9)]
+    public virtual bool IsDeleted { get; set; } = false;
+}
+
+/// <summary>
+/// 实体会员
+/// </summary>
+public class EntityMember : EntityMember<long>
+{
+}

src/platform/ZhonTai.Admin/Core/Entities/EntityMemberWithTenant.cs

@@ -0,0 +1,26 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel;
+
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 实体会员租户
+/// </summary>
+public class EntityMemberWithTenant<TKey> : EntityMember, ITenant
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [Description("租户Id")]
+    [Column(Position = 2, CanUpdate = false)]
+    [JsonProperty(Order = -20)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 实体会员租户
+/// </summary>
+public class EntityMemberWithTenant : EntityMemberWithTenant<long>
+{
+}

src/platform/ZhonTai.Admin/Core/Entities/EntityTenant.cs

@@ -15,7 +15,7 @@ public class EntityTenant<TKey> : EntityBase, ITenant
     [Description("租户Id")]
     [Column(Position = 2, CanUpdate = false)]
     [JsonProperty(Order = -20)]
-    public long? TenantId { get; set; }
+    public virtual long? TenantId { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityTenantWithData.cs

@@ -1,5 +1,4 @@
 using FreeSql.DataAnnotations;
-using Newtonsoft.Json;
 using System.ComponentModel;
 
 namespace ZhonTai.Admin.Core.Entities;
@@ -7,29 +6,21 @@ namespace ZhonTai.Admin.Core.Entities;
 /// <summary>
 /// 实体租户数据权限
 /// </summary>
-public class EntityTenantWithData<TKey> : EntityBase, ITenant, IData
+public class EntityTenantWithData<TKey> : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Description("租户Id")]
-    [Column(Position = 2, CanUpdate = false)]
-    [JsonProperty(Order = -20)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 拥有者Id
     /// </summary>
     [Description("拥有者Id")]
     [Column(Position = -41)]
-    public long? OwnerId { get; set; }
+    public virtual long? OwnerId { get; set; }
 
     /// <summary>
     /// 拥有者部门Id
     /// </summary>
     [Description("拥有者部门Id")]
     [Column(Position = -40)]
-    public long? OwnerOrgId { get; set; }
+    public virtual long? OwnerOrgId { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityUpdate.cs

@@ -15,21 +15,21 @@ public class EntityUpdate<TKey> : EntityAdd, IEntityUpdate<TKey> where TKey : st
     /// </summary>
     [Description("修改者Id")]
     [Column(Position = -12, CanInsert = false)]
-    public long? ModifiedUserId { get; set; }
+    public virtual long? ModifiedUserId { get; set; }
 
     /// <summary>
     /// 修改者
     /// </summary>
     [Description("修改者")]
     [Column(Position = -11, CanInsert = false), MaxLength(50)]
-    public string ModifiedUserName { get; set; }
+    public virtual string ModifiedUserName { get; set; }
 
     /// <summary>
     /// 修改时间
     /// </summary>
     [Description("修改时间")]
     [Column(Position = -10, CanInsert = false, ServerTime = DateTimeKind.Local)]
-    public DateTime? ModifiedTime { get; set; }
+    public virtual DateTime? ModifiedTime { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/EntityVersion.cs

@@ -13,7 +13,7 @@ public class EntityVersion<TKey> : EntityBase, IVersion
     /// </summary>
     [Description("版本")]
     [Column(Position = -30, IsVersion = true)]
-    public long Version { get; set; }
+    public virtual long Version { get; set; }
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/IMember.cs

@@ -0,0 +1,12 @@
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 会员接口
+/// </summary>
+public interface IMember
+{
+    /// <summary>
+    /// 顾客Id
+    /// </summary>
+    long? MemberId { get; set; }
+}

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -84,6 +84,11 @@
             用户Id
             </summary>
         </member>
+        <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.MemberId">
+            <summary>
+            会员Id
+            </summary>
+        </member>
         <member name="F:ZhonTai.Admin.Core.Auth.ClaimAttributes.UserName">
             <summary>
             用户名
@@ -142,6 +147,11 @@
             用户Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Auth.IUser.MemberId">
+            <summary>
+            会员Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.UserName">
             <summary>
             用户名
@@ -220,6 +230,11 @@
             用户Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Auth.User.MemberId">
+            <summary>
+            会员Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.UserName">
             <summary>
             用户名
@@ -1219,6 +1234,46 @@
             实体删除
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityMember`1">
+            <summary>
+            实体会员
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityMember`1.MemberId">
+            <summary>
+            会员Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityMember`1.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityMember`1.IsDeleted">
+            <summary>
+            是否删除
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityMember">
+            <summary>
+            实体会员
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityMemberWithTenant`1">
+            <summary>
+            实体会员租户
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityMemberWithTenant`1.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityMemberWithTenant">
+            <summary>
+            实体会员租户
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityTenant`1">
             <summary>
             实体租户
@@ -1239,11 +1294,6 @@
             实体租户数据权限
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1.OwnerId">
             <summary>
             拥有者Id
@@ -1366,6 +1416,16 @@
             修改时间
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.IMember">
+            <summary>
+            会员接口
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IMember.MemberId">
+            <summary>
+            顾客Id
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.ITenant">
             <summary>
             租户接口