Merge pull request 'feat: User实体补会员字段并映射（后台开会员用户端生效）' (#2164) from feat/member-fields-entity into develop

2026-10-03 21:13:03 +08:00
parent f0d46b44d7 4104401759
commit 071a3707f4
2 changed files with 11 additions and 0 deletions
@@ -39,6 +39,9 @@ class SQLAlchemyUserRepository(UserRepository):
        model.phone_verified = user.phone_verified
        model.binding_completed_at = user.binding_completed_at
        model.profile_completed = user.profile_completed
+        model.is_member = user.is_member
+        model.member_type = user.member_type
+        model.member_expires_at = user.member_expires_at
        model.created_at = user.created_at

        self.session.commit()
@@ -115,5 +118,8 @@ class SQLAlchemyUserRepository(UserRepository):
            phone_verified=model.phone_verified or False,
            binding_completed_at=model.binding_completed_at,
            profile_completed=model.profile_completed if model.profile_completed is not None else True,
+            is_member=model.is_member if model.is_member is not None else False,
+            member_type=model.member_type,
+            member_expires_at=model.member_expires_at,
            created_at=model.created_at,
        )
@@ -60,6 +60,11 @@ class User:
    # 资料是否已完善（微信新用户首次设置昵称后置 True；邮箱注册默认 True）
    profile_completed: bool = True

+    # 会员字段 (#1895)：与 users 表列对应
+    is_member: bool = False
+    member_type: str | None = None
+    member_expires_at: datetime | None = None
+
    created_at: datetime = field(default_factory=lambda: datetime.now(UTC))