Merge branch 'main' of https://gitee.com/wg123/video-gen

video-gen-api/app/models/user.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from sqlalchemy import Boolean, DateTime, Float, Integer, String, JSON
+from sqlalchemy import Boolean, DateTime, Integer, String, JSON
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.enums.user import FrontendUserKind
@@ -9,19 +9,17 @@ from app.models.base import Base, TimestampMixin
 
 class User(Base, TimestampMixin):
     __tablename__ = "users"
+    __allow_unmapped__ = True
 
     id: Mapped[str] = mapped_column(String(32), primary_key=True)
     username: Mapped[str] = mapped_column(String(64), unique=True, index=True)
     email: Mapped[str | None] = mapped_column(String(255), unique=True, nullable=True)
     phone: Mapped[str | None] = mapped_column(String(20), unique=True, nullable=True)
-    # 短信注册用户允许先没有密码，后续通过 /auth/set-password 设置。
     hashed_password: Mapped[str | None] = mapped_column(String(128), nullable=True)
     avatar: Mapped[str | None] = mapped_column(String(512), nullable=True)
-    credits: Mapped[float] = mapped_column(Float, default=0.0)
     is_active: Mapped[bool] = mapped_column(Boolean, default=True)
     is_admin: Mapped[bool] = mapped_column(Boolean, default=False)
     user_type: Mapped[str] = mapped_column(String(16), default="frontend", index=True)
-    # 仅前台用户有业务意义；默认外部用户。取消内部标记时也设置回 external。
     frontend_user_kind: Mapped[str] = mapped_column(
         String(16),
         default=FrontendUserKind.EXTERNAL.value,
@@ -29,17 +27,13 @@ class User(Base, TimestampMixin):
         index=True,
         nullable=False,
     )
-    # 当前归属团队，仅前台用户有业务意义；不影响 frontend_user_kind 内部/外部设置。
     team_id: Mapped[str | None] = mapped_column(String(32), nullable=True, index=True)
-    last_login_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
-    )
-    password_set_at: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), nullable=True
+    last_login_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+    password_set_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+    first_membership_paid_at: Mapped[datetime | None] = mapped_column(
+        DateTime(timezone=True), nullable=True, index=True
     )
     allowed_menus: Mapped[list | None] = mapped_column(JSON, nullable=True)
-
-    # 私域人像素材总量限制。0 表示关闭模块；>0 表示启用并限制真人/虚拟、图片/视频素材总量。
     private_portrait_asset_limit: Mapped[int] = mapped_column(
         Integer, default=50, server_default="50", nullable=False
     )
@@ -49,6 +43,14 @@ class User(Base, TimestampMixin):
         Integer, default=0, server_default="0", nullable=False
     )
 
+    @property
+    def credits(self) -> float:
+        return float(getattr(self, "_credits_snapshot", 0.0) or 0.0)
+
+    @credits.setter
+    def credits(self, value: float | int) -> None:
+        self._credits_snapshot = round(float(value or 0.0), 2)
+
     @property
     def must_set_password(self) -> bool:
         return self.user_type == "frontend" and not self.hashed_password