更新卡密

.codex/config.toml

@@ -1 +0,0 @@
-sandbox_mode = "workspace-write"

.gitignore

@@ -16,6 +16,7 @@ edit
 docker-compose-local.yml
 
 .claude/settings.local.json
+.codex/
 
 # Environment variables
 .env

api-dev-8000.err.log

@@ -1,16 +1,4 @@
-INFO:     Started server process [40272]
+INFO:     Started server process [42208]
 INFO:     Waiting for application startup.
 INFO:     Application startup complete.
 INFO:     Uvicorn running on http://127.0.0.1:8000 (Press CTRL+C to quit)
-Exception in callback _ProactorBasePipeTransport._call_connection_lost()
-handle: <Handle _ProactorBasePipeTransport._call_connection_lost()>
-Traceback (most recent call last):
-  File "D:\python\Lib\asyncio\events.py", line 89, in _run
-    self._context.run(self._callback, *self._args)
-    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "D:\python\Lib\asyncio\proactor_events.py", line 165, in _call_connection_lost
-    self._sock.shutdown(socket.SHUT_RDWR)
-    ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^
-ConnectionResetError: [WinError 10054] Զ������ǿ�ȹر���һ�����е����ӡ�
-[INFO] {"event": "image_stream_resolve_start", "conversation_id": "6a4a75a7-69c4-83e8-b9d8-ecfa6fde267f", "file_ids": ["file_00000000d2d071fd8f47613807227388"], "sediment_ids": ["file_00000000d2d071fd8f47613807227388"], "tool_invoked": false, "turn_use_case": "image gen"}
-[INFO] {"event": "image_stream_resolve_start", "conversation_id": "6a4a77a2-d920-83e8-b6ed-619b8d8240c5", "file_ids": ["file_000000005f2c71fda3a38dd984c85153"], "sediment_ids": ["file_000000005f2c71fda3a38dd984c85153"], "tool_invoked": false, "turn_use_case": "image gen"}

api/ai.py

@@ -179,6 +179,7 @@ class CreditReservation:
         self.amount = max(0, int(amount or 0))
         self.daily_amount = 0
         self.paid_amount = 0
+        self.package_reservations: list[dict[str, object]] = []
         self.grant_reservations: list[dict[str, object]] = []
         self.settled = False
 
@@ -194,6 +195,7 @@ class CreditReservation:
             details = {}
         reservation.daily_amount = max(0, int(details.get("daily") or 0))
         reservation.paid_amount = max(0, int(details.get("permanent_paid") if "permanent_paid" in details else details.get("paid") or 0))
+        reservation.package_reservations = details.get("packages") if isinstance(details.get("packages"), list) else []
         reservation.grant_reservations = details.get("grants") if isinstance(details.get("grants"), list) else []
         return reservation
 
@@ -207,6 +209,8 @@ class CreditReservation:
         consume_count = min(self.amount, max(0, int(success_count or 0)))
         daily_to_consume = min(self.daily_amount, consume_count)
         remaining = consume_count - daily_to_consume
+        packages_to_consume, packages_to_refund = _split_grants(self.package_reservations, remaining)
+        remaining -= sum(max(0, int(item.get("amount") or 0)) for item in packages_to_consume)
         grants_to_consume, grants_to_refund = _split_grants(self.grant_reservations, remaining)
         remaining -= sum(max(0, int(item.get("amount") or 0)) for item in grants_to_consume)
         paid_to_consume = min(self.paid_amount, remaining)
@@ -220,6 +224,7 @@ class CreditReservation:
                 consume_count,
                 daily_amount=daily_to_consume,
                 paid_amount=paid_to_consume,
+                package_reservations=packages_to_consume,
                 grant_reservations=grants_to_consume,
             )
         refund_count = self.amount - consume_count
@@ -229,6 +234,7 @@ class CreditReservation:
                 refund_count,
                 daily_amount=daily_to_refund,
                 paid_amount=paid_to_refund,
+                package_reservations=packages_to_refund,
                 grant_reservations=grants_to_refund,
             )
         self.settled = True

api/shop.py

@@ -22,12 +22,29 @@ class CodeBatchCreateRequest(BaseModel):
     validity_days: int | None = Field(default=None, ge=1, le=3650)
     credit_expires_days: int | None = Field(default=None, ge=1, le=3650)
     batch_single_use: bool = False
+    code_type: str = "normal"
+    daily_gift_date: str = ""
+    package_name: str = ""
+    package_duration_days: int = Field(default=1, ge=1, le=3650)
+    package_daily_limit: int | None = Field(default=None, ge=0, le=1000000)
+    package_weekly_limit: int | None = Field(default=None, ge=0, le=1000000)
+    package_monthly_limit: int | None = Field(default=None, ge=0, le=1000000)
+    package_total_limit: int | None = Field(default=None, ge=0, le=1000000)
 
 
 class CodeDisableRequest(BaseModel):
     code_id: str = ""
 
 
+class CodeCleanupRequest(BaseModel):
+    delete_expired: bool = True
+    delete_disabled: bool = False
+    archive_redeemed: bool = False
+    redeemed_older_than_days: int = Field(default=90, ge=1, le=3650)
+    limit: int = Field(default=1000, ge=1, le=20000)
+    dry_run: bool = True
+
+
 class CreditAdjustRequest(BaseModel):
     delta: int
     note: str = ""
@@ -64,6 +81,13 @@ def create_router() -> APIRouter:
         identity = require_identity(authorization)
         return {"credits": auth_service.credit_summary(identity)}
 
+    @router.get("/api/me/redeem-codes")
+    async def get_my_redeem_codes(authorization: str | None = Header(default=None)):
+        identity = require_identity(authorization)
+        if str(identity.get("role") or "").strip().lower() != "normal":
+            raise HTTPException(status_code=403, detail={"error": "只有普通用户可以查看自己的卡密"})
+        return {"items": shop_service.list_user_codes(str(identity.get("id") or ""))}
+
     @router.get("/api/shop/public")
     async def get_shop_public_config(authorization: str | None = Header(default=None)):
         require_identity(authorization)
@@ -72,8 +96,8 @@ def create_router() -> APIRouter:
     @router.get("/api/me/api-key")
     async def get_my_api_key(authorization: str | None = Header(default=None)):
         identity = require_identity(authorization)
-        if str(identity.get("role") or "").strip().lower() != "normal":
-            raise HTTPException(status_code=403, detail={"error": "只有普通用户需要查看外部调用密钥"})
+        if str(identity.get("role") or "").strip().lower() not in {"normal", "user"}:
+            raise HTTPException(status_code=403, detail={"error": "只有微信用户或内部用户可以查看密钥"})
         api_key = auth_service.get_api_key_display(str(identity.get("id") or ""))
         if not api_key:
             raise HTTPException(status_code=404, detail={"error": "当前用户密钥无法回显，请联系管理员重置密钥"})
@@ -113,6 +137,14 @@ def create_router() -> APIRouter:
                 validity_days=body.validity_days,
                 credit_expires_days=body.credit_expires_days,
                 batch_single_use=body.batch_single_use,
+                code_type=body.code_type,
+                daily_gift_date=body.daily_gift_date,
+                package_name=body.package_name,
+                package_duration_days=body.package_duration_days,
+                package_daily_limit=body.package_daily_limit,
+                package_weekly_limit=body.package_weekly_limit,
+                package_monthly_limit=body.package_monthly_limit,
+                package_total_limit=body.package_total_limit,
             )
         except ValueError as exc:
             raise HTTPException(status_code=400, detail={"error": str(exc)}) from exc
@@ -144,6 +176,21 @@ def create_router() -> APIRouter:
             raise HTTPException(status_code=400, detail={"error": str(exc)}) from exc
         return {"item": item, "items": shop_service.list_codes()}
 
+    @router.post("/api/shop/codes/cleanup")
+    async def cleanup_codes(body: CodeCleanupRequest, authorization: str | None = Header(default=None)):
+        require_admin(authorization)
+        try:
+            return shop_service.cleanup_codes(
+                delete_expired=body.delete_expired,
+                delete_disabled=body.delete_disabled,
+                delete_redeemed=body.archive_redeemed,
+                redeemed_older_than_days=body.redeemed_older_than_days,
+                limit=body.limit,
+                dry_run=body.dry_run,
+            )
+        except ValueError as exc:
+            raise HTTPException(status_code=400, detail={"error": str(exc)}) from exc
+
     @router.get("/api/shop/ledger")
     async def list_ledger(authorization: str | None = Header(default=None)):
         require_admin(authorization)

api/support.py

@@ -88,11 +88,18 @@ def start_limited_account_watcher(stop_event: Event) -> Thread:
     def worker() -> None:
         last_refresh_at = 0.0
         last_free_cleanup_at = 0.0
+        last_redeem_code_cleanup_at = 0.0
         while not stop_event.is_set():
             refresh_interval_seconds = max(60, config.refresh_account_interval_minute * 60)
             free_cleanup_settings = config.get_free_account_cleanup_settings()
             free_cleanup_enabled = bool(free_cleanup_settings.get("enabled"))
             free_cleanup_interval_seconds = max(60, int(free_cleanup_settings.get("interval_minutes") or 10) * 60)
+            redeem_code_cleanup_settings = config.get_redeem_code_cleanup_settings()
+            redeem_code_cleanup_enabled = bool(redeem_code_cleanup_settings.get("enabled"))
+            redeem_code_cleanup_interval_seconds = max(
+                60,
+                int(redeem_code_cleanup_settings.get("interval_minutes") or 1440) * 60,
+            )
             now = time.monotonic()
             try:
                 if now - last_refresh_at >= refresh_interval_seconds:
@@ -112,14 +119,38 @@ def start_limited_account_watcher(stop_event: Event) -> Thread:
                             f"errors {len(result.get('errors') or [])}"
                         )
                     last_free_cleanup_at = now
+                if redeem_code_cleanup_enabled and now - last_redeem_code_cleanup_at >= redeem_code_cleanup_interval_seconds:
+                    from services.shop_service import shop_service
+
+                    result = shop_service.cleanup_codes(
+                        delete_expired=bool(redeem_code_cleanup_settings.get("delete_expired")),
+                        delete_disabled=bool(redeem_code_cleanup_settings.get("delete_disabled")),
+                        delete_redeemed=bool(redeem_code_cleanup_settings.get("archive_redeemed")),
+                        redeemed_older_than_days=int(redeem_code_cleanup_settings.get("redeemed_older_than_days") or 90),
+                        limit=int(redeem_code_cleanup_settings.get("limit") or 1000),
+                        dry_run=False,
+                    )
+                    summary = result.get("summary") or {}
+                    deleted = int(summary.get("deleted") or 0)
+                    if deleted:
+                        print(
+                            "[redeem-code-cleanup-watcher] "
+                            f"deleted {deleted} codes, archived {summary.get('archived', 0)}, "
+                            f"archive {summary.get('archive_path') or '-'}"
+                        )
+                    last_redeem_code_cleanup_at = now
             except Exception as exc:
                 print(f"[account-limited-watcher] fail {exc}")
                 last_refresh_at = now
                 if free_cleanup_enabled:
                     last_free_cleanup_at = now
+                if redeem_code_cleanup_enabled:
+                    last_redeem_code_cleanup_at = now
             wait_candidates = [last_refresh_at + refresh_interval_seconds]
             if free_cleanup_enabled:
                 wait_candidates.append(last_free_cleanup_at + free_cleanup_interval_seconds)
+            if redeem_code_cleanup_enabled:
+                wait_candidates.append(last_redeem_code_cleanup_at + redeem_code_cleanup_interval_seconds)
             wait_seconds = max(1.0, min(wait_candidates) - time.monotonic())
             stop_event.wait(wait_seconds)
 

services/auth_service.py

@@ -29,6 +29,18 @@ def _today_key() -> str:
     return datetime.now(tz).strftime("%Y-%m-%d")
 
 
+def _china_now() -> datetime:
+    tz = ZoneInfo("Asia/Shanghai") if ZoneInfo else timezone(timedelta(hours=8))
+    return datetime.now(tz)
+
+
+def _period_keys(now: datetime | None = None) -> tuple[str, str, str]:
+    current = now or _china_now()
+    date_key = current.strftime("%Y-%m-%d")
+    iso_year, iso_week, _ = current.isocalendar()
+    return date_key, f"{iso_year}-W{iso_week:02d}", current.strftime("%Y-%m")
+
+
 def _hash_key(value: str) -> str:
     return hashlib.sha256(value.encode("utf-8")).hexdigest()
 
@@ -93,6 +105,114 @@ def _expiring_credit_reserved(item: dict[str, object]) -> int:
     return sum(_to_nonnegative_int(grant.get("reserved")) for grant in _normalize_credit_grants(item.get("credit_grants")))
 
 
+PACKAGE_UNLIMITED_SENTINEL = 10**9
+
+
+def _normalize_package_grants(value: object) -> list[dict[str, object]]:
+    source = value if isinstance(value, list) else []
+    grants: list[dict[str, object]] = []
+    for raw in source:
+        if not isinstance(raw, dict):
+            continue
+        grant_id = str(raw.get("id") or "").strip() or uuid.uuid4().hex[:12]
+        expires_at = str(raw.get("expires_at") or "").strip()
+        if not expires_at:
+            continue
+        grants.append(
+            {
+                "id": grant_id,
+                "name": str(raw.get("name") or "套餐").strip() or "套餐",
+                "created_at": str(raw.get("created_at") or "").strip() or _now_iso(),
+                "starts_at": str(raw.get("starts_at") or "").strip(),
+                "expires_at": expires_at,
+                "source": str(raw.get("source") or "").strip(),
+                "code_id": str(raw.get("code_id") or "").strip(),
+                "daily_limit": _to_nonnegative_int(raw.get("daily_limit")),
+                "weekly_limit": _to_nonnegative_int(raw.get("weekly_limit")),
+                "monthly_limit": _to_nonnegative_int(raw.get("monthly_limit")),
+                "total_limit": _to_nonnegative_int(raw.get("total_limit")),
+                "used_total": _to_nonnegative_int(raw.get("used_total")),
+                "reserved_total": _to_nonnegative_int(raw.get("reserved_total")),
+                "daily_key": str(raw.get("daily_key") or "").strip(),
+                "used_daily": _to_nonnegative_int(raw.get("used_daily")),
+                "reserved_daily": _to_nonnegative_int(raw.get("reserved_daily")),
+                "weekly_key": str(raw.get("weekly_key") or "").strip(),
+                "used_weekly": _to_nonnegative_int(raw.get("used_weekly")),
+                "reserved_weekly": _to_nonnegative_int(raw.get("reserved_weekly")),
+                "monthly_key": str(raw.get("monthly_key") or "").strip(),
+                "used_monthly": _to_nonnegative_int(raw.get("used_monthly")),
+                "reserved_monthly": _to_nonnegative_int(raw.get("reserved_monthly")),
+            }
+        )
+    grants.sort(key=lambda item: str(item.get("expires_at") or ""))
+    return grants
+
+
+def _reset_package_periods(grant: dict[str, object], now: datetime | None = None) -> dict[str, object]:
+    date_key, week_key, month_key = _period_keys(now)
+    next_grant = dict(grant)
+    if str(next_grant.get("daily_key") or "") != date_key:
+        next_grant["daily_key"] = date_key
+        next_grant["used_daily"] = 0
+        next_grant["reserved_daily"] = 0
+    if str(next_grant.get("weekly_key") or "") != week_key:
+        next_grant["weekly_key"] = week_key
+        next_grant["used_weekly"] = 0
+        next_grant["reserved_weekly"] = 0
+    if str(next_grant.get("monthly_key") or "") != month_key:
+        next_grant["monthly_key"] = month_key
+        next_grant["used_monthly"] = 0
+        next_grant["reserved_monthly"] = 0
+    return next_grant
+
+
+def _package_active(grant: dict[str, object]) -> bool:
+    starts_at = str(grant.get("starts_at") or "").strip()
+    parsed_starts_at = _parse_iso_datetime(starts_at) if starts_at else None
+    return (parsed_starts_at is None or parsed_starts_at <= datetime.now(timezone.utc)) and _is_future_datetime(grant.get("expires_at"))
+
+
+def _package_available(grant: dict[str, object]) -> int:
+    if not _package_active(grant):
+        return 0
+    normalized = _reset_package_periods(grant)
+    candidates: list[int] = []
+    limit_pairs = [
+        ("total_limit", "used_total", "reserved_total"),
+        ("daily_limit", "used_daily", "reserved_daily"),
+        ("weekly_limit", "used_weekly", "reserved_weekly"),
+        ("monthly_limit", "used_monthly", "reserved_monthly"),
+    ]
+    for limit_key, used_key, reserved_key in limit_pairs:
+        limit = _to_nonnegative_int(normalized.get(limit_key))
+        if limit <= 0:
+            continue
+        candidates.append(max(0, limit - _to_nonnegative_int(normalized.get(used_key)) - _to_nonnegative_int(normalized.get(reserved_key))))
+    if not candidates:
+        return PACKAGE_UNLIMITED_SENTINEL
+    return min(candidates)
+
+
+def _active_package_grants(item: dict[str, object]) -> list[dict[str, object]]:
+    grants: list[dict[str, object]] = []
+    for grant in _normalize_package_grants(item.get("package_grants")):
+        grant = _reset_package_periods(grant)
+        if _package_active(grant):
+            grants.append(grant)
+    return grants
+
+
+def _settleable_package_grants(item: dict[str, object]) -> list[dict[str, object]]:
+    return [_reset_package_periods(grant) for grant in _normalize_package_grants(item.get("package_grants"))]
+
+
+def _package_credit_available(item: dict[str, object]) -> int:
+    total = 0
+    for grant in _active_package_grants(item):
+        total += _package_available(grant)
+    return min(total, PACKAGE_UNLIMITED_SENTINEL)
+
+
 class AuthService:
     def __init__(self, storage: StorageBackend):
         self.storage = storage
@@ -139,8 +259,10 @@ class AuthService:
             "used_credits": _to_nonnegative_int(raw.get("used_credits")),
             "total_recharged": _to_nonnegative_int(raw.get("total_recharged")),
             "credit_grants": _normalize_credit_grants(raw.get("credit_grants")),
+            "package_grants": _normalize_package_grants(raw.get("package_grants")),
             "daily_credits_date": self._clean(raw.get("daily_credits_date")),
             "daily_credits_used": _to_nonnegative_int(raw.get("daily_credits_used")),
+            "daily_bonus_credits": _to_nonnegative_int(raw.get("daily_bonus_credits")),
             "daily_reserved_credits": _to_nonnegative_int(raw.get("daily_reserved_credits")),
             "api_key_display": self._clean(raw.get("api_key_display")),
             "wechat_openid": self._clean(raw.get("wechat_openid")),
@@ -215,10 +337,29 @@ class AuthService:
             return 0, 0
         return _to_nonnegative_int(item.get("daily_credits_used")), reserved
 
+    @staticmethod
+    def _daily_bonus_credits(item: dict[str, object]) -> int:
+        if item.get("role") != "normal":
+            return 0
+        bonus = _to_nonnegative_int(item.get("daily_bonus_credits"))
+        if bonus <= 0:
+            return 0
+        if AuthService._clean(item.get("daily_credits_date")) == _today_key():
+            return bonus
+        if _to_nonnegative_int(item.get("daily_reserved_credits")) > 0:
+            return bonus
+        return 0
+
+    @staticmethod
+    def _daily_total(item: dict[str, object]) -> int:
+        if item.get("role") != "normal":
+            return 0
+        return config.normal_user_daily_credits + AuthService._daily_bonus_credits(item)
+
     @staticmethod
     def _daily_remaining(item: dict[str, object]) -> int:
         used, reserved = AuthService._daily_state(item)
-        return max(0, config.normal_user_daily_credits - used - reserved)
+        return max(0, AuthService._daily_total(item) - used - reserved)
 
     @staticmethod
     def _reset_daily_if_needed(item: dict[str, object]) -> dict[str, object]:
@@ -232,6 +373,7 @@ class AuthService:
         next_item = dict(item)
         next_item["daily_credits_date"] = today
         next_item["daily_credits_used"] = 0
+        next_item["daily_bonus_credits"] = 0
         next_item["daily_reserved_credits"] = 0
         return next_item
 
@@ -240,9 +382,12 @@ class AuthService:
         permanent_credits = _to_nonnegative_int(item.get("credits"))
         expiring_credits = _expiring_credit_remaining(item)
         paid_credits = permanent_credits + expiring_credits
+        package_credits = _package_credit_available(item)
         daily_used, daily_reserved = AuthService._daily_state(item)
+        daily_total = AuthService._daily_total(item)
+        daily_bonus = AuthService._daily_bonus_credits(item)
         daily_remaining = AuthService._daily_remaining(item)
-        total_available = paid_credits + daily_remaining if item.get("role") == "normal" else paid_credits
+        total_available = paid_credits + package_credits + daily_remaining if item.get("role") == "normal" else paid_credits
         return {
             "id": item.get("id"),
             "name": item.get("name"),
@@ -256,6 +401,33 @@ class AuthService:
             "permanent_credits": permanent_credits,
             "expiring_credits": expiring_credits,
             "expiring_reserved_credits": _expiring_credit_reserved(item),
+            "package_credits": package_credits if item.get("role") == "normal" else 0,
+            "package_grants": [
+                {
+                    "id": grant.get("id"),
+                    "name": grant.get("name"),
+                    "remaining": _package_available(grant),
+                    "created_at": grant.get("created_at"),
+                    "starts_at": grant.get("starts_at"),
+                    "expires_at": grant.get("expires_at"),
+                    "source": grant.get("source"),
+                    "code_id": grant.get("code_id"),
+                    "daily_limit": _to_nonnegative_int(grant.get("daily_limit")),
+                    "weekly_limit": _to_nonnegative_int(grant.get("weekly_limit")),
+                    "monthly_limit": _to_nonnegative_int(grant.get("monthly_limit")),
+                    "total_limit": _to_nonnegative_int(grant.get("total_limit")),
+                    "used_total": _to_nonnegative_int(grant.get("used_total")),
+                    "reserved_total": _to_nonnegative_int(grant.get("reserved_total")),
+                    "used_daily": _to_nonnegative_int(grant.get("used_daily")),
+                    "reserved_daily": _to_nonnegative_int(grant.get("reserved_daily")),
+                    "used_weekly": _to_nonnegative_int(grant.get("used_weekly")),
+                    "reserved_weekly": _to_nonnegative_int(grant.get("reserved_weekly")),
+                    "used_monthly": _to_nonnegative_int(grant.get("used_monthly")),
+                    "reserved_monthly": _to_nonnegative_int(grant.get("reserved_monthly")),
+                }
+                for grant in _active_package_grants(item)
+                if _package_available(grant) > 0
+            ],
             "credit_grants": [
                 {
                     "id": grant.get("id"),
@@ -270,9 +442,10 @@ class AuthService:
             "reserved_credits": _to_nonnegative_int(item.get("reserved_credits")),
             "used_credits": _to_nonnegative_int(item.get("used_credits")),
             "total_recharged": _to_nonnegative_int(item.get("total_recharged")),
-            "daily_credits": config.normal_user_daily_credits if item.get("role") == "normal" else 0,
+            "daily_credits": daily_total if item.get("role") == "normal" else 0,
             "daily_credits_remaining": daily_remaining,
             "daily_credits_used": daily_used,
+            "daily_bonus_credits": daily_bonus,
             "daily_reserved_credits": daily_reserved,
             "daily_credits_date": _today_key() if item.get("role") == "normal" else "",
             "has_api_key_display": bool(AuthService._clean(item.get("api_key_display"))),
@@ -393,10 +566,12 @@ class AuthService:
                 "used_credits": 0,
                 "total_recharged": 0,
                 "credit_grants": [],
+                "package_grants": [],
                 "daily_credits_date": _today_key() if role == "normal" else "",
                 "daily_credits_used": 0,
+                "daily_bonus_credits": 0,
                 "daily_reserved_credits": 0,
-                "api_key_display": raw_key if role == "normal" else "",
+                "api_key_display": raw_key if role in {"normal", "user"} else "",
                 "wechat_openid": "",
                 "wechat_nickname": "",
                 "wechat_avatar": "",
@@ -470,8 +645,10 @@ class AuthService:
                 "used_credits": 0,
                 "total_recharged": 0,
                 "credit_grants": [],
+                "package_grants": [],
                 "daily_credits_date": _today_key(),
                 "daily_credits_used": 0,
+                "daily_bonus_credits": 0,
                 "daily_reserved_credits": 0,
                 "api_key_display": raw_key,
                 "wechat_openid": normalized_openid,
@@ -495,6 +672,7 @@ class AuthService:
             "id": item.get("id"),
             "name": item.get("name"),
             "role": item.get("role"),
+            "created_at": item.get("created_at"),
             "account_pool_enabled": bool(item.get("account_pool_enabled")),
             "wechat_openid": self._clean(item.get("wechat_openid")),
             "wechat_bound_at": item.get("wechat_bound_at"),
@@ -513,7 +691,7 @@ class AuthService:
         with self._lock:
             self._reload_locked()
             for item in self._items:
-                if item.get("id") == normalized_id and item.get("role") == "normal":
+                if item.get("id") == normalized_id and item.get("role") in {"normal", "user"}:
                     return self._clean(item.get("api_key_display"))
         return ""
 
@@ -550,7 +728,7 @@ class AuthService:
                 if "key" in updates and updates.get("key") is not None:
                     raw_key = str(updates.get("key") or "")
                     next_item["key_hash"] = self._build_key_hash_locked(raw_key, exclude_id=normalized_id)
-                    if next_role == "normal":
+                    if next_role in {"normal", "user"}:
                         next_item["api_key_display"] = self._clean(raw_key)
                 next_items = list(items)
                 next_items[index] = next_item
@@ -590,9 +768,12 @@ class AuthService:
                 "expiring_credits": 0,
                 "expiring_reserved_credits": 0,
                 "credit_grants": [],
+                "package_credits": 0,
+                "package_grants": [],
                 "daily_credits": 0,
                 "daily_credits_remaining": 0,
                 "daily_credits_used": None,
+                "daily_bonus_credits": 0,
                 "daily_reserved_credits": 0,
                 "daily_credits_date": "",
             }
@@ -610,9 +791,12 @@ class AuthService:
                 "expiring_credits": 0,
                 "expiring_reserved_credits": 0,
                 "credit_grants": [],
+                "package_credits": 0,
+                "package_grants": [],
                 "daily_credits": config.normal_user_daily_credits,
                 "daily_credits_remaining": 0,
                 "daily_credits_used": 0,
+                "daily_bonus_credits": 0,
                 "daily_reserved_credits": 0,
                 "daily_credits_date": _today_key(),
             }
@@ -631,9 +815,12 @@ class AuthService:
             "expiring_credits": _to_nonnegative_int(item.get("expiring_credits")),
             "expiring_reserved_credits": _to_nonnegative_int(item.get("expiring_reserved_credits")),
             "credit_grants": item.get("credit_grants") if isinstance(item.get("credit_grants"), list) else [],
+            "package_credits": _to_nonnegative_int(item.get("package_credits")),
+            "package_grants": item.get("package_grants") if isinstance(item.get("package_grants"), list) else [],
             "daily_credits": _to_nonnegative_int(item.get("daily_credits")),
             "daily_credits_remaining": _to_nonnegative_int(item.get("daily_credits_remaining")),
             "daily_credits_used": _to_nonnegative_int(item.get("daily_credits_used")),
+            "daily_bonus_credits": _to_nonnegative_int(item.get("daily_bonus_credits")),
             "daily_reserved_credits": _to_nonnegative_int(item.get("daily_reserved_credits")),
             "daily_credits_date": self._clean(item.get("daily_credits_date")),
         }
@@ -702,6 +889,116 @@ class AuthService:
         with self._lock:
             return self._update_items_locked(mutate)
 
+    def _add_daily_credits_in_items(
+        self,
+        items: list[dict[str, object]],
+        key_id: str,
+        amount: int,
+        *,
+        source: str = "",
+        code_id: str = "",
+    ) -> tuple[list[dict[str, object]], dict[str, object]]:
+        normalized_amount = max(1, _to_nonnegative_int(amount))
+        today = _today_key()
+        for index, item in enumerate(items):
+            if item.get("id") != key_id or item.get("role") != "normal":
+                continue
+            normalized_item = self._reset_daily_if_needed(dict(item))
+            next_item = dict(normalized_item)
+            next_item["daily_credits_date"] = today
+            next_item["daily_bonus_credits"] = _to_nonnegative_int(normalized_item.get("daily_bonus_credits")) + normalized_amount
+            next_items = list(items)
+            next_items[index] = next_item
+            return next_items, self._public_item(next_item)
+        raise ValueError("普通用户不存在")
+
+    def add_daily_credits(self, key_id: str, amount: int, *, source: str = "", code_id: str = "") -> dict[str, object]:
+        normalized_id = self._clean(key_id)
+        if not normalized_id:
+            raise ValueError("用户不存在")
+
+        def mutate(items: list[dict[str, object]]) -> tuple[list[dict[str, object]], dict[str, object]]:
+            return self._add_daily_credits_in_items(
+                items,
+                normalized_id,
+                int(amount),
+                source=source,
+                code_id=code_id,
+            )
+
+        with self._lock:
+            return self._update_items_locked(mutate)
+
+    def _add_package_grant_in_items(
+        self,
+        items: list[dict[str, object]],
+        key_id: str,
+        package_plan: dict[str, object],
+        *,
+        source: str = "",
+        code_id: str = "",
+    ) -> tuple[list[dict[str, object]], dict[str, object]]:
+        duration_days = max(1, _to_nonnegative_int(package_plan.get("duration_days")) or 1)
+        now = datetime.now(timezone.utc)
+        grant = {
+            "id": uuid.uuid4().hex[:12],
+            "name": self._clean(package_plan.get("name")) or "套餐",
+            "created_at": now.isoformat(),
+            "starts_at": now.isoformat(),
+            "expires_at": (now + timedelta(days=duration_days)).isoformat(),
+            "source": self._clean(source),
+            "code_id": self._clean(code_id),
+            "daily_limit": _to_nonnegative_int(package_plan.get("daily_limit")),
+            "weekly_limit": _to_nonnegative_int(package_plan.get("weekly_limit")),
+            "monthly_limit": _to_nonnegative_int(package_plan.get("monthly_limit")),
+            "total_limit": _to_nonnegative_int(package_plan.get("total_limit")),
+            "used_total": 0,
+            "reserved_total": 0,
+            "used_daily": 0,
+            "reserved_daily": 0,
+            "used_weekly": 0,
+            "reserved_weekly": 0,
+            "used_monthly": 0,
+            "reserved_monthly": 0,
+        }
+        if max(
+            _to_nonnegative_int(grant.get("daily_limit")),
+            _to_nonnegative_int(grant.get("weekly_limit")),
+            _to_nonnegative_int(grant.get("monthly_limit")),
+            _to_nonnegative_int(grant.get("total_limit")),
+        ) <= 0:
+            raise ValueError("套餐卡密至少需要设置一个日/周/月/总限额")
+        grant = _reset_package_periods(grant)
+        for index, item in enumerate(items):
+            if item.get("id") != key_id or item.get("role") != "normal":
+                continue
+            normalized_item = self._reset_daily_if_needed(dict(item))
+            grants = _active_package_grants(normalized_item)
+            grants.append(grant)
+            next_item = dict(normalized_item)
+            next_item["package_grants"] = grants
+            next_items = list(items)
+            next_items[index] = next_item
+            return next_items, self._public_item(next_item)
+        raise ValueError("普通用户不存在")
+
+    def add_package_grant(self, key_id: str, package_plan: dict[str, object], *, source: str = "", code_id: str = "") -> dict[str, object]:
+        normalized_id = self._clean(key_id)
+        if not normalized_id:
+            raise ValueError("用户不存在")
+
+        def mutate(items: list[dict[str, object]]) -> tuple[list[dict[str, object]], dict[str, object]]:
+            return self._add_package_grant_in_items(
+                items,
+                normalized_id,
+                package_plan,
+                source=source,
+                code_id=code_id,
+            )
+
+        with self._lock:
+            return self._update_items_locked(mutate)
+
     def reserve_credits(self, key_id: str, amount: int) -> dict[str, object]:
         amount = max(1, int(amount))
         normalized_id = self._clean(key_id)
@@ -713,6 +1010,7 @@ class AuthService:
                 normalized_item = self._reset_daily_if_needed(dict(item))
                 credits = _to_nonnegative_int(normalized_item.get("credits"))
                 grants = _normalize_credit_grants(normalized_item.get("credit_grants"))
+                package_grants = _active_package_grants(normalized_item)
                 expiring_available = sum(
                     _to_nonnegative_int(grant.get("remaining"))
                     for grant in grants
@@ -720,7 +1018,25 @@ class AuthService:
                 )
                 daily_available = self._daily_remaining(normalized_item)
                 daily_to_reserve = min(amount, daily_available)
-                paid_to_reserve = amount - daily_to_reserve
+                remaining_to_reserve = amount - daily_to_reserve
+                package_reservations: list[dict[str, object]] = []
+                for grant in package_grants:
+                    if remaining_to_reserve <= 0:
+                        break
+                    take = min(_package_available(grant), remaining_to_reserve)
+                    if take <= 0:
+                        continue
+                    if _to_nonnegative_int(grant.get("total_limit")) > 0:
+                        grant["reserved_total"] = _to_nonnegative_int(grant.get("reserved_total")) + take
+                    if _to_nonnegative_int(grant.get("daily_limit")) > 0:
+                        grant["reserved_daily"] = _to_nonnegative_int(grant.get("reserved_daily")) + take
+                    if _to_nonnegative_int(grant.get("weekly_limit")) > 0:
+                        grant["reserved_weekly"] = _to_nonnegative_int(grant.get("reserved_weekly")) + take
+                    if _to_nonnegative_int(grant.get("monthly_limit")) > 0:
+                        grant["reserved_monthly"] = _to_nonnegative_int(grant.get("reserved_monthly")) + take
+                    package_reservations.append({"id": grant.get("id"), "amount": take})
+                    remaining_to_reserve -= take
+                paid_to_reserve = remaining_to_reserve
                 if credits + expiring_available < paid_to_reserve:
                     raise ValueError("剩余次数不足，请先充值")
                 next_item = dict(normalized_item)
@@ -742,9 +1058,11 @@ class AuthService:
                 next_item["reserved_credits"] = _to_nonnegative_int(normalized_item.get("reserved_credits")) + permanent_to_reserve
                 next_item["daily_reserved_credits"] = _to_nonnegative_int(normalized_item.get("daily_reserved_credits")) + daily_to_reserve
                 next_item["credit_grants"] = grants
+                next_item["package_grants"] = package_grants
                 result = self._public_item(next_item)
                 result["_credit_reservation"] = {
                     "daily": daily_to_reserve,
+                    "packages": package_reservations,
                     "paid": paid_to_reserve,
                     "permanent_paid": permanent_to_reserve,
                     "grants": grant_reservations,
@@ -763,6 +1081,7 @@ class AuthService:
         amount: int,
         *,
         daily_amount: int | None = None,
+        package_reservations: list[dict[str, object]] | None = None,
         paid_amount: int | None = None,
         grant_reservations: list[dict[str, object]] | None = None,
     ) -> dict[str, object] | None:
@@ -777,6 +1096,41 @@ class AuthService:
                 daily_reserved = _to_nonnegative_int(normalized_item.get("daily_reserved_credits"))
                 paid_reserved = _to_nonnegative_int(normalized_item.get("reserved_credits"))
                 grants = _normalize_credit_grants(normalized_item.get("credit_grants"))
+                package_grants = _settleable_package_grants(normalized_item)
+                package_consumed = 0
+                for reservation in package_reservations or []:
+                    if not isinstance(reservation, dict):
+                        continue
+                    package_id = self._clean(reservation.get("id"))
+                    requested = _to_nonnegative_int(reservation.get("amount"))
+                    if not package_id or requested <= 0:
+                        continue
+                    for grant in package_grants:
+                        if self._clean(grant.get("id")) != package_id:
+                            continue
+                        consumed_from_package = 0
+                        if _to_nonnegative_int(grant.get("total_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_total")))
+                            grant["reserved_total"] = _to_nonnegative_int(grant.get("reserved_total")) - take
+                            grant["used_total"] = _to_nonnegative_int(grant.get("used_total")) + take
+                            consumed_from_package = max(consumed_from_package, take)
+                        if _to_nonnegative_int(grant.get("daily_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_daily")))
+                            grant["reserved_daily"] = _to_nonnegative_int(grant.get("reserved_daily")) - take
+                            grant["used_daily"] = _to_nonnegative_int(grant.get("used_daily")) + take
+                            consumed_from_package = max(consumed_from_package, take)
+                        if _to_nonnegative_int(grant.get("weekly_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_weekly")))
+                            grant["reserved_weekly"] = _to_nonnegative_int(grant.get("reserved_weekly")) - take
+                            grant["used_weekly"] = _to_nonnegative_int(grant.get("used_weekly")) + take
+                            consumed_from_package = max(consumed_from_package, take)
+                        if _to_nonnegative_int(grant.get("monthly_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_monthly")))
+                            grant["reserved_monthly"] = _to_nonnegative_int(grant.get("reserved_monthly")) - take
+                            grant["used_monthly"] = _to_nonnegative_int(grant.get("used_monthly")) + take
+                            consumed_from_package = max(consumed_from_package, take)
+                        package_consumed += consumed_from_package
+                        break
                 grant_consumed = 0
                 for reservation in grant_reservations or []:
                     if not isinstance(reservation, dict):
@@ -804,7 +1158,8 @@ class AuthService:
                 next_item["daily_credits_used"] = _to_nonnegative_int(normalized_item.get("daily_credits_used")) + daily_consumed
                 next_item["reserved_credits"] = paid_reserved - paid_consumed
                 next_item["credit_grants"] = grants
-                next_item["used_credits"] = _to_nonnegative_int(normalized_item.get("used_credits")) + consumed + grant_consumed
+                next_item["package_grants"] = package_grants
+                next_item["used_credits"] = _to_nonnegative_int(normalized_item.get("used_credits")) + consumed + grant_consumed + package_consumed
                 next_items = list(items)
                 next_items[index] = next_item
                 return next_items, self._public_item(next_item)
@@ -820,6 +1175,7 @@ class AuthService:
         *,
         daily_amount: int | None = None,
         paid_amount: int | None = None,
+        package_reservations: list[dict[str, object]] | None = None,
         grant_reservations: list[dict[str, object]] | None = None,
     ) -> dict[str, object] | None:
         amount = max(1, int(amount))
@@ -833,6 +1189,30 @@ class AuthService:
                 daily_reserved = _to_nonnegative_int(normalized_item.get("daily_reserved_credits"))
                 paid_reserved = _to_nonnegative_int(normalized_item.get("reserved_credits"))
                 grants = _normalize_credit_grants(normalized_item.get("credit_grants"))
+                package_grants = _settleable_package_grants(normalized_item)
+                for reservation in package_reservations or []:
+                    if not isinstance(reservation, dict):
+                        continue
+                    package_id = self._clean(reservation.get("id"))
+                    requested = _to_nonnegative_int(reservation.get("amount"))
+                    if not package_id or requested <= 0:
+                        continue
+                    for grant in package_grants:
+                        if self._clean(grant.get("id")) != package_id:
+                            continue
+                        if _to_nonnegative_int(grant.get("total_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_total")))
+                            grant["reserved_total"] = _to_nonnegative_int(grant.get("reserved_total")) - take
+                        if _to_nonnegative_int(grant.get("daily_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_daily")))
+                            grant["reserved_daily"] = _to_nonnegative_int(grant.get("reserved_daily")) - take
+                        if _to_nonnegative_int(grant.get("weekly_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_weekly")))
+                            grant["reserved_weekly"] = _to_nonnegative_int(grant.get("reserved_weekly")) - take
+                        if _to_nonnegative_int(grant.get("monthly_limit")) > 0:
+                            take = min(requested, _to_nonnegative_int(grant.get("reserved_monthly")))
+                            grant["reserved_monthly"] = _to_nonnegative_int(grant.get("reserved_monthly")) - take
+                        break
                 for reservation in grant_reservations or []:
                     if not isinstance(reservation, dict):
                         continue
@@ -858,6 +1238,7 @@ class AuthService:
                 next_item["reserved_credits"] = paid_reserved - paid_refunded
                 next_item["credits"] = _to_nonnegative_int(normalized_item.get("credits")) + paid_refunded
                 next_item["credit_grants"] = grants
+                next_item["package_grants"] = package_grants
                 next_items = list(items)
                 next_items[index] = next_item
                 return next_items, self._public_item(next_item)

services/config.py

@@ -55,6 +55,16 @@ DEFAULT_FREE_ACCOUNT_CLEANUP = {
     "action": "mark_abnormal",
 }
 
+DEFAULT_REDEEM_CODE_CLEANUP = {
+    "enabled": False,
+    "interval_minutes": 1440,
+    "delete_expired": True,
+    "delete_disabled": False,
+    "archive_redeemed": False,
+    "redeemed_older_than_days": 90,
+    "limit": 1000,
+}
+
 BRANDING_KEYS = (
     "site_title",
     "site_logo_url",
@@ -215,6 +225,39 @@ def _normalize_free_account_cleanup_settings(value: object) -> dict[str, object]
     }
 
 
+def _normalize_redeem_code_cleanup_settings(value: object) -> dict[str, object]:
+    source = value if isinstance(value, dict) else {}
+    return {
+        "enabled": _normalize_bool(source.get("enabled"), bool(DEFAULT_REDEEM_CODE_CLEANUP["enabled"])),
+        "interval_minutes": _normalize_positive_int(
+            source.get("interval_minutes"),
+            int(DEFAULT_REDEEM_CODE_CLEANUP["interval_minutes"]),
+            1,
+        ),
+        "delete_expired": _normalize_bool(
+            source.get("delete_expired"),
+            bool(DEFAULT_REDEEM_CODE_CLEANUP["delete_expired"]),
+        ),
+        "delete_disabled": _normalize_bool(
+            source.get("delete_disabled"),
+            bool(DEFAULT_REDEEM_CODE_CLEANUP["delete_disabled"]),
+        ),
+        "archive_redeemed": _normalize_bool(
+            source.get("archive_redeemed"),
+            bool(DEFAULT_REDEEM_CODE_CLEANUP["archive_redeemed"]),
+        ),
+        "redeemed_older_than_days": _normalize_positive_int(
+            source.get("redeemed_older_than_days"),
+            int(DEFAULT_REDEEM_CODE_CLEANUP["redeemed_older_than_days"]),
+            1,
+        ),
+        "limit": min(
+            20000,
+            _normalize_positive_int(source.get("limit"), int(DEFAULT_REDEEM_CODE_CLEANUP["limit"]), 1),
+        ),
+    }
+
+
 def _normalize_image_proxy_base_url(value: object) -> str:
     text = str(value or "").strip().rstrip("/")
     if not text:
@@ -501,6 +544,9 @@ class ConfigStore:
     def get_free_account_cleanup_settings(self) -> dict[str, object]:
         return _normalize_free_account_cleanup_settings(self.data.get("free_account_cleanup"))
 
+    def get_redeem_code_cleanup_settings(self) -> dict[str, object]:
+        return _normalize_redeem_code_cleanup_settings(self.data.get("redeem_code_cleanup"))
+
     @property
     def log_levels(self) -> list[str]:
         levels = self.data.get("log_levels")
@@ -593,6 +639,7 @@ class ConfigStore:
         data["auto_remove_invalid_accounts"] = self.auto_remove_invalid_accounts
         data["auto_remove_rate_limited_accounts"] = self.auto_remove_rate_limited_accounts
         data["free_account_cleanup"] = self.get_free_account_cleanup_settings()
+        data["redeem_code_cleanup"] = self.get_redeem_code_cleanup_settings()
         data["log_levels"] = self.log_levels
         data["sensitive_words"] = self.sensitive_words
         data["image_proxy_base_url"] = self.image_proxy_base_url
@@ -620,6 +667,10 @@ class ConfigStore:
             next_data["free_account_cleanup"] = _normalize_free_account_cleanup_settings(
                 next_data.get("free_account_cleanup")
             )
+        if "redeem_code_cleanup" in next_data:
+            next_data["redeem_code_cleanup"] = _normalize_redeem_code_cleanup_settings(
+                next_data.get("redeem_code_cleanup")
+            )
         if "image_proxy_base_url" in next_data:
             next_data["image_proxy_base_url"] = _normalize_image_proxy_base_url(next_data.get("image_proxy_base_url"))
         if any(key in incoming_data for key in BRANDING_KEYS):

services/image_task_service.py

@@ -258,10 +258,12 @@ class ImageTaskService:
                     reservation = {}
                 daily_reserved = max(0, int(reservation.get("daily") or 0))
                 paid_reserved = max(0, int(reservation.get("permanent_paid") if "permanent_paid" in reservation else reservation.get("paid") or 0))
+                package_reservations = reservation.get("packages") if isinstance(reservation.get("packages"), list) else []
                 grant_reservations = reservation.get("grants") if isinstance(reservation.get("grants"), list) else []
             else:
                 daily_reserved = 0
                 paid_reserved = 0
+                package_reservations = []
                 grant_reservations = []
             task = {
                 "id": task_id,
@@ -278,6 +280,7 @@ class ImageTaskService:
                 task["credit_reserved"] = normalized_credit_amount
                 task["credit_daily_reserved"] = daily_reserved
                 task["credit_paid_reserved"] = paid_reserved
+                task["credit_package_reservations"] = package_reservations
                 task["credit_grant_reservations"] = grant_reservations
                 task["credit_settled"] = False
             self._tasks[key] = task
@@ -406,9 +409,11 @@ class ImageTaskService:
             amount = max(0, int(task.get("credit_reserved") or 0))
             daily_amount = max(0, int(task.get("credit_daily_reserved") or 0))
             paid_amount = max(0, int(task.get("credit_paid_reserved") or 0))
+            package_reservations = task.get("credit_package_reservations") if isinstance(task.get("credit_package_reservations"), list) else []
             grant_reservations = task.get("credit_grant_reservations") if isinstance(task.get("credit_grant_reservations"), list) else []
+            package_amount = sum(max(0, int(item.get("amount") or 0)) for item in package_reservations if isinstance(item, dict))
             grant_amount = sum(max(0, int(item.get("amount") or 0)) for item in grant_reservations if isinstance(item, dict))
-            if amount > 0 and daily_amount + paid_amount + grant_amount == 0:
+            if amount > 0 and daily_amount + paid_amount + package_amount + grant_amount == 0:
                 paid_amount = amount
             if not user_id or amount <= 0:
                 task["credit_settled"] = True
@@ -423,6 +428,7 @@ class ImageTaskService:
                         amount,
                         daily_amount=daily_amount,
                         paid_amount=paid_amount,
+                        package_reservations=package_reservations,
                         grant_reservations=grant_reservations,
                     )
                 else:
@@ -431,6 +437,7 @@ class ImageTaskService:
                         amount,
                         daily_amount=daily_amount,
                         paid_amount=paid_amount,
+                        package_reservations=package_reservations,
                         grant_reservations=grant_reservations,
                     )
             finally:
@@ -477,6 +484,7 @@ class ImageTaskService:
                 task["credit_reserved"] = credit_reserved
                 task["credit_daily_reserved"] = max(0, int(item.get("credit_daily_reserved") or 0))
                 task["credit_paid_reserved"] = max(0, int(item.get("credit_paid_reserved") or 0))
+                task["credit_package_reservations"] = item.get("credit_package_reservations") if isinstance(item.get("credit_package_reservations"), list) else []
                 task["credit_grant_reservations"] = item.get("credit_grant_reservations") if isinstance(item.get("credit_grant_reservations"), list) else []
                 task["credit_settled"] = bool(item.get("credit_settled"))
             data = item.get("data")
@@ -512,9 +520,11 @@ class ImageTaskService:
         amount = max(0, int(task.get("credit_reserved") or 0))
         daily_amount = max(0, int(task.get("credit_daily_reserved") or 0))
         paid_amount = max(0, int(task.get("credit_paid_reserved") or 0))
+        package_reservations = task.get("credit_package_reservations") if isinstance(task.get("credit_package_reservations"), list) else []
         grant_reservations = task.get("credit_grant_reservations") if isinstance(task.get("credit_grant_reservations"), list) else []
+        package_amount = sum(max(0, int(item.get("amount") or 0)) for item in package_reservations if isinstance(item, dict))
         grant_amount = sum(max(0, int(item.get("amount") or 0)) for item in grant_reservations if isinstance(item, dict))
-        if amount > 0 and daily_amount + paid_amount + grant_amount == 0:
+        if amount > 0 and daily_amount + paid_amount + package_amount + grant_amount == 0:
             paid_amount = amount
         if not user_id or amount <= 0:
             task["credit_settled"] = True
@@ -527,6 +537,7 @@ class ImageTaskService:
                 amount,
                 daily_amount=daily_amount,
                 paid_amount=paid_amount,
+                package_reservations=package_reservations,
                 grant_reservations=grant_reservations,
             )
         finally:

services/shop_service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import hashlib
+import json
 import secrets
 import uuid
 from datetime import datetime, timedelta, timezone
@@ -8,7 +9,7 @@ from threading import Lock
 from typing import Any, Callable
 
 from services.auth_service import auth_service
-from services.config import config
+from services.config import DATA_DIR, config
 from services.storage.base import StorageBackend
 
 REDEEM_BATCH_ALREADY_USED_MESSAGE = "这批福利卡密您已兑换过一个，留给别人吧"
@@ -29,6 +30,36 @@ def _to_positive_int(value: object, default: int = 1) -> int:
         return default
 
 
+def _to_nonnegative_int(value: object) -> int:
+    try:
+        return max(0, int(value or 0))
+    except (TypeError, ValueError):
+        return 0
+
+
+def _normalize_package_plan(value: object, *, require_limits: bool = False) -> dict[str, Any] | None:
+    if not isinstance(value, dict):
+        if require_limits:
+            raise ValueError("套餐卡密缺少套餐配置")
+        return None
+    plan = {
+        "name": _clean(value.get("name")) or "套餐",
+        "duration_days": min(3650, _to_positive_int(value.get("duration_days"), 1)),
+        "daily_limit": min(1_000_000, _to_nonnegative_int(value.get("daily_limit"))),
+        "weekly_limit": min(1_000_000, _to_nonnegative_int(value.get("weekly_limit"))),
+        "monthly_limit": min(1_000_000, _to_nonnegative_int(value.get("monthly_limit"))),
+        "total_limit": min(1_000_000, _to_nonnegative_int(value.get("total_limit"))),
+    }
+    if require_limits and max(
+        int(plan["daily_limit"]),
+        int(plan["weekly_limit"]),
+        int(plan["monthly_limit"]),
+        int(plan["total_limit"]),
+    ) <= 0:
+        raise ValueError("套餐卡密至少需要设置一个日/周/月/总限额")
+    return plan
+
+
 def _parse_iso_datetime(value: object) -> datetime | None:
     raw = _clean(value)
     if not raw:
@@ -49,6 +80,16 @@ def _is_expired(item: dict[str, Any], *, now: datetime | None = None) -> bool:
     return expires_at <= current
 
 
+def _is_not_started(item: dict[str, Any], *, now: datetime | None = None) -> bool:
+    starts_at = _parse_iso_datetime(item.get("starts_at"))
+    if starts_at is None:
+        return False
+    current = now or datetime.now(timezone.utc)
+    if starts_at.tzinfo is None:
+        starts_at = starts_at.replace(tzinfo=timezone.utc)
+    return starts_at > current
+
+
 def normalize_redeem_code(value: str) -> str:
     return "".join(str(value or "").upper().split())
 
@@ -57,7 +98,77 @@ def hash_redeem_code(value: str) -> str:
     return hashlib.sha256(normalize_redeem_code(value).encode("utf-8")).hexdigest()
 
 
-def _public_code(item: dict[str, Any], users_by_id: dict[str, dict[str, Any]] | None = None) -> dict[str, Any]:
+def _normalize_code_type(value: object) -> str:
+    normalized = _clean(value).lower().replace("-", "_")
+    if normalized in {"daily_gift", "limited_gift", "welfare", "gift", "daily"}:
+        return "daily_gift"
+    if normalized in {"package", "plan", "subscription", "membership"}:
+        return "package"
+    return "normal"
+
+
+def _code_credit_source(code_type: object) -> str:
+    normalized = _normalize_code_type(code_type)
+    if normalized == "daily_gift":
+        return "daily_gift_code"
+    if normalized == "package":
+        return "package_code"
+    return "redeem"
+
+
+def _china_day_window(value: object, *, now_dt: datetime) -> tuple[str, str, str]:
+    china_tz = timezone(timedelta(hours=8))
+    today = now_dt.astimezone(china_tz).date()
+    raw = _clean(value)
+    if raw:
+        try:
+            target_day = datetime.strptime(raw[:10], "%Y-%m-%d").date()
+        except ValueError as exc:
+            raise ValueError("每日赠送卡密日期格式应为 YYYY-MM-DD") from exc
+    else:
+        target_day = today
+    if target_day < today:
+        raise ValueError("每日赠送卡密不能创建过去日期")
+    day_text = target_day.isoformat()
+    start = datetime(target_day.year, target_day.month, target_day.day, 0, 0, 0, 0, tzinfo=china_tz)
+    end = datetime(target_day.year, target_day.month, target_day.day, 23, 59, 59, 999000, tzinfo=china_tz)
+    return day_text, start.astimezone(timezone.utc).isoformat(), end.astimezone(timezone.utc).isoformat()
+
+
+def _plaintext_code(item: dict[str, Any]) -> str:
+    for key in ("code_plaintext", "plain_code", "code"):
+        value = _clean(item.get(key))
+        if value:
+            return value
+    return ""
+
+
+def _archive_codes(matches: list[tuple[dict[str, Any], str]], *, archived_at: str, run_id: str) -> dict[str, Any]:
+    if not matches:
+        return {"archived": 0, "path": None}
+    archive_dt = _parse_iso_datetime(archived_at) or datetime.now(timezone.utc)
+    archive_dir = DATA_DIR / "redeem_code_archives"
+    archive_dir.mkdir(parents=True, exist_ok=True)
+    archive_path = archive_dir / f"redeem-codes-{archive_dt:%Y-%m}.jsonl"
+    with archive_path.open("a", encoding="utf-8") as file:
+        for item, reason in matches:
+            payload = {
+                "version": 1,
+                "archived_at": archived_at,
+                "run_id": run_id,
+                "reason": reason,
+                "item": dict(item),
+            }
+            file.write(json.dumps(payload, ensure_ascii=False, separators=(",", ":")) + "\n")
+    return {"archived": len(matches), "path": str(archive_path)}
+
+
+def _public_code(
+    item: dict[str, Any],
+    users_by_id: dict[str, dict[str, Any]] | None = None,
+    *,
+    include_plaintext: bool = False,
+) -> dict[str, Any]:
     redeemed_by = _clean(item.get("redeemed_by"))
     redeemed_user = (users_by_id or {}).get(redeemed_by) if redeemed_by else None
     result = {
@@ -65,18 +176,25 @@ def _public_code(item: dict[str, Any], users_by_id: dict[str, dict[str, Any]] |
         "prefix": item.get("prefix"),
         "credits": item.get("credits"),
         "status": item.get("status"),
+        "code_type": _normalize_code_type(item.get("code_type")),
         "batch": item.get("batch"),
         "batch_id": item.get("batch_id"),
         "batch_single_use": bool(item.get("batch_single_use")),
         "note": item.get("note"),
         "created_at": item.get("created_at"),
+        "starts_at": item.get("starts_at"),
         "expires_at": item.get("expires_at"),
+        "daily_gift_date": item.get("daily_gift_date"),
+        "package_plan": _normalize_package_plan(item.get("package_plan")),
         "credit_expires_days": item.get("credit_expires_days"),
         "credit_expires_at": item.get("credit_expires_at"),
+        "is_not_started": _is_not_started(item),
         "is_expired": _is_expired(item),
         "redeemed_by": item.get("redeemed_by"),
         "redeemed_at": item.get("redeemed_at"),
     }
+    if include_plaintext:
+        result["code"] = _plaintext_code(item) or None
     if redeemed_user:
         result["redeemed_user"] = {
             "id": redeemed_user.get("id"),
@@ -164,7 +282,20 @@ class ShopService:
         with self._lock:
             codes = self._load_codes_locked()
             users_by_id = {str(item.get("id") or ""): item for item in auth_service.list_keys(role="normal")}
-            return [_public_code(item, users_by_id) for item in codes]
+            return [_public_code(item, users_by_id, include_plaintext=True) for item in codes]
+
+    def list_user_codes(self, user_id: str) -> list[dict[str, Any]]:
+        normalized_user_id = _clean(user_id)
+        if not normalized_user_id:
+            return []
+        with self._lock:
+            items = [
+                _public_code(item, include_plaintext=True)
+                for item in self._load_codes_locked()
+                if item.get("status") == "redeemed" and _clean(item.get("redeemed_by")) == normalized_user_id
+            ]
+        items.sort(key=lambda item: str(item.get("redeemed_at") or item.get("created_at") or ""), reverse=True)
+        return items[:100]
 
     def list_ledger(self) -> list[dict[str, Any]]:
         with self._lock:
@@ -201,10 +332,13 @@ class ShopService:
                     if callable(has_redeemed_code_in_batch) and batch_id:
                         batch_used = bool(has_redeemed_code_in_batch(batch_id, user_id))
                 public_item = _public_code(item)
-                redeemable = item.get("status") == "active" and not _is_expired(item) and not batch_used
+                not_started = _is_not_started(item)
+                redeemable = item.get("status") == "active" and not not_started and not _is_expired(item) and not batch_used
                 message = "卡密可兑换"
                 if item.get("status") != "active":
                     message = "这张卡密已使用或已失效"
+                elif not_started:
+                    message = "这张每日赠送卡密还没到兑换日期"
                 elif _is_expired(item):
                     message = "这张卡密已过期"
                 elif batch_used:
@@ -216,10 +350,13 @@ class ShopService:
                 if item.get("code_hash") != code_hash:
                     continue
                 public_item = _public_code(item)
-                redeemable = item.get("status") == "active" and not _is_expired(item) and not _redeem_batch_used_by_user(state, item, user_id)
+                not_started = _is_not_started(item)
+                redeemable = item.get("status") == "active" and not not_started and not _is_expired(item) and not _redeem_batch_used_by_user(state, item, user_id)
                 message = "卡密可兑换"
                 if item.get("status") != "active":
                     message = "这张卡密已使用或已失效"
+                elif not_started:
+                    message = "这张每日赠送卡密还没到兑换日期"
                 elif _is_expired(item):
                     message = "这张卡密已过期"
                 elif _redeem_batch_used_by_user(state, item, user_id):
@@ -238,15 +375,55 @@ class ShopService:
         validity_days: int | None = None,
         credit_expires_days: int | None = None,
         batch_single_use: bool = False,
+        code_type: str = "normal",
+        daily_gift_date: str = "",
+        package_name: str = "",
+        package_duration_days: int = 1,
+        package_daily_limit: int | None = None,
+        package_weekly_limit: int | None = None,
+        package_monthly_limit: int | None = None,
+        package_total_limit: int | None = None,
     ) -> dict[str, Any]:
         count = min(1000, _to_positive_int(count))
         credits = _to_positive_int(credits)
         normalized_validity_days = None if validity_days is None else min(3650, _to_positive_int(validity_days))
         normalized_credit_expires_days = None if credit_expires_days is None else min(3650, _to_positive_int(credit_expires_days))
         normalized_prefix = "".join(_clean(prefix).upper().split("-"))[:12] or "CS"
+        normalized_code_type = _normalize_code_type(code_type)
+        package_plan = None
+        if normalized_code_type == "package":
+            package_plan = _normalize_package_plan(
+                {
+                    "name": package_name,
+                    "duration_days": package_duration_days,
+                    "daily_limit": package_daily_limit,
+                    "weekly_limit": package_weekly_limit,
+                    "monthly_limit": package_monthly_limit,
+                    "total_limit": package_total_limit,
+                },
+                require_limits=True,
+            )
+            normalized_credit_expires_days = None
+        if normalized_code_type == "daily_gift":
+            normalized_credit_expires_days = None
+            batch_single_use = True
+        display_credits = credits
+        if package_plan is not None:
+            display_credits = (
+                int(package_plan.get("total_limit") or 0)
+                or int(package_plan.get("monthly_limit") or 0)
+                or int(package_plan.get("weekly_limit") or 0)
+                or int(package_plan.get("daily_limit") or 0)
+                or credits
+            )
         now_dt = datetime.now(timezone.utc)
         now = now_dt.isoformat()
-        expires_at = (now_dt + timedelta(days=normalized_validity_days)).isoformat() if normalized_validity_days else None
+        if normalized_code_type == "daily_gift":
+            normalized_daily_gift_date, starts_at, expires_at = _china_day_window(daily_gift_date, now_dt=now_dt)
+        else:
+            normalized_daily_gift_date = ""
+            starts_at = None
+            expires_at = (now_dt + timedelta(days=normalized_validity_days)).isoformat() if normalized_validity_days else None
         batch_id = uuid.uuid4().hex[:12]
 
         def mutate(state: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
@@ -265,15 +442,20 @@ class ShopService:
                 item = {
                     "id": uuid.uuid4().hex[:12],
                     "code_hash": code_hash,
+                    "code_plaintext": plaintext,
                     "prefix": normalized_prefix,
-                    "credits": credits,
+                    "credits": display_credits,
                     "status": "active",
+                    "code_type": normalized_code_type,
                     "batch": _clean(batch),
                     "batch_id": batch_id,
                     "batch_single_use": bool(batch_single_use),
                     "note": _clean(note),
                     "created_at": now,
+                    "starts_at": starts_at,
                     "expires_at": expires_at,
+                    "daily_gift_date": normalized_daily_gift_date,
+                    "package_plan": package_plan,
                     "credit_expires_days": normalized_credit_expires_days,
                     "redeemed_by": None,
                     "redeemed_at": None,
@@ -288,18 +470,22 @@ class ShopService:
                     "time": now,
                     "type": "create_codes",
                     "delta": count,
-                    "credits": credits,
+                    "credits": display_credits,
+                    "code_type": normalized_code_type,
                     "batch": _clean(batch),
                     "batch_id": batch_id,
                     "batch_single_use": bool(batch_single_use),
+                    "starts_at": starts_at,
                     "expires_at": expires_at,
+                    "daily_gift_date": normalized_daily_gift_date,
+                    "package_plan": package_plan,
                     "credit_expires_days": normalized_credit_expires_days,
                     "note": _clean(note),
                 }
             )
             return state, {
                 "codes": plaintext_codes,
-                "items": [_public_code(item) for item in created_items],
+                "items": [_public_code(item, include_plaintext=True) for item in created_items],
             }
 
         with self._lock:
@@ -321,7 +507,7 @@ class ShopService:
                 state["ledger"].append(
                     {"id": uuid.uuid4().hex[:12], "time": _now_iso(), "type": "disable_code", "code_id": normalized_id}
                 )
-                return state, _public_code(item)
+                return state, _public_code(item, include_plaintext=True)
             raise ValueError("卡密不存在")
 
         with self._lock:
@@ -341,7 +527,7 @@ class ShopService:
                 state["ledger"].append(
                     {"id": uuid.uuid4().hex[:12], "time": _now_iso(), "type": "enable_code", "code_id": normalized_id}
                 )
-                return state, _public_code(item)
+                return state, _public_code(item, include_plaintext=True)
             raise ValueError("卡密不存在")
 
         with self._lock:
@@ -368,25 +554,143 @@ class ShopService:
                         "batch": _clean(removed.get("batch")),
                     }
                 )
-                return state, _public_code(removed)
+                return state, _public_code(removed, include_plaintext=True)
             raise ValueError("卡密不存在")
 
         with self._lock:
             return self._update_codes_state_locked(mutate)
 
+    def cleanup_codes(
+        self,
+        *,
+        delete_expired: bool = True,
+        delete_disabled: bool = False,
+        delete_redeemed: bool = False,
+        redeemed_older_than_days: int = 90,
+        limit: int = 1000,
+        dry_run: bool = True,
+    ) -> dict[str, Any]:
+        normalized_limit = max(1, min(20000, _to_positive_int(limit, 1000)))
+        normalized_redeemed_days = max(1, min(3650, _to_positive_int(redeemed_older_than_days, 90)))
+        now_dt = datetime.now(timezone.utc)
+        redeemed_cutoff = now_dt - timedelta(days=normalized_redeemed_days)
+
+        def match_reason(item: dict[str, Any]) -> str:
+            status = _clean(item.get("status"))
+            if delete_expired and status == "active" and _is_expired(item, now=now_dt):
+                return "expired"
+            if delete_disabled and status == "disabled":
+                return "disabled"
+            if delete_redeemed and status == "redeemed":
+                redeemed_at = _parse_iso_datetime(item.get("redeemed_at"))
+                if redeemed_at is None:
+                    return ""
+                if redeemed_at.tzinfo is None:
+                    redeemed_at = redeemed_at.replace(tzinfo=timezone.utc)
+                if redeemed_at <= redeemed_cutoff:
+                    return "redeemed"
+            return ""
+
+        def summarize(
+            matches: list[tuple[dict[str, Any], str]],
+            deleted: int,
+            archive: dict[str, Any] | None = None,
+        ) -> dict[str, Any]:
+            reason_counts = {"expired": 0, "disabled": 0, "redeemed": 0}
+            for _item, reason in matches:
+                if reason in reason_counts:
+                    reason_counts[reason] += 1
+            archive = archive or {}
+            return {
+                "matched": len(matches),
+                "deleted": deleted,
+                "archived": int(archive.get("archived") or 0),
+                "archive_path": archive.get("path"),
+                "expired": reason_counts["expired"],
+                "disabled": reason_counts["disabled"],
+                "redeemed": reason_counts["redeemed"],
+                "limit": normalized_limit,
+            }
+
+        def collect_matches(codes: list[dict[str, Any]]) -> list[tuple[dict[str, Any], str]]:
+            matches: list[tuple[dict[str, Any], str]] = []
+            for item in codes:
+                if len(matches) >= normalized_limit:
+                    break
+                reason = match_reason(item)
+                if reason:
+                    matches.append((item, reason))
+            return matches
+
+        if dry_run:
+            with self._lock:
+                matches = collect_matches(self._load_codes_locked())
+            return {
+                "dry_run": True,
+                "summary": summarize(matches, 0),
+                "archive": {"archived": 0, "path": None},
+                "items": [_public_code(item, include_plaintext=True) | {"cleanup_reason": reason} for item, reason in matches],
+            }
+
+        def mutate(state: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
+            matches = collect_matches(state["codes"])
+            run_id = uuid.uuid4().hex[:12]
+            archived_at = _now_iso()
+            archive = _archive_codes(matches, archived_at=archived_at, run_id=run_id) if matches else {"archived": 0, "path": None}
+            remove_keys = {
+                (_clean(item.get("id")), _clean(item.get("code_hash")))
+                for item, _reason in matches
+            }
+            next_codes = [
+                item
+                for item in state["codes"]
+                if (_clean(item.get("id")), _clean(item.get("code_hash"))) not in remove_keys
+            ]
+            state["codes"] = next_codes
+            summary = summarize(matches, len(matches), archive)
+            if matches:
+                state["ledger"].append(
+                    {
+                        "id": run_id,
+                        "time": archived_at,
+                        "type": "cleanup_codes",
+                        "deleted": summary["deleted"],
+                        "archived": summary["archived"],
+                        "archive_path": summary["archive_path"],
+                        "expired": summary["expired"],
+                        "disabled": summary["disabled"],
+                        "redeemed": summary["redeemed"],
+                        "redeemed_older_than_days": normalized_redeemed_days,
+                        "limit": normalized_limit,
+                    }
+                )
+            return state, {
+                "dry_run": False,
+                "summary": summary,
+                "archive": archive,
+                "items": [_public_code(item, include_plaintext=True) | {"cleanup_reason": reason} for item, reason in matches],
+            }
+
+        with self._lock:
+            result = self._update_codes_state_locked(mutate)
+        result["all_items"] = self.list_codes()
+        return result
+
     def _redeem_in_state(
         self,
         state: dict[str, Any],
         *,
         user_id: str,
         code_hash: str,
-        credit_updater: Callable[[int, str, str | None], dict[str, object]],
+        credit_updater: Callable[[int, str, str | None, str, dict[str, Any] | None], dict[str, object]],
     ) -> tuple[dict[str, Any], dict[str, Any]]:
         for item in state["codes"]:
             if item.get("code_hash") != code_hash:
                 continue
             if item.get("status") != "active":
                 raise ValueError("这张卡密已使用或已失效")
+            if _is_not_started(item):
+                raise ValueError("这张每日赠送卡密还没到兑换日期")
             if _is_expired(item):
                 raise ValueError("这张卡密已过期")
             if _redeem_batch_used_by_user(state, item, user_id):
@@ -394,23 +698,31 @@ class ShopService:
             credits = _to_positive_int(item.get("credits"))
             now = _now_iso()
             code_id = _clean(item.get("id"))
+            code_type = _normalize_code_type(item.get("code_type"))
+            credit_source = _code_credit_source(code_type)
+            package_plan = _normalize_package_plan(item.get("package_plan"), require_limits=code_type == "package")
             credit_expires_days = item.get("credit_expires_days")
             credit_expires_at = None
-            if credit_expires_days is not None:
+            if code_type == "normal" and credit_expires_days is not None:
                 credit_expires_at = (datetime.now(timezone.utc) + timedelta(days=_to_positive_int(credit_expires_days))).isoformat()
-            updated_user = credit_updater(credits, code_id, credit_expires_at)
+            updated_user = credit_updater(credits, code_id, credit_expires_at, credit_source, package_plan)
             item["status"] = "redeemed"
             item["redeemed_by"] = user_id
             item["redeemed_at"] = now
+            item["code_type"] = code_type
             item["credit_expires_at"] = credit_expires_at
+            item["package_plan"] = package_plan
             state["ledger"].append(
                 {
                     "id": uuid.uuid4().hex[:12],
                     "time": now,
                     "type": "redeem",
+                    "source": credit_source,
                     "user_id": user_id,
                     "code_id": item.get("id"),
+                    "code_type": code_type,
                     "delta": credits,
+                    "package_plan": package_plan,
                     "credit_expires_at": credit_expires_at,
                 }
             )
@@ -446,6 +758,8 @@ class ShopService:
                 item = dict(raw_code_item)
                 if item.get("status") != "active":
                     raise ValueError("这张卡密已使用或已失效")
+                if _is_not_started(item):
+                    raise ValueError("这张每日赠送卡密还没到兑换日期")
                 if _is_expired(item):
                     raise ValueError("这张卡密已过期")
                 if item.get("batch_single_use") and any(
@@ -457,33 +771,58 @@ class ShopService:
                 credits = _to_positive_int(item.get("credits"))
                 now = _now_iso()
                 code_id = _clean(item.get("id"))
+                code_type = _normalize_code_type(item.get("code_type"))
+                credit_source = _code_credit_source(code_type)
+                package_plan = _normalize_package_plan(item.get("package_plan"), require_limits=code_type == "package")
                 credit_expires_days = item.get("credit_expires_days")
                 credit_expires_at = None
-                if credit_expires_days is not None:
+                if code_type == "normal" and credit_expires_days is not None:
                     credit_expires_at = (datetime.now(timezone.utc) + timedelta(days=_to_positive_int(credit_expires_days))).isoformat()
-                auth_items, updated_user = auth_service._adjust_credits_in_items(
-                    auth_items,
-                    user_id,
-                    credits,
-                    note=f"redeem:{code_id}",
-                    expires_at=credit_expires_at,
-                    source="redeem",
-                    code_id=code_id,
-                )
+                if code_type == "daily_gift":
+                    auth_items, updated_user = auth_service._add_daily_credits_in_items(
+                        auth_items,
+                        user_id,
+                        credits,
+                        source=credit_source,
+                        code_id=code_id,
+                    )
+                elif code_type == "package":
+                    auth_items, updated_user = auth_service._add_package_grant_in_items(
+                        auth_items,
+                        user_id,
+                        package_plan or {},
+                        source=credit_source,
+                        code_id=code_id,
+                    )
+                else:
+                    auth_items, updated_user = auth_service._adjust_credits_in_items(
+                        auth_items,
+                        user_id,
+                        credits,
+                        note=f"redeem:{code_id}",
+                        expires_at=credit_expires_at,
+                        source=credit_source,
+                        code_id=code_id,
+                    )
 
                 item["status"] = "redeemed"
                 item["redeemed_by"] = user_id
                 item["redeemed_at"] = now
+                item["code_type"] = code_type
                 item["credit_expires_at"] = credit_expires_at
+                item["package_plan"] = package_plan
                 state = self._normalize_state(raw_state)
                 state["ledger"].append(
                     {
                         "id": uuid.uuid4().hex[:12],
                         "time": now,
                         "type": "redeem",
+                        "source": credit_source,
                         "user_id": user_id,
                         "code_id": item.get("id"),
+                        "code_type": code_type,
                         "delta": credits,
+                        "package_plan": package_plan,
                         "credit_expires_at": credit_expires_at,
                     }
                 )
@@ -508,17 +847,34 @@ class ShopService:
             ) -> tuple[list[dict[str, object]], dict[str, Any], dict[str, Any]]:
                 auth_items = auth_service._normalize_items(raw_auth_items)
 
-                def credit_updater(credits: int, code_id: str, credit_expires_at: str | None) -> dict[str, object]:
+                def credit_updater(credits: int, code_id: str, credit_expires_at: str | None, credit_source: str, package_plan: dict[str, Any] | None) -> dict[str, object]:
                     nonlocal auth_items
-                    auth_items, updated_user = auth_service._adjust_credits_in_items(
-                        auth_items,
-                        user_id,
-                        credits,
-                        note=f"redeem:{code_id}",
-                        expires_at=credit_expires_at,
-                        source="redeem",
-                        code_id=code_id,
-                    )
+                    if credit_source == "daily_gift_code":
+                        auth_items, updated_user = auth_service._add_daily_credits_in_items(
+                            auth_items,
+                            user_id,
+                            credits,
+                            source=credit_source,
+                            code_id=code_id,
+                        )
+                    elif credit_source == "package_code":
+                        auth_items, updated_user = auth_service._add_package_grant_in_items(
+                            auth_items,
+                            user_id,
+                            package_plan or {},
+                            source=credit_source,
+                            code_id=code_id,
+                        )
+                    else:
+                        auth_items, updated_user = auth_service._adjust_credits_in_items(
+                            auth_items,
+                            user_id,
+                            credits,
+                            note=f"redeem:{code_id}",
+                            expires_at=credit_expires_at,
+                            source=credit_source,
+                            code_id=code_id,
+                        )
                     return updated_user
 
                 next_state, result = self._redeem_in_state(
@@ -533,13 +889,27 @@ class ShopService:
                 return update_user_and_shop_state_locked(mutate_combined)
 
         def mutate(state: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
-            def credit_updater(credits: int, code_id: str, credit_expires_at: str | None) -> dict[str, object]:
+            def credit_updater(credits: int, code_id: str, credit_expires_at: str | None, credit_source: str, package_plan: dict[str, Any] | None) -> dict[str, object]:
+                if credit_source == "daily_gift_code":
+                    return auth_service.add_daily_credits(
+                        user_id,
+                        credits,
+                        source=credit_source,
+                        code_id=code_id,
+                    )
+                if credit_source == "package_code":
+                    return auth_service.add_package_grant(
+                        user_id,
+                        package_plan or {},
+                        source=credit_source,
+                        code_id=code_id,
+                    )
                 return auth_service.adjust_credits(
                     user_id,
                     credits,
                     note=f"redeem:{code_id}",
                     expires_at=credit_expires_at,
-                    source="redeem",
+                    source=credit_source,
                     code_id=code_id,
                 )
 

test/test_account_image_capabilities.py

@@ -6,6 +6,7 @@ import sqlite3
 import tempfile
 import time
 import unittest
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from unittest.mock import PropertyMock, patch
 
@@ -853,6 +854,423 @@ class AuthServiceTests(unittest.TestCase):
                 shop_module.auth_service = original_auth_service
                 backend.engine.dispose()
 
+    def test_generate_codes_keeps_plaintext_for_admin_list(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            shop = ShopService(backend)
+
+            batch = shop.generate_codes(count=1, credits=7, prefix="CS")
+            listed = shop.list_codes()
+
+            self.assertEqual(batch["items"][0]["code"], batch["codes"][0])
+            self.assertEqual(listed[0]["code"], batch["codes"][0])
+            self.assertEqual(backend.load_shop_state()["codes"][0]["code_plaintext"], batch["codes"][0])
+
+    def test_daily_gift_codes_redeem_into_daily_pool(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            auth = AuthService(backend)
+            shop = ShopService(backend)
+            original_auth_service = shop_module.auth_service
+            shop_module.auth_service = auth
+            try:
+                user, _ = auth.create_key(role="normal", name="Buyer")
+                before = auth.credit_summary({"id": user["id"], "role": "normal"})
+                batch = shop.generate_codes(
+                    count=1,
+                    credits=7,
+                    prefix="CS",
+                    code_type="daily_gift",
+                    validity_days=30,
+                    credit_expires_days=30,
+                    batch_single_use=False,
+                )
+
+                result = shop.redeem(batch["codes"][0], {"id": user["id"], "role": "normal"})
+                state = backend.load_shop_state()
+                stored_user = auth.get_key(str(user["id"]), role="normal")
+                stored_code = state["codes"][0]
+                expires_at = datetime.fromisoformat(str(stored_code["expires_at"]).replace("Z", "+00:00"))
+                china_expires_at = expires_at.astimezone(timezone(timedelta(hours=8)))
+                today_china = datetime.now(timezone(timedelta(hours=8))).date()
+
+                self.assertEqual(batch["items"][0]["code_type"], "daily_gift")
+                self.assertEqual(batch["items"][0]["daily_gift_date"], today_china.isoformat())
+                self.assertTrue(batch["items"][0]["batch_single_use"])
+                self.assertIsNone(batch["items"][0]["credit_expires_days"])
+                self.assertEqual(result["item"]["code_type"], "daily_gift")
+                self.assertEqual(stored_code["code_type"], "daily_gift")
+                self.assertEqual(stored_code["daily_gift_date"], today_china.isoformat())
+                self.assertTrue(stored_code["batch_single_use"])
+                self.assertIsNone(stored_code["credit_expires_days"])
+                self.assertEqual(china_expires_at.date(), today_china)
+                self.assertEqual((china_expires_at.hour, china_expires_at.minute), (23, 59))
+                self.assertEqual(state["ledger"][-1]["code_type"], "daily_gift")
+                self.assertEqual(state["ledger"][-1]["source"], "daily_gift_code")
+                self.assertIsNotNone(stored_user)
+                self.assertEqual(result["credits"]["daily_credits"], before["daily_credits"] + 7)
+                self.assertEqual(result["credits"]["daily_credits_remaining"], before["daily_credits_remaining"] + 7)
+                self.assertEqual(result["credits"]["daily_bonus_credits"], 7)
+                self.assertEqual(result["credits"]["paid_credits"], before["paid_credits"])
+                self.assertEqual(result["credits"]["total_recharged"], before["total_recharged"])
+                self.assertEqual(stored_user["daily_bonus_credits"], 7)
+                self.assertEqual(stored_user["credit_grants"], [])
+            finally:
+                shop_module.auth_service = original_auth_service
+
+    def test_future_daily_gift_codes_wait_until_activity_date(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            auth = AuthService(backend)
+            shop = ShopService(backend)
+            original_auth_service = shop_module.auth_service
+            shop_module.auth_service = auth
+            try:
+                user, _ = auth.create_key(role="normal", name="Buyer")
+                future_date = (datetime.now(timezone(timedelta(hours=8))) + timedelta(days=2)).date().isoformat()
+                batch = shop.generate_codes(count=1, credits=7, prefix="CS", code_type="daily_gift", daily_gift_date=future_date)
+                stored_code = backend.load_shop_state()["codes"][0]
+                starts_at = datetime.fromisoformat(str(stored_code["starts_at"]).replace("Z", "+00:00")).astimezone(timezone(timedelta(hours=8)))
+                expires_at = datetime.fromisoformat(str(stored_code["expires_at"]).replace("Z", "+00:00")).astimezone(timezone(timedelta(hours=8)))
+
+                preview = shop.preview_code(batch["codes"][0], {"id": user["id"], "role": "normal"})
+
+                self.assertEqual(stored_code["daily_gift_date"], future_date)
+                self.assertEqual(starts_at.date().isoformat(), future_date)
+                self.assertEqual((starts_at.hour, starts_at.minute), (0, 0))
+                self.assertEqual(expires_at.date().isoformat(), future_date)
+                self.assertEqual((expires_at.hour, expires_at.minute), (23, 59))
+                self.assertFalse(preview["redeemable"])
+                self.assertTrue(preview["item"]["is_not_started"])
+            finally:
+                shop_module.auth_service = original_auth_service
+
+    def test_database_daily_gift_codes_redeem_into_daily_pool(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = DatabaseStorageBackend(f"sqlite:///{(Path(tmp_dir) / 'shared.db').as_posix()}")
+            auth = AuthService(backend)
+            shop = ShopService(backend)
+            original_auth_service = shop_module.auth_service
+            shop_module.auth_service = auth
+            try:
+                user, _ = auth.create_key(role="normal", name="Buyer")
+                before = auth.credit_summary({"id": user["id"], "role": "normal"})
+                batch = shop.generate_codes(
+                    count=1,
+                    credits=7,
+                    prefix="CS",
+                    code_type="daily_gift",
+                    validity_days=30,
+                    credit_expires_days=30,
+                    batch_single_use=False,
+                )
+
+                result = shop.redeem(batch["codes"][0], {"id": user["id"], "role": "normal"})
+                stored_user = auth.get_key(str(user["id"]), role="normal")
+                stored_code = backend.get_redeem_code_by_hash(shop_module.hash_redeem_code(batch["codes"][0]))
+
+                self.assertEqual(result["credits"]["daily_credits"], before["daily_credits"] + 7)
+                self.assertEqual(result["credits"]["daily_credits_remaining"], before["daily_credits_remaining"] + 7)
+                self.assertEqual(result["credits"]["daily_bonus_credits"], 7)
+                self.assertEqual(result["credits"]["paid_credits"], before["paid_credits"])
+                self.assertEqual(result["credits"]["total_recharged"], before["total_recharged"])
+                self.assertIsNotNone(stored_user)
+                self.assertEqual(stored_user["daily_bonus_credits"], 7)
+                self.assertIsNotNone(stored_code)
+                self.assertEqual(stored_code["code_type"], "daily_gift")
+                self.assertTrue(stored_code["batch_single_use"])
+                self.assertIsNone(stored_code["credit_expires_days"])
+                self.assertEqual(stored_code["status"], "redeemed")
+            finally:
+                shop_module.auth_service = original_auth_service
+                backend.engine.dispose()
+
+    def test_package_codes_redeem_into_package_grant_and_meter_first(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            original_auth_service = shop_module.auth_service
+            with (
+                patch.object(type(config_module.config), "normal_user_default_credits", new_callable=PropertyMock, return_value=0),
+                patch.object(type(config_module.config), "normal_user_daily_credits", new_callable=PropertyMock, return_value=0),
+            ):
+                auth = AuthService(backend)
+                shop = ShopService(backend)
+                shop_module.auth_service = auth
+                try:
+                    user, _ = auth.create_key(role="normal", name="Buyer")
+                    before = auth.credit_summary({"id": user["id"], "role": "normal"})
+                    batch = shop.generate_codes(
+                        count=1,
+                        credits=99,
+                        prefix="CS",
+                        code_type="package",
+                        package_name="高级周卡",
+                        package_duration_days=7,
+                        package_daily_limit=2,
+                        package_total_limit=5,
+                    )
+
+                    result = shop.redeem(batch["codes"][0], {"id": user["id"], "role": "normal"})
+                    stored_user = auth.get_key(str(user["id"]), role="normal")
+                    reservation = auth.reserve_credits(str(user["id"]), 1)["_credit_reservation"]
+                    auth.consume_reserved_credits(
+                        str(user["id"]),
+                        1,
+                        daily_amount=0,
+                        paid_amount=0,
+                        package_reservations=reservation["packages"],
+                        grant_reservations=[],
+                    )
+                    after_consume = auth.get_key(str(user["id"]), role="normal")
+
+                    self.assertEqual(batch["items"][0]["code_type"], "package")
+                    self.assertEqual(batch["items"][0]["package_plan"]["name"], "高级周卡")
+                    self.assertEqual(result["credits"]["paid_credits"], before["paid_credits"])
+                    self.assertEqual(result["credits"]["total_recharged"], before["total_recharged"])
+                    self.assertEqual(result["credits"]["package_credits"], 2)
+                    self.assertIsNotNone(stored_user)
+                    self.assertEqual(len(stored_user["package_grants"]), 1)
+                    self.assertEqual(reservation["daily"], 0)
+                    self.assertEqual(reservation["paid"], 0)
+                    self.assertEqual(reservation["packages"][0]["amount"], 1)
+                    self.assertIsNotNone(after_consume)
+                    grant = after_consume["package_grants"][0]
+                    self.assertEqual(grant["used_daily"], 1)
+                    self.assertEqual(grant["used_total"], 1)
+                    self.assertEqual(after_consume["used_credits"], 1)
+                    second_reservation = auth.reserve_credits(str(user["id"]), 1)["_credit_reservation"]
+                    auth.consume_reserved_credits(
+                        str(user["id"]),
+                        1,
+                        daily_amount=0,
+                        paid_amount=0,
+                        package_reservations=second_reservation["packages"],
+                        grant_reservations=[],
+                    )
+                    with self.assertRaises(ValueError):
+                        auth.reserve_credits(str(user["id"]), 1)
+                finally:
+                    shop_module.auth_service = original_auth_service
+
+    def test_package_reserved_credits_can_be_refunded(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            with (
+                patch.object(type(config_module.config), "normal_user_default_credits", new_callable=PropertyMock, return_value=0),
+                patch.object(type(config_module.config), "normal_user_daily_credits", new_callable=PropertyMock, return_value=0),
+            ):
+                auth = AuthService(backend)
+                user, _ = auth.create_key(role="normal", name="Buyer")
+                auth.add_package_grant(
+                    str(user["id"]),
+                    {
+                        "name": "普通日卡",
+                        "duration_days": 1,
+                        "daily_limit": 3,
+                        "weekly_limit": 0,
+                        "monthly_limit": 0,
+                        "total_limit": 3,
+                    },
+                    source="test",
+                    code_id="code-1",
+                )
+
+                reservation = auth.reserve_credits(str(user["id"]), 2)["_credit_reservation"]
+                reserved_user = auth.get_key(str(user["id"]), role="normal")
+                auth.refund_reserved_credits(
+                    str(user["id"]),
+                    2,
+                    daily_amount=0,
+                    paid_amount=0,
+                    package_reservations=reservation["packages"],
+                    grant_reservations=[],
+                )
+                refunded_user = auth.get_key(str(user["id"]), role="normal")
+
+                self.assertIsNotNone(reserved_user)
+                self.assertEqual(reserved_user["package_grants"][0]["reserved_daily"], 2)
+                self.assertIsNotNone(refunded_user)
+                grant = refunded_user["package_grants"][0]
+                self.assertEqual(grant["reserved_daily"], 0)
+                self.assertEqual(grant["reserved_total"], 0)
+                self.assertEqual(refunded_user["package_credits"], 3)
+
+    def test_database_package_codes_redeem_into_package_grant(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = DatabaseStorageBackend(f"sqlite:///{(Path(tmp_dir) / 'shared.db').as_posix()}")
+            original_auth_service = shop_module.auth_service
+            with (
+                patch.object(type(config_module.config), "normal_user_default_credits", new_callable=PropertyMock, return_value=0),
+                patch.object(type(config_module.config), "normal_user_daily_credits", new_callable=PropertyMock, return_value=0),
+            ):
+                auth = AuthService(backend)
+                shop = ShopService(backend)
+                shop_module.auth_service = auth
+                try:
+                    user, _ = auth.create_key(role="normal", name="Buyer")
+                    batch = shop.generate_codes(
+                        count=1,
+                        credits=50,
+                        prefix="CS",
+                        code_type="package",
+                        package_name="普通月卡",
+                        package_duration_days=30,
+                        package_monthly_limit=50,
+                    )
+
+                    result = shop.redeem(batch["codes"][0], {"id": user["id"], "role": "normal"})
+                    stored_user = auth.get_key(str(user["id"]), role="normal")
+                    stored_code = backend.get_redeem_code_by_hash(shop_module.hash_redeem_code(batch["codes"][0]))
+
+                    self.assertEqual(result["credits"]["package_credits"], 50)
+                    self.assertEqual(result["credits"]["total_recharged"], 0)
+                    self.assertIsNotNone(stored_user)
+                    self.assertEqual(stored_user["package_grants"][0]["name"], "普通月卡")
+                    self.assertIsNotNone(stored_code)
+                    self.assertEqual(stored_code["code_type"], "package")
+                    self.assertEqual(stored_code["status"], "redeemed")
+                    self.assertEqual(stored_code["package_plan"]["monthly_limit"], 50)
+                finally:
+                    shop_module.auth_service = original_auth_service
+                    backend.engine.dispose()
+
+    def test_user_can_list_own_redeemed_codes(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            backend = JSONStorageBackend(Path(tmp_dir) / "accounts.json", Path(tmp_dir) / "auth_keys.json", Path(tmp_dir) / "shop_state.json")
+            auth = AuthService(backend)
+            shop = ShopService(backend)
+            original_auth_service = shop_module.auth_service
+            shop_module.auth_service = auth
+            try:
+                first_user, _ = auth.create_key(role="normal", name="Buyer 1")
+                second_user, _ = auth.create_key(role="normal", name="Buyer 2")
+                first_batch = shop.generate_codes(
+                    count=1,
+                    credits=20,
+                    prefix="CS",
+                    code_type="package",
+                    package_name="高级周卡",
+                    package_duration_days=7,
+                    package_weekly_limit=20,
+                )
+                second_batch = shop.generate_codes(count=1, credits=5, prefix="CS")
+
+                shop.redeem(first_batch["codes"][0], {"id": first_user["id"], "role": "normal"})
+                shop.redeem(second_batch["codes"][0], {"id": second_user["id"], "role": "normal"})
+
+                first_items = shop.list_user_codes(str(first_user["id"]))
+                second_items = shop.list_user_codes(str(second_user["id"]))
+
+                self.assertEqual(len(first_items), 1)
+                self.assertEqual(first_items[0]["code"], first_batch["codes"][0])
+                self.assertEqual(first_items[0]["code_type"], "package")
+                self.assertEqual(first_items[0]["package_plan"]["name"], "高级周卡")
+                self.assertEqual(len(second_items), 1)
+                self.assertEqual(second_items[0]["code"], second_batch["codes"][0])
+                self.assertNotEqual(first_items[0]["code"], second_items[0]["code"])
+            finally:
+                shop_module.auth_service = original_auth_service
+
+    def test_cleanup_codes_archives_matches_before_deleting(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            tmp_path = Path(tmp_dir)
+            backend = JSONStorageBackend(tmp_path / "accounts.json", tmp_path / "auth_keys.json", tmp_path / "shop_state.json")
+            shop = ShopService(backend)
+            now = datetime.now(timezone.utc)
+            old_redeemed_at = (now - timedelta(days=120)).isoformat()
+            recent_redeemed_at = (now - timedelta(days=7)).isoformat()
+            future_expires_at = (now + timedelta(days=7)).isoformat()
+            yesterday = (now - timedelta(days=1)).isoformat()
+            codes = [
+                {
+                    "id": "expired-code",
+                    "code_hash": shop_module.hash_redeem_code("CS-EXPIRED-CODE"),
+                    "code_plaintext": "CS-EXPIRED-CODE",
+                    "prefix": "CS",
+                    "credits": 1,
+                    "status": "active",
+                    "created_at": old_redeemed_at,
+                    "expires_at": yesterday,
+                },
+                {
+                    "id": "disabled-code",
+                    "code_hash": shop_module.hash_redeem_code("CS-DISABLED-CODE"),
+                    "code_plaintext": "CS-DISABLED-CODE",
+                    "prefix": "CS",
+                    "credits": 1,
+                    "status": "disabled",
+                    "created_at": old_redeemed_at,
+                },
+                {
+                    "id": "old-redeemed-code",
+                    "code_hash": shop_module.hash_redeem_code("CS-OLD-REDEEMED"),
+                    "code_plaintext": "CS-OLD-REDEEMED",
+                    "prefix": "CS",
+                    "credits": 1,
+                    "status": "redeemed",
+                    "created_at": old_redeemed_at,
+                    "redeemed_at": old_redeemed_at,
+                    "redeemed_by": "user-1",
+                },
+                {
+                    "id": "recent-redeemed-code",
+                    "code_hash": shop_module.hash_redeem_code("CS-RECENT-REDEEMED"),
+                    "code_plaintext": "CS-RECENT-REDEEMED",
+                    "prefix": "CS",
+                    "credits": 1,
+                    "status": "redeemed",
+                    "created_at": recent_redeemed_at,
+                    "redeemed_at": recent_redeemed_at,
+                    "redeemed_by": "user-1",
+                },
+                {
+                    "id": "active-code",
+                    "code_hash": shop_module.hash_redeem_code("CS-ACTIVE-CODE"),
+                    "code_plaintext": "CS-ACTIVE-CODE",
+                    "prefix": "CS",
+                    "credits": 1,
+                    "status": "active",
+                    "created_at": recent_redeemed_at,
+                    "expires_at": future_expires_at,
+                },
+            ]
+            backend.save_shop_state({"codes": codes, "ledger": []})
+            previous_data_dir = shop_module.DATA_DIR
+            shop_module.DATA_DIR = tmp_path
+            try:
+                preview = shop.cleanup_codes(
+                    delete_expired=True,
+                    delete_disabled=True,
+                    delete_redeemed=True,
+                    redeemed_older_than_days=90,
+                    limit=1000,
+                    dry_run=True,
+                )
+                self.assertEqual(preview["summary"]["matched"], 3)
+                self.assertEqual(len(backend.load_shop_state()["codes"]), 5)
+
+                result = shop.cleanup_codes(
+                    delete_expired=True,
+                    delete_disabled=True,
+                    delete_redeemed=True,
+                    redeemed_older_than_days=90,
+                    limit=1000,
+                    dry_run=False,
+                )
+
+                remaining_ids = {item["id"] for item in backend.load_shop_state()["codes"]}
+                self.assertEqual(remaining_ids, {"recent-redeemed-code", "active-code"})
+                self.assertEqual(result["summary"]["deleted"], 3)
+                self.assertEqual(result["summary"]["archived"], 3)
+                archive_path = Path(result["summary"]["archive_path"])
+                self.assertTrue(archive_path.exists())
+                archived = [json.loads(line) for line in archive_path.read_text(encoding="utf-8").splitlines()]
+                self.assertEqual(len(archived), 3)
+                self.assertEqual({item["reason"] for item in archived}, {"expired", "disabled", "redeemed"})
+                self.assertEqual(archived[0]["item"]["code_plaintext"], "CS-EXPIRED-CODE")
+            finally:
+                shop_module.DATA_DIR = previous_data_dir
+
     def test_account_pool_storage_splits_site_and_personal_accounts(self) -> None:
         with tempfile.TemporaryDirectory() as tmp_dir:
             tmp_path = Path(tmp_dir)

web/.next-dev-3000.err.log

@@ -1,280 +1,342 @@
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
-
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
-
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
-
-https://react.dev/link/hydration-mismatch
-
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/settings/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
-
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
-
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
-
-https://react.dev/link/hydration-mismatch
-
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/login/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
 [browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
     at Array.some (<anonymous>)
 [browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
     at Array.some (<anonymous>)
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
-
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
-
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
-
-https://react.dev/link/hydration-mismatch
-
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/login/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
-
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
-
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
-
-https://react.dev/link/hydration-mismatch
-
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/login/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
-Error: Failed to find Server Action. This request might be from an older or newer deployment.
-Read more: https://nextjs.org/docs/messages/failed-to-find-server-action
-    at ignore-listed frames
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
+    at Array.some (<anonymous>)
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
+    at Array.some (<anonymous>)
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
+    at Array.some (<anonymous>)
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'length')
+    at Array.some (<anonymous>)
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'slice')
+    at ImagePageContent (src\app\image\page.tsx:1615:43)
+    at ImagePage (webpack-internal:///(app-pages-browser)/./src/app/image/page.tsx:2526:87)
+  1613 |
+  1614 |   const activePackageGrants = creditSummary?.package_grants ?? [];
+> 1615 |   const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+       |                                           ^
+  1616 |   const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  1617 |   const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  1618 |   const dailyTotal = creditSummary?.daily_credits ?? 0;
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'slice')
+    at ImagePageContent (src\app\image\page.tsx:1615:43)
+    at ImagePage (src\app\image\page.tsx:1988:10)
+  1613 |
+  1614 |   const activePackageGrants = creditSummary?.package_grants ?? [];
+> 1615 |   const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+       |                                           ^
+  1616 |   const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  1617 |   const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  1618 |   const dailyTotal = creditSummary?.daily_credits ?? 0;
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'slice')
+    at ImagePageContent (src\app\image\page.tsx:1615:43)
+    at ImagePage (src\app\image\page.tsx:1988:10)
+  1613 |
+  1614 |   const activePackageGrants = creditSummary?.package_grants ?? [];
+> 1615 |   const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+       |                                           ^
+  1616 |   const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  1617 |   const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  1618 |   const dailyTotal = creditSummary?.daily_credits ?? 0;
+⚠ Fast Refresh had to perform a full reload due to a runtime error.
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'slice')
+    at ImagePageContent (src\app\image\page.tsx:1615:43)
+    at ImagePage (src\app\image\page.tsx:2104:10)
+  1613 |
+  1614 |   const activePackageGrants = creditSummary?.package_grants ?? [];
+> 1615 |   const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+       |                                           ^
+  1616 |   const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  1617 |   const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  1618 |   const dailyTotal = creditSummary?.daily_credits ?? 0;
+[browser] Uncaught TypeError: Cannot read properties of undefined (reading 'slice')
+    at ImagePageContent (src\app\image\page.tsx:1615:43)
+    at ImagePage (src\app\image\page.tsx:2104:10)
+  1613 |
+  1614 |   const activePackageGrants = creditSummary?.package_grants ?? [];
+> 1615 |   const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+       |                                           ^
+  1616 |   const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  1617 |   const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  1618 |   const dailyTotal = creditSummary?.daily_credits ?? 0;
+[browser] The final argument passed to useEffect changed size between renders. The order and size of this array must remain constant.
 
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
+Previous: [false, false, async ()=>{
+            if (!isNormalUser) {
+                return;
+            }
+            setIsLoadingMyRedeemCodes(true);
+            try {
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyRedeemCodes)();
+                setMyRedeemCodes(data.items);
+            } catch  {
+                setMyRedeemCodes([]);
+            } finally{
+                setIsLoadingMyRedeemCodes(false);
+            }
+        }]
+Incoming: [false, false, async ()=>{
+            if (!isNormalUser) {
+                return;
+            }
+            setIsLoadingMyRedeemCodes(true);
+            try {
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyRedeemCodes)();
+                setMyRedeemCodes(data.items);
+            } catch  {
+                setMyRedeemCodes([]);
+            } finally{
+                setIsLoadingMyRedeemCodes(false);
+            }
+        }, async ()=>{
+            try {
+                if (isNormalUser) {
+                    const creditsData = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyCredits)();
+                    setCreditSummary(creditsData.credits);
+                    const siteCredits = toQuotaCount(creditsData.credits.credits) ?? 0;
+                    try {
+                        const poolData = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchQuotaSummary)(selectedAccountPoolStrategy, !isMemoryEnabled);
+                        const poolQuota = poolData.unknown ? null : toQuotaCount(poolData.quota);
+                        setAccountPoolQuotaCount(poolQuota);
+                        setAvailableQuota(String(siteCredits));
+                        setAvailableQuotaCount(siteCredits);
+                    } catch  {
+                        setAccountPoolQuotaCount(null);
+                        setAvailableQuota(String(siteCredits));
+                        setAvailableQuotaCount(siteCredits);
+                    }
+                    return;
+                }
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchQuotaSummary)(selectedAccountPoolStrategy, !isMemoryEnabled);
+                const quotaCount = data.unknown ? null : toQuotaCount(data.quota);
+                setAccountPoolQuotaCount(quotaCount);
+                setAvailableQuota(String(data.label ?? data.quota ?? 0));
+                setAvailableQuotaCount(quotaCount);
+            } catch  {
+                setAccountPoolQuotaCount(null);
+                setAvailableQuota({
+                    "ImagePageContent.useCallback[loadQuota]": (prev)=>prev === "加载中..." ? "--" : prev
+                }["ImagePageContent.useCallback[loadQuota]"]);
+                setAvailableQuotaCount(null);
+            }
+        }] 
+    at ImagePageContent (src\app\image\page.tsx:669:12)
+  667 |   }, [isNormalUser]);
+  668 |
+> 669 |   useEffect(() => {
+      |            ^
+  670 |     if (!isBenefitsOpen || !isNormalUser) {
+  671 |       return;
+  672 |     } (src\app\image\page.tsx:669:12)
+[browser] The final argument passed to useEffect changed size between renders. The order and size of this array must remain constant.
 
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
+Previous: [true, true, async ()=>{
+            if (!isNormalUser) {
+                return;
+            }
+            setIsLoadingMyRedeemCodes(true);
+            try {
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyRedeemCodes)();
+                setMyRedeemCodes(data.items);
+            } catch  {
+                setMyRedeemCodes([]);
+            } finally{
+                setIsLoadingMyRedeemCodes(false);
+            }
+        }]
+Incoming: [false, true, async ()=>{
+            if (!isNormalUser) {
+                return;
+            }
+            setIsLoadingMyRedeemCodes(true);
+            try {
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyRedeemCodes)();
+                setMyRedeemCodes(data.items);
+            } catch  {
+                setMyRedeemCodes([]);
+            } finally{
+                setIsLoadingMyRedeemCodes(false);
+            }
+        }, async ()=>{
+            try {
+                if (isNormalUser) {
+                    const creditsData = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchMyCredits)();
+                    setCreditSummary(creditsData.credits);
+                    const siteCredits = toQuotaCount(creditsData.credits.credits) ?? 0;
+                    try {
+                        const poolData = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchQuotaSummary)(selectedAccountPoolStrategy, !isMemoryEnabled);
+                        const poolQuota = poolData.unknown ? null : toQuotaCount(poolData.quota);
+                        setAccountPoolQuotaCount(poolQuota);
+                        setAvailableQuota(String(siteCredits));
+                        setAvailableQuotaCount(siteCredits);
+                    } catch  {
+                        setAccountPoolQuotaCount(null);
+                        setAvailableQuota(String(siteCredits));
+                        setAvailableQuotaCount(siteCredits);
+                    }
+                    return;
+                }
+                const data = await (0,_lib_api__WEBPACK_IMPORTED_MODULE_9__.fetchQuotaSummary)(selectedAccountPoolStrategy, !isMemoryEnabled);
+                const quotaCount = data.unknown ? null : toQuotaCount(data.quota);
+                setAccountPoolQuotaCount(quotaCount);
+                setAvailableQuota(String(data.label ?? data.quota ?? 0));
+                setAvailableQuotaCount(quotaCount);
+            } catch  {
+                setAccountPoolQuotaCount(null);
+                setAvailableQuota({
+                    "ImagePageContent.useCallback[loadQuota]": (prev)=>prev === "加载中..." ? "--" : prev
+                }["ImagePageContent.useCallback[loadQuota]"]);
+                setAvailableQuotaCount(null);
+            }
+        }] 
+    at ImagePageContent (src\app\image\page.tsx:669:12)
+  667 |   }, [isNormalUser]);
+  668 |
+> 669 |   useEffect(() => {
+      |            ^
+  670 |     if (!isBenefitsOpen || !isNormalUser) {
+  671 |       return;
+  672 |     } (src\app\image\page.tsx:669:12)
+[browser] ./src/app/image/page.tsx
+Error:   x Expected '</', got 'ident'
+      ,-[F:\code\CHATSAM-Public\web\src\app\image\page.tsx:2069:1]
+ 2066 |               )}
+ 2067 |             </div>
+ 2068 |           </div>
+ 2069 |           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
+      :                ^^^^^^^^^
+ 2070 |             <div className="font-medium">次数说明</div>
+ 2071 |             <p className="mt-1 text-xs text-amber-800/90">
+ 2072 |               生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
+      `----
 
-https://react.dev/link/hydration-mismatch
+Caused by:
+    Syntax Error
 
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/static/ca..." notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
+Import trace for requested module:
+./src/app/image/page.tsx 
+[browser] ./src/app/image/page.tsx
+Error:   x Expected '</', got 'ident'
+      ,-[F:\code\CHATSAM-Public\web\src\app\image\page.tsx:2069:1]
+ 2066 |               )}
+ 2067 |             </div>
+ 2068 |           </div>
+ 2069 |           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
+      :                ^^^^^^^^^
+ 2070 |             <div className="font-medium">次数说明</div>
+ 2071 |             <p className="mt-1 text-xs text-amber-800/90">
+ 2072 |               生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
+      `----
 
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
+Caused by:
+    Syntax Error
 
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
+Import trace for requested module:
+./src/app/image/page.tsx 
+[browser] ./src/app/image/page.tsx
+Error:   x Expected '</', got 'ident'
+      ,-[F:\code\CHATSAM-Public\web\src\app\image\page.tsx:2069:1]
+ 2066 |               )}
+ 2067 |             </div>
+ 2068 |           </div>
+ 2069 |           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
+      :                ^^^^^^^^^
+ 2070 |             <div className="font-medium">次数说明</div>
+ 2071 |             <p className="mt-1 text-xs text-amber-800/90">
+ 2072 |               生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
+      `----
 
-https://react.dev/link/hydration-mismatch
+Caused by:
+    Syntax Error
 
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
-[browser] A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:
+Import trace for requested module:
+./src/app/image/page.tsx 
+[browser] ./src/app/image/page.tsx
+Error:   x Expected '</', got 'ident'
+      ,-[F:\code\CHATSAM-Public\web\src\app\image\page.tsx:2069:1]
+ 2066 |               )}
+ 2067 |             </div>
+ 2068 |           </div>
+ 2069 |           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
+      :                ^^^^^^^^^
+ 2070 |             <div className="font-medium">次数说明</div>
+ 2071 |             <p className="mt-1 text-xs text-amber-800/90">
+ 2072 |               生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
+      `----
 
-- A server/client branch `if (typeof window !== 'undefined')`.
-- Variable input such as `Date.now()` or `Math.random()` which changes each time it's called.
-- Date formatting in a user's locale which doesn't match the server.
-- External changing data without sending a snapshot of it along with the HTML.
-- Invalid HTML tag nesting.
+Caused by:
+    Syntax Error
 
-It can also happen if the client has a browser extension installed which messes with the HTML before React loaded.
+Import trace for requested module:
+./src/app/image/page.tsx 
+⨯ ./src/app/image/page.tsx
+Error:   x Expected '</', got 'ident'
+      ,-[F:\code\CHATSAM-Public\web\src\app\image\page.tsx:2069:1]
+ 2066 |               )}
+ 2067 |             </div>
+ 2068 |           </div>
+ 2069 |           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
+      :                ^^^^^^^^^
+ 2070 |             <div className="font-medium">次数说明</div>
+ 2071 |             <p className="mt-1 text-xs text-amber-800/90">
+ 2072 |               生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
+      `----
 
-https://react.dev/link/hydration-mismatch
+Caused by:
+    Syntax Error
 
-  ...
-    <HotReload globalError={[...]} webSocket={WebSocket} staticIndicatorState={{pathname:null, ...}}>
-      <AppDevOverlayErrorBoundary globalError={[...]}>
-        <ReplaySsrOnlyErrors>
-        <DevRootHTTPAccessFallbackBoundary>
-          <HTTPAccessFallbackBoundary notFound={<NotAllowedRootHTTPFallbackError>}>
-            <HTTPAccessFallbackErrorBoundary pathname="/" notFound={<NotAllowedRootHTTPFallbackError>} ...>
-              <RedirectBoundary>
-                <RedirectErrorBoundary router={{...}}>
-                  <Head>
-                  <__next_root_layout_boundary__>
-                    <SegmentViewNode type="layout" pagePath="layout.tsx">
-                      <SegmentTrieNode>
-                      <link>
-                      <RootLayout>
-                        <html lang="zh-CN" suppressHydrationWarning={true}>
-                          <body
-                            className="antialiased"
-                            style={{fontFamily:"\"SF Pro D..."}}
--                           mpa-version="12.3.4"
--                           mpa-extension-id="aidjohbjielfdhcaookdaolppglahebo"
-                          >
-                  ...
- 
+Import trace for requested module:
+./src/app/image/page.tsx
+<w> [webpack.cache.PackFileCacheStrategy] Caching failed for pack: Error: ENOENT: no such file or directory, rename 'F:\code\CHATSAM-Public\web\.next\dev\cache\webpack\client-development-fallback\0.pack.gz_' -> 'F:\code\CHATSAM-Public\web\.next\dev\cache\webpack\client-development-fallback\0.pack.gz'
+<w> [webpack.cache.PackFileCacheStrategy] Caching failed for pack: Error: ENOENT: no such file or directory, rename 'F:\code\CHATSAM-Public\web\.next\dev\cache\webpack\client-development-fallback\0.pack.gz_' -> 'F:\code\CHATSAM-Public\web\.next\dev\cache\webpack\client-development-fallback\0.pack.gz'
+⚠ Fast Refresh had to perform a full reload due to a runtime error.
+⚠ Fast Refresh had to perform a full reload due to a runtime error.
+[browser] Uncaught ReferenceError: webConfig is not defined
+    at getExternalApiUrl (src\app\image\page.tsx:452:28)
+    at ImagePageContent (src\app\image\page.tsx:512:26)
+    at ImagePage (webpack-internal:///(app-pages-browser)/./src/app/image/page.tsx:3152:87)
+  450 |
+  451 | function getExternalApiUrl() {
+> 452 |   const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
+      |                            ^
+  453 |   if (configuredApiUrl) {
+  454 |     return configuredApiUrl;
+  455 |   }
+[browser] Uncaught ReferenceError: webConfig is not defined
+    at getExternalApiUrl (src\app\image\page.tsx:452:28)
+    at ImagePageContent (src\app\image\page.tsx:512:26)
+    at ImagePage (webpack-internal:///(app-pages-browser)/./src/app/image/page.tsx:3152:87)
+  450 |
+  451 | function getExternalApiUrl() {
+> 452 |   const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
+      |                            ^
+  453 |   if (configuredApiUrl) {
+  454 |     return configuredApiUrl;
+  455 |   }
+[browser] Uncaught ReferenceError: webConfig is not defined
+    at getExternalApiUrl (src\app\image\page.tsx:452:28)
+    at ImagePageContent (src\app\image\page.tsx:512:26)
+    at ImagePage (src\app\image\page.tsx:2248:10)
+  450 |
+  451 | function getExternalApiUrl() {
+> 452 |   const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
+      |                            ^
+  453 |   if (configuredApiUrl) {
+  454 |     return configuredApiUrl;
+  455 |   }
+[browser] Uncaught ReferenceError: webConfig is not defined
+    at getExternalApiUrl (src\app\image\page.tsx:452:28)
+    at ImagePageContent (src\app\image\page.tsx:512:26)
+    at ImagePage (src\app\image\page.tsx:2248:10)
+  450 |
+  451 | function getExternalApiUrl() {
+> 452 |   const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
+      |                            ^
+  453 |   if (configuredApiUrl) {
+  454 |     return configuredApiUrl;
+  455 |   }
+⚠ Fast Refresh had to perform a full reload due to a runtime error.
+⚠ Fast Refresh had to perform a full reload due to a runtime error.
+[browser] Can't perform a React state update on a component that hasn't mounted yet. This indicates that you have a side-effect in your render function that asynchronously tries to update the component. Move this work to useEffect instead. 

web/src/app/image/components/image-composer.tsx

@@ -28,8 +28,8 @@ type ImageComposerProps = {
   onMemoryToggle: () => void;
   onAccountPoolStrategyChange: (value: string) => void;
   onSubmit: () => void | Promise<void>;
+  onBenefitsClick?: () => void;
   onRedeemClick?: () => void;
-  onApiKeyClick?: () => void;
   onPickReferenceImage: () => void;
   onReferenceImageChange: (files: File[]) => void | Promise<void>;
   onRemoveReferenceImage: (index: number) => void;
@@ -74,8 +74,8 @@ export function ImageComposer({
   onMemoryToggle,
   onAccountPoolStrategyChange,
   onSubmit,
+  onBenefitsClick,
   onRedeemClick,
-  onApiKeyClick,
   onPickReferenceImage,
   onReferenceImageChange,
   onRemoveReferenceImage,
@@ -351,11 +351,22 @@ export function ImageComposer({
                     <span className="hidden sm:inline">{referenceImages.length > 0 ? "添加参考图" : "上传"}</span>
                   </Button>
                   {availableQuota !== "--" && (
-                  <div
-                    className="shrink-0 rounded-full bg-stone-100 px-2 py-1 text-[10px] font-medium text-stone-600 sm:px-3 sm:py-2 sm:text-xs"
-                  >
-                    <span className="hidden sm:inline">{quotaLabel} </span>{availableQuota}
-                  </div>
+                    onBenefitsClick ? (
+                      <Button
+                        type="button"
+                        variant="outline"
+                        className="h-9 shrink-0 rounded-full border-stone-200 bg-stone-100 px-2 text-[10px] font-medium text-stone-700 shadow-none hover:bg-stone-200 sm:h-10 sm:px-3 sm:text-xs"
+                        onClick={onBenefitsClick}
+                      >
+                        <span className="hidden sm:inline">{quotaLabel} </span>{availableQuota}
+                      </Button>
+                    ) : (
+                      <div
+                        className="shrink-0 rounded-full bg-stone-100 px-2 py-1 text-[10px] font-medium text-stone-600 sm:px-3 sm:py-2 sm:text-xs"
+                      >
+                        <span className="hidden sm:inline">{quotaLabel} </span>{availableQuota}
+                      </div>
+                    )
                   )}
                   {onRedeemClick ? (
                     <Button
@@ -367,16 +378,6 @@ export function ImageComposer({
                       充值
                     </Button>
                   ) : null}
-                  {onApiKeyClick ? (
-                    <Button
-                      type="button"
-                      variant="outline"
-                      className="h-9 shrink-0 rounded-full border-sky-200 bg-sky-50 px-3 text-xs font-medium text-sky-700 shadow-none hover:bg-sky-100 sm:h-10 sm:px-4 sm:text-sm"
-                      onClick={onApiKeyClick}
-                    >
-                      密钥
-                    </Button>
-                  ) : null}
                   <Button
                     type="button"
                     variant="outline"

web/src/app/image/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Copy, History, KeyRound, LoaderCircle, Plus, Trash2 } from "lucide-react";
+import { Copy, History, LoaderCircle, Plus, Trash2 } from "lucide-react";
 import { toast } from "sonner";
 
 import { ImageComposer } from "@/app/image/components/image-composer";
@@ -21,9 +21,9 @@ import {
   createImageEditTask,
   createImageGenerationTask,
   fetchImageTasks,
-  fetchMyApiKey,
   fetchMyCredits,
   fetchMyProfile,
+  fetchMyRedeemCodes,
   fetchQuotaSummary,
   fetchShopPublicConfig,
   previewRedeemCode,
@@ -37,7 +37,6 @@ import {
 import { fetchImageBlob } from "@/lib/image-url";
 import { formatChinaDateTime, formatChinaShortDateTime } from "@/lib/time";
 import { useAuthGuard } from "@/lib/use-auth-guard";
-import webConfig from "@/constants/common-env";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
 import { setStoredAuthSession, type StoredAuthSession } from "@/store/auth";
@@ -105,6 +104,39 @@ function formatConversationTime(value: string) {
   return formatChinaShortDateTime(value);
 }
 
+function packageLimitText(plan?: RedeemCode["package_plan"] | null) {
+  if (!plan) return "未设置套餐";
+  const parts = [
+    plan.daily_limit ? `日 ${plan.daily_limit}` : "",
+    plan.weekly_limit ? `周 ${plan.weekly_limit}` : "",
+    plan.monthly_limit ? `月 ${plan.monthly_limit}` : "",
+    plan.total_limit ? `总 ${plan.total_limit}` : "",
+  ].filter(Boolean);
+  return parts.length > 0 ? parts.join(" / ") : "未设置限额";
+}
+
+function packageSummary(item: RedeemCode) {
+  const plan = item.package_plan;
+  if (!plan) return "套餐配置缺失";
+  return `${plan.name || "套餐"} · ${plan.duration_days || 1} 天 · ${packageLimitText(plan)}`;
+}
+
+function redeemCodeTypeLabel(item: RedeemCode) {
+  if (item.code_type === "daily_gift") return "每日赠送";
+  if (item.code_type === "package") return "套餐";
+  return "普通卡密";
+}
+
+function redeemedCodeText(item: RedeemCode) {
+  if (item.code) return item.code;
+  return `${item.prefix || "CS"}-****-${String(item.id || "").slice(0, 4).toUpperCase()}`;
+}
+
+function packageUsagePercent(used: number, limit: number) {
+  if (limit <= 0) return 0;
+  return Math.min(100, Math.round((used / limit) * 100));
+}
+
 function redeemCodeValidityLabel(item: RedeemCode) {
   let redeemText = "卡密长期可兑换";
   if (item.expires_at) {
@@ -119,12 +151,24 @@ function redeemCodeValidityLabel(item: RedeemCode) {
       redeemText = days <= 1 ? "卡密还有不到1天过期，请尽快兑换" : `卡密还有${days}天过期，请尽快兑换`;
     }
   }
+  if (item.code_type === "daily_gift") {
+    return `${redeemText}，兑换后计入今日赠送次数`;
+  }
+  if (item.code_type === "package") {
+    return `${redeemText}，兑换后获得 ${packageSummary(item)}`;
+  }
   const creditText = item.credit_expires_days ? `兑换后${item.credit_expires_days}天内需用完` : "兑换后永久有效";
   return `${redeemText}，${creditText}`;
 }
 
 function redeemCodeStatusLabel(item: RedeemCode, redeemable: boolean, message: string) {
   if (redeemable) {
+    if (item.code_type === "daily_gift") {
+      return `可增加今日赠送 ${Number(item.credits || 0)} 次`;
+    }
+    if (item.code_type === "package") {
+      return `可兑换套餐：${packageSummary(item)}`;
+    }
     return `可充值 ${Number(item.credits || 0)} 次`;
   }
   return message || "这张卡密暂时不能兑换";
@@ -404,17 +448,6 @@ function isTemporaryWechatName(profile: MyProfile | null) {
   );
 }
 
-function getExternalApiUrl() {
-  const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
-  if (configuredApiUrl) {
-    return configuredApiUrl;
-  }
-  if (typeof window !== "undefined") {
-    return window.location.origin;
-  }
-  return "";
-}
-
 function ImagePageContent({ session }: { session: StoredAuthSession }) {
   const role = session.role;
   const isAdmin = role === "admin";
@@ -443,15 +476,15 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
   const [availableQuotaCount, setAvailableQuotaCount] = useState<number | null>(null);
   const [accountPoolQuotaCount, setAccountPoolQuotaCount] = useState<number | null>(null);
   const [creditSummary, setCreditSummary] = useState<CreditSummary | null>(null);
+  const [isBenefitsOpen, setIsBenefitsOpen] = useState(false);
   const [isRedeemOpen, setIsRedeemOpen] = useState(false);
   const [redeemValue, setRedeemValue] = useState("");
   const [isRedeeming, setIsRedeeming] = useState(false);
   const [redeemPreview, setRedeemPreview] = useState<{ item: RedeemCode; redeemable: boolean; message: string } | null>(null);
   const [isLoadingRedeemPreview, setIsLoadingRedeemPreview] = useState(false);
   const [redeemPreviewError, setRedeemPreviewError] = useState("");
-  const [isApiKeyOpen, setIsApiKeyOpen] = useState(false);
-  const [apiKeyValue, setApiKeyValue] = useState("");
-  const [isLoadingApiKey, setIsLoadingApiKey] = useState(false);
+  const [myRedeemCodes, setMyRedeemCodes] = useState<RedeemCode[]>([]);
+  const [isLoadingMyRedeemCodes, setIsLoadingMyRedeemCodes] = useState(false);
   const [profile, setProfile] = useState<MyProfile | null>(null);
   const [isProfileOpen, setIsProfileOpen] = useState(false);
   const [nicknameValue, setNicknameValue] = useState("");
@@ -462,7 +495,6 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
   const [lightboxIndex, setLightboxIndex] = useState(0);
   const personalAccountPoolEnabled = profile ? profile.account_pool_enabled === true : session.accountPoolEnabled === true;
   const hasPersonalAccountPool = isAdmin || personalAccountPoolEnabled;
-  const externalApiUrl = getExternalApiUrl();
   const [deleteConfirm, setDeleteConfirm] = useState<
     | { type: "one"; id: string }
     | { type: "prompt"; conversationId: string; turnId: string }
@@ -602,6 +634,29 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
     };
   }, [loadQuota]);
 
+  const loadMyRedeemCodes = useCallback(async () => {
+    if (!isNormalUser) {
+      return;
+    }
+    setIsLoadingMyRedeemCodes(true);
+    try {
+      const data = await fetchMyRedeemCodes();
+      setMyRedeemCodes(data.items);
+    } catch {
+      setMyRedeemCodes([]);
+    } finally {
+      setIsLoadingMyRedeemCodes(false);
+    }
+  }, [isNormalUser]);
+
+  useEffect(() => {
+    if (!isBenefitsOpen || !isNormalUser) {
+      return;
+    }
+    void loadQuota();
+    void loadMyRedeemCodes();
+  }, [isBenefitsOpen, isNormalUser, loadMyRedeemCodes, loadQuota]);
+
   useEffect(() => {
     if (!isNormalUser) {
       return;
@@ -1498,6 +1553,7 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
       setRedeemPreviewError("");
       setIsRedeemOpen(false);
       await loadQuota();
+      void loadMyRedeemCodes();
       toast.success("充值成功");
     } catch (error) {
       toast.error(error instanceof Error ? error.message : "充值失败");
@@ -1506,26 +1562,12 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
     }
   };
 
-  const handleOpenApiKey = async () => {
-    setIsApiKeyOpen(true);
-    setIsLoadingApiKey(true);
-    try {
-      const data = await fetchMyApiKey();
-      setApiKeyValue(data.api_key);
-    } catch (error) {
-      setApiKeyValue("");
-      toast.error(error instanceof Error ? error.message : "加载密钥失败");
-    } finally {
-      setIsLoadingApiKey(false);
-    }
-  };
-
-  const handleCopyApiKey = async () => {
-    if (!apiKeyValue) {
+  const copyText = async (value: string, message = "已复制") => {
+    if (!value) {
       return;
     }
-    await navigator.clipboard.writeText(apiKeyValue);
-    toast.success("密钥已复制");
+    await navigator.clipboard.writeText(value);
+    toast.success(message);
   };
 
   const openProfileDialog = () => {
@@ -1533,6 +1575,133 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
     setIsProfileOpen(true);
   };
 
+  const activePackageGrants = creditSummary?.package_grants ?? [];
+  const recentRedeemCodes = myRedeemCodes.slice(0, 12);
+  const creditTotal = toQuotaCount(creditSummary?.credits) ?? 0;
+  const dailyRemaining = creditSummary?.daily_credits_remaining ?? 0;
+  const dailyTotal = creditSummary?.daily_credits ?? 0;
+  const packageCredits = creditSummary?.package_credits ?? 0;
+  const expiringCredits = creditSummary?.expiring_credits ?? 0;
+  const permanentCredits = creditSummary?.permanent_credits ?? 0;
+  const benefitsPanel = (
+    <div className="space-y-4">
+      <div className="rounded-2xl border border-stone-200 bg-stone-50/70 p-4">
+        <div className="flex items-center justify-between gap-3">
+          <div>
+            <div className="text-sm font-semibold text-stone-900">我的额度</div>
+            <div className="mt-1 text-xs text-stone-500">生成时按下面顺序扣除：每日赠送、套餐、限时、永久。</div>
+          </div>
+          <div className="rounded-xl bg-stone-950 px-3 py-2 text-right text-white">
+            <div className="text-[11px] text-stone-300">总可用</div>
+            <div className="text-lg font-semibold leading-none">{creditTotal}</div>
+          </div>
+        </div>
+        <div className="mt-4 grid gap-2 sm:grid-cols-4">
+          <div className="rounded-xl border border-stone-200 bg-white px-3 py-2">
+            <div className="text-[11px] text-stone-500">今日赠送</div>
+            <div className="mt-1 text-sm font-semibold text-stone-900">{dailyRemaining} / {dailyTotal}</div>
+          </div>
+          <div className="rounded-xl border border-sky-200 bg-white px-3 py-2">
+            <div className="text-[11px] text-sky-600">套餐额度</div>
+            <div className="mt-1 text-sm font-semibold text-sky-900">{packageCredits}</div>
+          </div>
+          <div className="rounded-xl border border-amber-200 bg-white px-3 py-2">
+            <div className="text-[11px] text-amber-600">限时次数</div>
+            <div className="mt-1 text-sm font-semibold text-amber-900">{expiringCredits}</div>
+          </div>
+          <div className="rounded-xl border border-stone-200 bg-white px-3 py-2">
+            <div className="text-[11px] text-stone-500">永久次数</div>
+            <div className="mt-1 text-sm font-semibold text-stone-900">{permanentCredits}</div>
+          </div>
+        </div>
+      </div>
+
+      <div className="rounded-2xl border border-sky-200 bg-sky-50/60 p-4">
+        <div className="flex items-center justify-between gap-3">
+          <div>
+            <div className="text-sm font-semibold text-sky-950">当前套餐</div>
+            <div className="mt-1 text-xs text-sky-700">这里只显示仍有可用额度且未过期的套餐。</div>
+          </div>
+          <div className="text-xs font-medium text-sky-700">{activePackageGrants.length} 个</div>
+        </div>
+        {activePackageGrants.length > 0 ? (
+          <div className="mt-3 space-y-2">
+            {activePackageGrants.map((grant) => {
+              const totalLimit = Number(grant.total_limit || 0);
+              const usedTotal = Number(grant.used_total || 0);
+              const remaining = Number(grant.remaining || 0);
+              const progress = packageUsagePercent(usedTotal, totalLimit);
+              return (
+                <div key={grant.id || `${grant.name}-${grant.expires_at}`} className="rounded-xl border border-sky-100 bg-white px-3 py-3">
+                  <div className="flex flex-wrap items-center justify-between gap-2">
+                    <div className="font-medium text-stone-900">{grant.name || "套餐"}</div>
+                    <div className="text-xs text-sky-700">剩余 {remaining} 次</div>
+                  </div>
+                  <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-stone-500">
+                    <span>{packageLimitText(grant)}</span>
+                    {grant.expires_at ? <span>到期 {formatChinaDateTime(grant.expires_at)}</span> : null}
+                    {grant.code_id ? <span>来源卡密 {grant.code_id}</span> : null}
+                  </div>
+                  {totalLimit > 0 ? (
+                    <div className="mt-3">
+                      <div className="h-1.5 overflow-hidden rounded-full bg-sky-100">
+                        <div className="h-full rounded-full bg-sky-500" style={{ width: `${progress}%` }} />
+                      </div>
+                      <div className="mt-1 text-[11px] text-stone-500">总限额已用 {usedTotal} / {totalLimit}</div>
+                    </div>
+                  ) : null}
+                </div>
+              );
+            })}
+          </div>
+        ) : (
+          <div className="mt-3 rounded-xl border border-dashed border-sky-200 bg-white/70 px-3 py-4 text-center text-xs text-sky-700">
+            暂无生效套餐，兑换套餐卡密后会显示在这里。
+          </div>
+        )}
+      </div>
+
+      <div className="rounded-2xl border border-stone-200 bg-white p-4">
+        <div className="flex items-center justify-between gap-3">
+          <div>
+            <div className="text-sm font-semibold text-stone-900">已兑换卡密</div>
+            <div className="mt-1 text-xs text-stone-500">最近 100 条兑换记录，方便核对套餐、赠送和普通充值来源。</div>
+          </div>
+          {isLoadingMyRedeemCodes ? <LoaderCircle className="size-4 animate-spin text-stone-400" /> : <div className="text-xs text-stone-500">{myRedeemCodes.length} 条</div>}
+        </div>
+        {recentRedeemCodes.length > 0 ? (
+          <div className="mt-3 space-y-2">
+            {recentRedeemCodes.map((item) => (
+              <div key={item.id} className="rounded-xl border border-stone-100 bg-stone-50 px-3 py-3">
+                <div className="flex flex-wrap items-center justify-between gap-2">
+                  <div className="break-all font-mono text-xs font-medium text-stone-800">{redeemedCodeText(item)}</div>
+                  {item.code ? (
+                    <Button type="button" variant="outline" className="h-7 rounded-lg border-stone-200 bg-white px-2 text-xs" onClick={() => void copyText(item.code || "", "卡密已复制")}>
+                      <Copy className="size-3" />
+                      复制
+                    </Button>
+                  ) : null}
+                </div>
+                <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-stone-500">
+                  <span>{redeemCodeTypeLabel(item)}</span>
+                  <span>{item.code_type === "package" ? packageSummary(item) : `${Number(item.credits || 0)} 次`}</span>
+                  {item.redeemed_at ? <span>兑换 {formatChinaDateTime(item.redeemed_at)}</span> : null}
+                </div>
+              </div>
+            ))}
+            {myRedeemCodes.length > recentRedeemCodes.length ? (
+              <div className="text-center text-xs text-stone-400">还有 {myRedeemCodes.length - recentRedeemCodes.length} 条较早记录未展开显示</div>
+            ) : null}
+          </div>
+        ) : (
+          <div className="mt-3 rounded-xl border border-dashed border-stone-200 bg-stone-50 px-3 py-4 text-center text-xs text-stone-500">
+            暂无兑换记录。
+          </div>
+        )}
+      </div>
+    </div>
+  );
+
   const handleSaveNickname = async () => {
     const normalizedName = nicknameValue.trim();
     if (!normalizedName) {
@@ -1681,8 +1850,8 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
               onMemoryToggle={() => setIsMemoryEnabled((value) => !value)}
               onAccountPoolStrategyChange={setAccountPoolStrategy}
               onSubmit={handleSubmit}
+              onBenefitsClick={isNormalUser ? () => setIsBenefitsOpen(true) : undefined}
               onRedeemClick={isNormalUser ? () => setIsRedeemOpen(true) : undefined}
-              onApiKeyClick={isNormalUser ? () => void handleOpenApiKey() : undefined}
               onPickReferenceImage={() => fileInputRef.current?.click()}
               onReferenceImageChange={handleReferenceImageChange}
               onRemoveReferenceImage={handleRemoveReferenceImage}
@@ -1700,6 +1869,29 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
         onIndexChange={setLightboxIndex}
       />
 
+      <Dialog open={isBenefitsOpen} onOpenChange={setIsBenefitsOpen}>
+        <DialogContent showCloseButton={false} className="hide-scrollbar max-h-[min(88dvh,760px)] overflow-y-auto rounded-2xl p-6 sm:max-w-2xl">
+          <DialogHeader className="gap-2">
+            <DialogTitle>我的权益</DialogTitle>
+            <DialogDescription className="text-sm leading-6">
+              查看当前套餐、卡密兑换记录和额度构成。
+            </DialogDescription>
+          </DialogHeader>
+          {benefitsPanel}
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsBenefitsOpen(false)}>
+              关闭
+            </Button>
+            <Button className="bg-stone-950 text-white hover:bg-stone-800" onClick={() => {
+              setIsBenefitsOpen(false);
+              setIsRedeemOpen(true);
+            }}>
+              兑换卡密
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
       <Dialog
         open={isRedeemOpen}
         onOpenChange={(open) => {
@@ -1714,14 +1906,132 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
         <DialogContent showCloseButton={false} className="rounded-2xl p-6">
           <DialogHeader className="gap-2">
             <DialogTitle>充值次数</DialogTitle>
-            <DialogDescription className="text-sm leading-6">
-              输入卡密充值次数；部分福利卡密可能有到账后的使用期限。
-            </DialogDescription>
-          </DialogHeader>
+          <DialogDescription className="text-sm leading-6">
+            输入卡密兑换次数；每日赠送卡密会加入今日赠送次数，套餐卡密会加入套餐额度，普通卡密会加入购买次数。
+          </DialogDescription>
+        </DialogHeader>
+        {false ? (
+        <div className="space-y-4">
+            <div className="rounded-2xl border border-stone-200 bg-stone-50/70 p-4">
+              <div className="flex items-center justify-between gap-3">
+                <div>
+                  <div className="text-sm font-semibold text-stone-900">我的额度</div>
+                  <div className="mt-1 text-xs text-stone-500">生成时按下面顺序扣除：每日赠送、套餐、限时、永久。</div>
+                </div>
+                <div className="rounded-xl bg-stone-950 px-3 py-2 text-right text-white">
+                  <div className="text-[11px] text-stone-300">总可用</div>
+                  <div className="text-lg font-semibold leading-none">{creditTotal}</div>
+                </div>
+              </div>
+              <div className="mt-4 grid gap-2 sm:grid-cols-4">
+                <div className="rounded-xl border border-stone-200 bg-white px-3 py-2">
+                  <div className="text-[11px] text-stone-500">今日赠送</div>
+                  <div className="mt-1 text-sm font-semibold text-stone-900">{dailyRemaining} / {dailyTotal}</div>
+                </div>
+                <div className="rounded-xl border border-sky-200 bg-white px-3 py-2">
+                  <div className="text-[11px] text-sky-600">套餐额度</div>
+                  <div className="mt-1 text-sm font-semibold text-sky-900">{packageCredits}</div>
+                </div>
+                <div className="rounded-xl border border-amber-200 bg-white px-3 py-2">
+                  <div className="text-[11px] text-amber-600">限时次数</div>
+                  <div className="mt-1 text-sm font-semibold text-amber-900">{expiringCredits}</div>
+                </div>
+                <div className="rounded-xl border border-stone-200 bg-white px-3 py-2">
+                  <div className="text-[11px] text-stone-500">永久次数</div>
+                  <div className="mt-1 text-sm font-semibold text-stone-900">{permanentCredits}</div>
+                </div>
+              </div>
+            </div>
+
+            <div className="rounded-2xl border border-sky-200 bg-sky-50/60 p-4">
+              <div className="flex items-center justify-between gap-3">
+                <div>
+                  <div className="text-sm font-semibold text-sky-950">当前套餐</div>
+                  <div className="mt-1 text-xs text-sky-700">这里只显示仍有可用额度且未过期的套餐。</div>
+                </div>
+                <div className="text-xs font-medium text-sky-700">{activePackageGrants.length} 个</div>
+              </div>
+              {activePackageGrants.length > 0 ? (
+                <div className="mt-3 space-y-2">
+                  {activePackageGrants.map((grant) => {
+                    const totalLimit = Number(grant.total_limit || 0);
+                    const usedTotal = Number(grant.used_total || 0);
+                    const remaining = Number(grant.remaining || 0);
+                    const progress = packageUsagePercent(usedTotal, totalLimit);
+                    return (
+                      <div key={grant.id || `${grant.name}-${grant.expires_at}`} className="rounded-xl border border-sky-100 bg-white px-3 py-3">
+                        <div className="flex flex-wrap items-center justify-between gap-2">
+                          <div className="font-medium text-stone-900">{grant.name || "套餐"}</div>
+                          <div className="text-xs text-sky-700">剩余 {remaining} 次</div>
+                        </div>
+                        <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-stone-500">
+                          <span>{packageLimitText(grant)}</span>
+                          {grant.expires_at ? <span>到期 {formatChinaDateTime(grant.expires_at)}</span> : null}
+                          {grant.code_id ? <span>来源卡密 {grant.code_id}</span> : null}
+                        </div>
+                        {totalLimit > 0 ? (
+                          <div className="mt-3">
+                            <div className="h-1.5 overflow-hidden rounded-full bg-sky-100">
+                              <div className="h-full rounded-full bg-sky-500" style={{ width: `${progress}%` }} />
+                            </div>
+                            <div className="mt-1 text-[11px] text-stone-500">总限额已用 {usedTotal} / {totalLimit}</div>
+                          </div>
+                        ) : null}
+                      </div>
+                    );
+                  })}
+                </div>
+              ) : (
+                <div className="mt-3 rounded-xl border border-dashed border-sky-200 bg-white/70 px-3 py-4 text-center text-xs text-sky-700">
+                  暂无生效套餐，兑换套餐卡密后会显示在这里。
+                </div>
+              )}
+            </div>
+
+            <div className="rounded-2xl border border-stone-200 bg-white p-4">
+              <div className="flex items-center justify-between gap-3">
+                <div>
+                  <div className="text-sm font-semibold text-stone-900">已兑换卡密</div>
+                  <div className="mt-1 text-xs text-stone-500">最近 100 条兑换记录，方便核对套餐、赠送和普通充值来源。</div>
+                </div>
+                {isLoadingMyRedeemCodes ? <LoaderCircle className="size-4 animate-spin text-stone-400" /> : <div className="text-xs text-stone-500">{myRedeemCodes.length} 条</div>}
+              </div>
+              {recentRedeemCodes.length > 0 ? (
+                <div className="mt-3 space-y-2">
+                  {recentRedeemCodes.map((item) => (
+                    <div key={item.id} className="rounded-xl border border-stone-100 bg-stone-50 px-3 py-3">
+                      <div className="flex flex-wrap items-center justify-between gap-2">
+                        <div className="break-all font-mono text-xs font-medium text-stone-800">{redeemedCodeText(item)}</div>
+                        {item.code ? (
+                          <Button type="button" variant="outline" className="h-7 rounded-lg border-stone-200 bg-white px-2 text-xs" onClick={() => void copyText(item.code || "", "卡密已复制")}>
+                            <Copy className="size-3" />
+                            复制
+                          </Button>
+                        ) : null}
+                      </div>
+                      <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-stone-500">
+                        <span>{redeemCodeTypeLabel(item)}</span>
+                        <span>{item.code_type === "package" ? packageSummary(item) : `${Number(item.credits || 0)} 次`}</span>
+                        {item.redeemed_at ? <span>兑换 {formatChinaDateTime(item.redeemed_at)}</span> : null}
+                      </div>
+                    </div>
+                  ))}
+                  {myRedeemCodes.length > recentRedeemCodes.length ? (
+                    <div className="text-center text-xs text-stone-400">还有 {myRedeemCodes.length - recentRedeemCodes.length} 条较早记录未展开显示</div>
+                  ) : null}
+                </div>
+              ) : (
+                <div className="mt-3 rounded-xl border border-dashed border-stone-200 bg-stone-50 px-3 py-4 text-center text-xs text-stone-500">
+                  暂无兑换记录。
+                </div>
+              )}
+            </div>
+          </div>
+        ) : null}
           <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-900">
             <div className="font-medium">次数说明</div>
             <p className="mt-1 text-xs text-amber-800/90">
-              生成图片会优先扣今日赠送次数，再扣快过期的限时次数，最后扣永久购买次数。
+              生成图片会优先扣今日赠送次数，再扣套餐额度，然后扣快过期的限时次数，最后扣永久购买次数。
             </p>
           </div>
           <div className="space-y-2">
@@ -1783,46 +2093,6 @@ function ImagePageContent({ session }: { session: StoredAuthSession }) {
         </DialogContent>
       </Dialog>
 
-      <Dialog open={isApiKeyOpen} onOpenChange={setIsApiKeyOpen}>
-        <DialogContent showCloseButton={false} className="rounded-2xl p-6">
-          <DialogHeader className="gap-2">
-            <DialogTitle className="flex items-center gap-2">
-              <KeyRound className="size-5" />
-              密钥
-            </DialogTitle>
-            <DialogDescription className="text-sm leading-6">
-              这个 Key 可以用于网站登录，也可以填到支持 OpenAI 图片接口的第三方工具里调用当前网站。
-            </DialogDescription>
-          </DialogHeader>
-          <div className="space-y-3">
-            <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm leading-6 text-stone-700">
-              <div className="text-xs font-medium uppercase tracking-wide text-stone-400">URL</div>
-              <div className="break-all font-mono text-xs text-stone-800">
-                {externalApiUrl || "部署后显示当前网站地址"}
-              </div>
-            </div>
-            <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm leading-6 text-stone-700">
-              <div className="text-xs font-medium uppercase tracking-wide text-stone-400">Key</div>
-              <div className="break-all font-mono text-xs text-stone-800">
-                {isLoadingApiKey ? "加载中..." : apiKeyValue || "当前密钥无法回显，请联系管理员重置。"}
-              </div>
-            </div>
-          </div>
-          <DialogFooter>
-            <Button variant="outline" onClick={openProfileDialog}>
-              修改昵称
-            </Button>
-            <Button variant="outline" onClick={() => setIsApiKeyOpen(false)}>
-              关闭
-            </Button>
-            <Button className="bg-stone-950 text-white hover:bg-stone-800" onClick={() => void handleCopyApiKey()} disabled={!apiKeyValue || isLoadingApiKey}>
-              <Copy className="size-4" />
-              复制密钥
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-
       <Dialog open={isProfileOpen} onOpenChange={setIsProfileOpen}>
         <DialogContent showCloseButton={false} className="rounded-2xl p-6">
           <DialogHeader className="gap-2">

web/src/app/settings/components/shop-codes-card.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
-import { Ban, CheckCircle2, Copy, LoaderCircle, Search, Ticket, Trash2 } from "lucide-react";
+import { Archive, Ban, CheckCircle2, Copy, Eraser, LoaderCircle, Search, Ticket, Trash2 } from "lucide-react";
 import { toast } from "sonner";
 
 import { Badge } from "@/components/ui/badge";
@@ -12,11 +12,34 @@ import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, D
 import { Input } from "@/components/ui/input";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
-import { createRedeemCodes, deleteRedeemCode, disableRedeemCode, enableRedeemCode, fetchShopCodes, type RedeemCode } from "@/lib/api";
+import {
+  cleanupRedeemCodes,
+  createRedeemCodes,
+  deleteRedeemCode,
+  disableRedeemCode,
+  enableRedeemCode,
+  fetchShopCodes,
+  type RedeemCode,
+  type RedeemCodeCleanupResponse,
+} from "@/lib/api";
 import { formatChinaDateTime } from "@/lib/time";
 
+import { useSettingsStore } from "../store";
+
 type CodeStatusFilter = "all" | "active" | "redeemed" | "disabled" | "expired";
 type ValidityMode = "permanent" | "custom";
+type CodeType = "normal" | "daily_gift" | "package";
+
+function chinaDateInputValue(value = new Date()) {
+  const parts = new Intl.DateTimeFormat("en-CA", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+  }).formatToParts(value);
+  const data = Object.fromEntries(parts.map((part) => [part.type, part.value]));
+  return `${data.year}-${data.month}-${data.day}`;
+}
 
 function formatDateTime(value?: string | null) {
   return formatChinaDateTime(value);
@@ -34,19 +57,77 @@ function statusLabel(status: string, item?: RedeemCode) {
   return status;
 }
 
+function normalizeCodeType(value?: string | null): CodeType {
+  if (value === "daily_gift") return "daily_gift";
+  if (value === "package") return "package";
+  return "normal";
+}
+
+function codeTypeLabel(value?: string | null) {
+  const type = normalizeCodeType(value);
+  if (type === "package") return "套餐卡密";
+  return type === "daily_gift" ? "每日赠送卡密" : "普通卡密";
+}
+
+function codeTypeBadgeClass(value?: string | null) {
+  const type = normalizeCodeType(value);
+  if (type === "daily_gift") return "rounded-md border-amber-200 bg-amber-50 text-amber-700";
+  if (type === "package") return "rounded-md border-sky-200 bg-sky-50 text-sky-700";
+  return "rounded-md border-stone-200 bg-stone-50 text-stone-600";
+}
+
+function optionalLimit(value: string) {
+  const normalized = Math.trunc(Number(value) || 0);
+  return normalized > 0 ? Math.min(1000000, normalized) : null;
+}
+
+function packageLimitText(plan?: RedeemCode["package_plan"] | null) {
+  if (!plan) return "未设置套餐";
+  const parts = [
+    plan.daily_limit ? `日 ${plan.daily_limit}` : "",
+    plan.weekly_limit ? `周 ${plan.weekly_limit}` : "",
+    plan.monthly_limit ? `月 ${plan.monthly_limit}` : "",
+    plan.total_limit ? `总 ${plan.total_limit}` : "",
+  ].filter(Boolean);
+  return parts.length > 0 ? parts.join(" / ") : "未设置限额";
+}
+
+function packageSummary(item: RedeemCode) {
+  const plan = item.package_plan;
+  if (!plan) return "套餐配置缺失";
+  return `${plan.name || "套餐"} · ${plan.duration_days || 1} 天 · ${packageLimitText(plan)}`;
+}
+
 function redeemedUserLabel(item: RedeemCode) {
   const user = item.redeemed_user;
   return user?.name || user?.wechat_nickname || item.redeemed_by || "";
 }
 
+function codeDisplay(item: RedeemCode) {
+  if (item.code) return item.code;
+  return `旧卡密无明文 · ${item.prefix}-****-${item.id.slice(0, 4).toUpperCase()}`;
+}
+
+function cleanupReasonLabel(value?: string) {
+  if (value === "expired") return "过期未兑换";
+  if (value === "disabled") return "已禁用";
+  if (value === "redeemed") return "已兑换归档";
+  return value || "待清理";
+}
+
 function matchesKeyword(item: RedeemCode, keyword: string) {
   const normalized = keyword.trim().toLowerCase();
   if (!normalized) return true;
   return [
     item.id,
+    item.code,
     item.prefix,
     item.batch,
     item.batch_id,
+    item.code_type,
+    codeTypeLabel(item.code_type),
+    item.package_plan?.name,
+    packageLimitText(item.package_plan),
     item.note,
     item.redeemed_by,
     item.redeemed_user?.name,
@@ -57,11 +138,23 @@ function matchesKeyword(item: RedeemCode, keyword: string) {
 
 export function ShopCodesCard() {
   const didLoadRef = useRef(false);
+  const config = useSettingsStore((state) => state.config);
+  const isSavingConfig = useSettingsStore((state) => state.isSavingConfig);
+  const saveConfig = useSettingsStore((state) => state.saveConfig);
+  const setRedeemCodeCleanupField = useSettingsStore((state) => state.setRedeemCodeCleanupField);
   const [items, setItems] = useState<RedeemCode[]>([]);
   const [generatedCodes, setGeneratedCodes] = useState<string[]>([]);
   const [count, setCount] = useState("10");
   const [credits, setCredits] = useState("20");
   const [prefix, setPrefix] = useState("CS");
+  const [codeType, setCodeType] = useState<CodeType>("normal");
+  const [dailyGiftDate, setDailyGiftDate] = useState(() => chinaDateInputValue());
+  const [packageName, setPackageName] = useState("普通日卡");
+  const [packageDurationDays, setPackageDurationDays] = useState("1");
+  const [packageDailyLimit, setPackageDailyLimit] = useState("20");
+  const [packageWeeklyLimit, setPackageWeeklyLimit] = useState("");
+  const [packageMonthlyLimit, setPackageMonthlyLimit] = useState("");
+  const [packageTotalLimit, setPackageTotalLimit] = useState("");
   const [batch, setBatch] = useState("");
   const [note, setNote] = useState("");
   const [validityMode, setValidityMode] = useState<ValidityMode>("permanent");
@@ -76,6 +169,13 @@ export function ShopCodesCard() {
   const [keyword, setKeyword] = useState("");
   const [deletingItem, setDeletingItem] = useState<RedeemCode | null>(null);
   const [isListExpanded, setIsListExpanded] = useState(false);
+  const [cleanupDeleteExpired, setCleanupDeleteExpired] = useState(true);
+  const [cleanupDeleteDisabled, setCleanupDeleteDisabled] = useState(false);
+  const [cleanupArchiveRedeemed, setCleanupArchiveRedeemed] = useState(false);
+  const [cleanupRedeemedDays, setCleanupRedeemedDays] = useState("90");
+  const [cleanupLimit, setCleanupLimit] = useState("1000");
+  const [isCleaning, setIsCleaning] = useState(false);
+  const [cleanupResult, setCleanupResult] = useState<RedeemCodeCleanupResponse | null>(null);
 
   const load = async () => {
     setIsLoading(true);
@@ -95,6 +195,12 @@ export function ShopCodesCard() {
     void load();
   }, []);
 
+  useEffect(() => {
+    if (codeType === "daily_gift" || codeType === "package") {
+      setCreditValidityMode("permanent");
+    }
+  }, [codeType]);
+
   const copyText = async (value: string) => {
     try {
       await navigator.clipboard.writeText(value);
@@ -109,17 +215,37 @@ export function ShopCodesCard() {
     const normalizedCredits = Math.max(1, Math.trunc(Number(credits) || 1));
     const normalizedValidityDays = Math.max(1, Math.min(3650, Math.trunc(Number(validityDays) || 1)));
     const normalizedCreditValidityDays = Math.max(1, Math.min(3650, Math.trunc(Number(creditValidityDays) || 1)));
+    const normalizedPackageDurationDays = Math.max(1, Math.min(3650, Math.trunc(Number(packageDurationDays) || 1)));
+    const packageLimits = {
+      daily: optionalLimit(packageDailyLimit),
+      weekly: optionalLimit(packageWeeklyLimit),
+      monthly: optionalLimit(packageMonthlyLimit),
+      total: optionalLimit(packageTotalLimit),
+    };
+    if (codeType === "package" && !packageLimits.daily && !packageLimits.weekly && !packageLimits.monthly && !packageLimits.total) {
+      toast.error("套餐卡密至少填写一个日/周/月/总限额");
+      return;
+    }
+    const packageDisplayCredits = packageLimits.total || packageLimits.monthly || packageLimits.weekly || packageLimits.daily || normalizedCredits;
     setIsCreating(true);
     try {
       const data = await createRedeemCodes({
         count: normalizedCount,
-        credits: normalizedCredits,
+        credits: codeType === "package" ? packageDisplayCredits : normalizedCredits,
         prefix,
         batch,
         note,
-        validity_days: validityMode === "custom" ? normalizedValidityDays : null,
-        credit_expires_days: creditValidityMode === "custom" ? normalizedCreditValidityDays : null,
-        batch_single_use: batchSingleUse,
+        validity_days: codeType === "normal" ? validityMode === "custom" ? normalizedValidityDays : null : null,
+        credit_expires_days: codeType === "normal" ? creditValidityMode === "custom" ? normalizedCreditValidityDays : null : null,
+        batch_single_use: codeType === "daily_gift" ? true : codeType === "normal" ? batchSingleUse : false,
+        code_type: codeType,
+        daily_gift_date: codeType === "daily_gift" ? dailyGiftDate : "",
+        package_name: codeType === "package" ? packageName : "",
+        package_duration_days: codeType === "package" ? normalizedPackageDurationDays : 1,
+        package_daily_limit: codeType === "package" ? packageLimits.daily : null,
+        package_weekly_limit: codeType === "package" ? packageLimits.weekly : null,
+        package_monthly_limit: codeType === "package" ? packageLimits.monthly : null,
+        package_total_limit: codeType === "package" ? packageLimits.total : null,
       });
       setGeneratedCodes(data.codes);
       setItems(data.all_items);
@@ -185,12 +311,49 @@ export function ShopCodesCard() {
     }
   };
 
+  const cleanupPayload = (dryRun: boolean) => ({
+    delete_expired: cleanupDeleteExpired,
+    delete_disabled: cleanupDeleteDisabled,
+    archive_redeemed: cleanupArchiveRedeemed,
+    redeemed_older_than_days: Math.max(1, Math.min(3650, Math.trunc(Number(cleanupRedeemedDays) || 90))),
+    limit: Math.max(1, Math.min(20000, Math.trunc(Number(cleanupLimit) || 1000))),
+    dry_run: dryRun,
+  });
+
+  const handleCleanup = async (dryRun: boolean) => {
+    if (!cleanupDeleteExpired && !cleanupDeleteDisabled && !cleanupArchiveRedeemed) {
+      toast.error("请至少选择一种清理类型");
+      return;
+    }
+    const payload = cleanupPayload(dryRun);
+    if (!dryRun) {
+      const confirmed = window.confirm("确认执行批量清理？匹配的卡密会先写入 JSONL 归档，再从数据库移除。");
+      if (!confirmed) return;
+    }
+    setIsCleaning(true);
+    try {
+      const data = await cleanupRedeemCodes(payload);
+      setCleanupResult(data);
+      if (!dryRun && data.all_items) {
+        setItems(data.all_items);
+      }
+      const summary = data.summary;
+      toast.success(dryRun ? `预览到 ${summary.matched} 张可处理卡密` : `已清理 ${summary.deleted} 张卡密`);
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : "批量处理卡密失败");
+    } finally {
+      setIsCleaning(false);
+    }
+  };
+
   const stats = {
     total: items.length,
     active: items.filter((item) => item.status === "active" && !isCodeExpired(item)).length,
     redeemed: items.filter((item) => item.status === "redeemed").length,
     disabled: items.filter((item) => item.status === "disabled").length,
     expired: items.filter((item) => isCodeExpired(item)).length,
+    dailyGift: items.filter((item) => normalizeCodeType(item.code_type) === "daily_gift").length,
+    package: items.filter((item) => normalizeCodeType(item.code_type) === "package").length,
   };
   const filteredItems = items.filter((item) => {
     const matchesStatus = statusFilter === "all" || (statusFilter === "expired" ? isCodeExpired(item) : item.status === statusFilter && !isCodeExpired(item));
@@ -210,69 +373,157 @@ export function ShopCodesCard() {
             </div>
             <div>
               <h2 className="text-lg font-semibold tracking-tight">卡密管理</h2>
-              <p className="text-sm text-stone-500">生成普通用户充值卡密；明文只在生成后显示一次，可复制到第三方发卡网售卖。</p>
+              <p className="text-sm text-stone-500">生成购买次数或每日赠送卡密；新生成的卡密会在后台保留明文，方便查询、复制和批量维护。</p>
             </div>
           </div>
         </div>
 
-        <div className="grid gap-3 md:grid-cols-[120px_120px_120px_1fr]">
+        <div className={codeType === "package" ? "grid gap-3 md:grid-cols-[120px_120px_190px_1fr]" : "grid gap-3 md:grid-cols-[120px_120px_120px_190px_1fr]"}>
           <Input value={count} onChange={(event) => setCount(event.target.value)} type="number" min="1" max="1000" placeholder="数量" className="h-11 rounded-xl border-stone-200 bg-white" />
-          <Input value={credits} onChange={(event) => setCredits(event.target.value)} type="number" min="1" placeholder="每张次数" className="h-11 rounded-xl border-stone-200 bg-white" />
+          {codeType !== "package" ? (
+            <Input value={credits} onChange={(event) => setCredits(event.target.value)} type="number" min="1" placeholder="每张次数" className="h-11 rounded-xl border-stone-200 bg-white" />
+          ) : null}
           <Input value={prefix} onChange={(event) => setPrefix(event.target.value)} placeholder="前缀" className="h-11 rounded-xl border-stone-200 bg-white" />
+          <Select value={codeType} onValueChange={(value) => setCodeType(value as CodeType)}>
+            <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white shadow-none">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="normal">普通卡密</SelectItem>
+              <SelectItem value="daily_gift">每日赠送卡密</SelectItem>
+              <SelectItem value="package">套餐卡密</SelectItem>
+            </SelectContent>
+          </Select>
           <Input value={batch} onChange={(event) => setBatch(event.target.value)} placeholder="批次备注，例如 2026-06 首批" className="h-11 rounded-xl border-stone-200 bg-white" />
         </div>
-        <div className="grid gap-3 lg:grid-cols-[150px_130px_150px_170px_minmax(240px,1fr)]">
-          <div>
-            <Select value={validityMode} onValueChange={(value) => setValidityMode(value as ValidityMode)}>
-              <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white shadow-none">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="permanent">兑换永久</SelectItem>
-                <SelectItem value="custom">兑换限期</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <div>
+        {codeType === "daily_gift" ? (
+          <div className="grid gap-3 md:grid-cols-[170px_1fr]">
             <Input
-              value={validityDays}
-              onChange={(event) => setValidityDays(event.target.value)}
-              type="number"
-              min="1"
-              max="3650"
-              disabled={validityMode === "permanent"}
-              placeholder="几天内可兑换"
-              className="h-11 rounded-xl border-stone-200 bg-white disabled:bg-stone-100"
+              value={dailyGiftDate}
+              onChange={(event) => setDailyGiftDate(event.target.value || chinaDateInputValue())}
+              type="date"
+              min={chinaDateInputValue()}
+              className="h-11 rounded-xl border-stone-200 bg-white"
             />
+            <div className="rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-xs leading-5 text-amber-800">
+              每日赠送卡密只在所选活动日期当天可兑换、当天可用，并且同一批次每人只能兑换一张；不会增加购买剩余和累计充值。
+            </div>
           </div>
-          <div>
-            <Select value={creditValidityMode} onValueChange={(value) => setCreditValidityMode(value as ValidityMode)}>
-              <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white shadow-none">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="permanent">次数永久</SelectItem>
-                <SelectItem value="custom">次数限期</SelectItem>
-              </SelectContent>
-            </Select>
+        ) : null}
+        {codeType === "package" ? (
+          <div className="space-y-3 rounded-xl border border-sky-200 bg-sky-50/70 p-4">
+            <div className="grid gap-3 md:grid-cols-[minmax(180px,1fr)_140px_repeat(4,minmax(120px,1fr))]">
+              <Input
+                value={packageName}
+                onChange={(event) => setPackageName(event.target.value)}
+                placeholder="套餐名，例如 高级周卡"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+              <Input
+                value={packageDurationDays}
+                onChange={(event) => setPackageDurationDays(event.target.value)}
+                type="number"
+                min="1"
+                max="3650"
+                placeholder="套餐天数"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+              <Input
+                value={packageDailyLimit}
+                onChange={(event) => setPackageDailyLimit(event.target.value)}
+                type="number"
+                min="0"
+                max="1000000"
+                placeholder="日限额"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+              <Input
+                value={packageWeeklyLimit}
+                onChange={(event) => setPackageWeeklyLimit(event.target.value)}
+                type="number"
+                min="0"
+                max="1000000"
+                placeholder="周限额"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+              <Input
+                value={packageMonthlyLimit}
+                onChange={(event) => setPackageMonthlyLimit(event.target.value)}
+                type="number"
+                min="0"
+                max="1000000"
+                placeholder="月限额"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+              <Input
+                value={packageTotalLimit}
+                onChange={(event) => setPackageTotalLimit(event.target.value)}
+                type="number"
+                min="0"
+                max="1000000"
+                placeholder="总限额"
+                className="h-11 rounded-xl border-sky-200 bg-white"
+              />
+            </div>
+            <div className="text-xs leading-5 text-sky-800">
+              套餐有效期从用户兑换时开始计算；日/周/月/总限额可按需组合，至少填写一个限额。套餐额度会优先于普通购买次数消耗，不计入累计充值。
+            </div>
           </div>
-          <div>
-            <Input
-              value={creditValidityDays}
-              onChange={(event) => setCreditValidityDays(event.target.value)}
-              type="number"
-              min="1"
-              max="3650"
-              disabled={creditValidityMode === "permanent"}
-              placeholder="到账后几天内用完"
-              className="h-11 rounded-xl border-stone-200 bg-white disabled:bg-stone-100"
-            />
+        ) : null}
+        {codeType === "normal" ? (
+          <div className="grid gap-3 lg:grid-cols-[150px_130px_150px_170px_minmax(240px,1fr)]">
+            <div>
+              <Select value={validityMode} onValueChange={(value) => setValidityMode(value as ValidityMode)}>
+                <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white shadow-none">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="permanent">兑换永久</SelectItem>
+                  <SelectItem value="custom">兑换限期</SelectItem>
+                </SelectContent>
+              </Select>
+            </div>
+            <div>
+              <Input
+                value={validityDays}
+                onChange={(event) => setValidityDays(event.target.value)}
+                type="number"
+                min="1"
+                max="3650"
+                disabled={validityMode === "permanent"}
+                placeholder="几天内可兑换"
+                className="h-11 rounded-xl border-stone-200 bg-white disabled:bg-stone-100"
+              />
+            </div>
+            <div>
+              <Select value={creditValidityMode} onValueChange={(value) => setCreditValidityMode(value as ValidityMode)}>
+                <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white shadow-none">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="permanent">次数永久</SelectItem>
+                  <SelectItem value="custom">次数限期</SelectItem>
+                </SelectContent>
+              </Select>
+            </div>
+            <div>
+              <Input
+                value={creditValidityDays}
+                onChange={(event) => setCreditValidityDays(event.target.value)}
+                type="number"
+                min="1"
+                max="3650"
+                disabled={creditValidityMode === "permanent"}
+                placeholder="到账后几天内用完"
+                className="h-11 rounded-xl border-stone-200 bg-white disabled:bg-stone-100"
+              />
+            </div>
+            <label className="flex min-h-11 items-center gap-3 rounded-xl border border-stone-200 bg-white px-4 text-sm text-stone-700">
+              <Checkbox checked={batchSingleUse} onCheckedChange={(checked) => setBatchSingleUse(Boolean(checked))} />
+              <span>同批每人限兑一次</span>
+            </label>
           </div>
-          <label className="flex min-h-11 items-center gap-3 rounded-xl border border-stone-200 bg-white px-4 text-sm text-stone-700">
-            <Checkbox checked={batchSingleUse} onCheckedChange={(checked) => setBatchSingleUse(Boolean(checked))} />
-            <span>同批每人限兑一次</span>
-          </label>
-        </div>
+        ) : null}
         <div className="flex flex-col gap-3 md:flex-row">
           <Input value={note} onChange={(event) => setNote(event.target.value)} placeholder="备注（可选）" className="h-11 rounded-xl border-stone-200 bg-white" />
           <Button className="h-11 rounded-xl bg-stone-950 px-5 text-white hover:bg-stone-800" onClick={() => void handleCreate()} disabled={isCreating}>
@@ -286,7 +537,7 @@ export function ShopCodesCard() {
             <div className="flex items-center justify-between gap-3">
               <div>
                 <div className="text-sm font-medium text-emerald-900">本次生成的卡密明文</div>
-                <p className="text-xs text-emerald-700">请现在复制保存，后台之后只保存哈希，不会再显示明文。</p>
+                <p className="text-xs text-emerald-700">建议同步保存到发卡平台；后台列表也会继续显示这些新卡密。</p>
               </div>
               <Button variant="outline" className="rounded-xl border-emerald-200 bg-white text-emerald-700" onClick={() => void copyText(generatedCodes.join("\n"))}>
                 <Copy className="size-4" />
@@ -297,6 +548,174 @@ export function ShopCodesCard() {
           </div>
         ) : null}
 
+        <div className="space-y-4 rounded-xl border border-stone-200 bg-stone-50/80 p-4">
+          <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+            <div>
+              <div className="flex items-center gap-2 text-sm font-medium text-stone-900">
+                <Eraser className="size-4 text-stone-500" />
+                批量处理卡密
+              </div>
+              <p className="mt-1 text-xs leading-5 text-stone-500">
+                清理前可以先预览；执行时会先写入 JSONL 归档，再从数据库移除，适合控制 HF SQLite 体积。
+              </p>
+            </div>
+            <div className="flex shrink-0 gap-2">
+              <Button
+                type="button"
+                variant="outline"
+                className="h-9 rounded-xl border-stone-200 bg-white px-4 text-stone-700"
+                onClick={() => void handleCleanup(true)}
+                disabled={isCleaning}
+              >
+                {isCleaning ? <LoaderCircle className="size-4 animate-spin" /> : <Search className="size-4" />}
+                预览
+              </Button>
+              <Button
+                type="button"
+                className="h-9 rounded-xl bg-stone-950 px-4 text-white hover:bg-stone-800"
+                onClick={() => void handleCleanup(false)}
+                disabled={isCleaning}
+              >
+                {isCleaning ? <LoaderCircle className="size-4 animate-spin" /> : <Archive className="size-4" />}
+                执行清理
+              </Button>
+            </div>
+          </div>
+          <div className="grid gap-3 lg:grid-cols-[minmax(220px,1fr)_minmax(180px,1fr)_minmax(220px,1fr)_120px_120px]">
+            <label className="flex min-h-11 items-center gap-3 rounded-xl border border-stone-200 bg-white px-4 text-sm text-stone-700">
+              <Checkbox checked={cleanupDeleteExpired} onCheckedChange={(checked) => setCleanupDeleteExpired(Boolean(checked))} />
+              <span>删除过期未兑换卡密</span>
+            </label>
+            <label className="flex min-h-11 items-center gap-3 rounded-xl border border-stone-200 bg-white px-4 text-sm text-stone-700">
+              <Checkbox checked={cleanupDeleteDisabled} onCheckedChange={(checked) => setCleanupDeleteDisabled(Boolean(checked))} />
+              <span>删除已禁用卡密</span>
+            </label>
+            <label className="flex min-h-11 items-center gap-3 rounded-xl border border-stone-200 bg-white px-4 text-sm text-stone-700">
+              <Checkbox checked={cleanupArchiveRedeemed} onCheckedChange={(checked) => setCleanupArchiveRedeemed(Boolean(checked))} />
+              <span>归档已兑换旧卡密</span>
+            </label>
+            <Input
+              type="number"
+              min="1"
+              max="3650"
+              value={cleanupRedeemedDays}
+              onChange={(event) => setCleanupRedeemedDays(event.target.value)}
+              className="h-11 rounded-xl border-stone-200 bg-white"
+              placeholder="兑换超过天数"
+              disabled={!cleanupArchiveRedeemed}
+            />
+            <Input
+              type="number"
+              min="1"
+              max="20000"
+              value={cleanupLimit}
+              onChange={(event) => setCleanupLimit(event.target.value)}
+              className="h-11 rounded-xl border-stone-200 bg-white"
+              placeholder="单次上限"
+            />
+          </div>
+          {cleanupResult ? (
+            <div className="rounded-xl border border-stone-200 bg-white px-4 py-3 text-xs leading-6 text-stone-600">
+              <div className="font-medium text-stone-900">
+                {cleanupResult.dry_run ? "预览结果" : "清理结果"}：匹配 {cleanupResult.summary.matched} 张，删除 {cleanupResult.summary.deleted} 张，归档 {cleanupResult.summary.archived} 张
+              </div>
+              <div>
+                过期 {cleanupResult.summary.expired}，禁用 {cleanupResult.summary.disabled}，已兑换归档 {cleanupResult.summary.redeemed}
+                {cleanupResult.summary.archive_path ? `；归档文件：${cleanupResult.summary.archive_path}` : ""}
+              </div>
+              {cleanupResult.items.length > 0 ? (
+                <div className="mt-2 flex flex-wrap gap-2">
+                  {cleanupResult.items.slice(0, 8).map((item) => (
+                    <span key={`${item.id}-${item.cleanup_reason || ""}`} className="rounded-md bg-stone-100 px-2 py-1 font-mono text-[11px] text-stone-600">
+                      {cleanupReasonLabel(item.cleanup_reason)} · {codeDisplay(item)}
+                    </span>
+                  ))}
+                  {cleanupResult.items.length > 8 ? <span className="rounded-md bg-stone-100 px-2 py-1 text-[11px] text-stone-500">还有 {cleanupResult.items.length - 8} 张</span> : null}
+                </div>
+              ) : null}
+            </div>
+          ) : null}
+          <div className="rounded-xl border border-stone-200 bg-white px-4 py-3">
+            <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+              <label className="flex items-center gap-3 text-sm font-medium text-stone-800">
+                <Checkbox
+                  checked={Boolean(config?.redeem_code_cleanup?.enabled)}
+                  onCheckedChange={(checked) => setRedeemCodeCleanupField("enabled", Boolean(checked))}
+                />
+                自动清理过期卡密
+              </label>
+              <Button
+                type="button"
+                variant="outline"
+                className="h-9 rounded-xl border-stone-200 bg-white px-4 text-stone-700"
+                onClick={() => void saveConfig()}
+                disabled={isSavingConfig}
+              >
+                {isSavingConfig ? <LoaderCircle className="size-4 animate-spin" /> : <CheckCircle2 className="size-4" />}
+                保存自动清理
+              </Button>
+            </div>
+            <div className="mt-3 grid gap-3 lg:grid-cols-6">
+              <Input
+                type="number"
+                min="1"
+                value={String(config?.redeem_code_cleanup?.interval_minutes || 1440)}
+                onChange={(event) => setRedeemCodeCleanupField("interval_minutes", event.target.value)}
+                className="h-10 rounded-xl border-stone-200 bg-white"
+                disabled={!config?.redeem_code_cleanup?.enabled}
+                placeholder="间隔分钟"
+              />
+              <Input
+                type="number"
+                min="1"
+                max="20000"
+                value={String(config?.redeem_code_cleanup?.limit || 1000)}
+                onChange={(event) => setRedeemCodeCleanupField("limit", event.target.value)}
+                className="h-10 rounded-xl border-stone-200 bg-white"
+                disabled={!config?.redeem_code_cleanup?.enabled}
+                placeholder="单次上限"
+              />
+              <Input
+                type="number"
+                min="1"
+                max="3650"
+                value={String(config?.redeem_code_cleanup?.redeemed_older_than_days || 90)}
+                onChange={(event) => setRedeemCodeCleanupField("redeemed_older_than_days", event.target.value)}
+                className="h-10 rounded-xl border-stone-200 bg-white"
+                disabled={!config?.redeem_code_cleanup?.enabled || !config?.redeem_code_cleanup?.archive_redeemed}
+                placeholder="已兑换天数"
+              />
+              <label className="flex items-center gap-2 text-sm text-stone-700">
+                <Checkbox
+                  checked={config?.redeem_code_cleanup?.delete_expired !== false}
+                  onCheckedChange={(checked) => setRedeemCodeCleanupField("delete_expired", Boolean(checked))}
+                  disabled={!config?.redeem_code_cleanup?.enabled}
+                />
+                删除过期未兑换
+              </label>
+              <label className="flex items-center gap-2 text-sm text-stone-700">
+                <Checkbox
+                  checked={Boolean(config?.redeem_code_cleanup?.delete_disabled)}
+                  onCheckedChange={(checked) => setRedeemCodeCleanupField("delete_disabled", Boolean(checked))}
+                  disabled={!config?.redeem_code_cleanup?.enabled}
+                />
+                删除禁用卡密
+              </label>
+              <label className="flex items-center gap-2 text-sm text-stone-700">
+                <Checkbox
+                  checked={Boolean(config?.redeem_code_cleanup?.archive_redeemed)}
+                  onCheckedChange={(checked) => setRedeemCodeCleanupField("archive_redeemed", Boolean(checked))}
+                  disabled={!config?.redeem_code_cleanup?.enabled}
+                />
+                归档已兑换旧卡密
+              </label>
+            </div>
+            <p className="mt-2 text-xs leading-5 text-stone-500">
+              自动任务默认只删过期未兑换卡密；如开启已兑换归档，会处理超过 {String(config?.redeem_code_cleanup?.redeemed_older_than_days || 90)} 天的记录。
+            </p>
+          </div>
+        </div>
+
         {isLoading ? (
           <div className="flex items-center justify-center py-10">
             <LoaderCircle className="size-5 animate-spin text-stone-400" />
@@ -323,7 +742,7 @@ export function ShopCodesCard() {
                 <Input
                   value={keyword}
                   onChange={(event) => setKeyword(event.target.value)}
-                  placeholder="搜索批次、备注、用户、openid 或卡密ID"
+                  placeholder="搜索卡密、批次、备注、用户或 openid"
                   className="h-10 rounded-xl border-stone-200 bg-white pl-9 shadow-none"
                 />
               </div>
@@ -333,6 +752,8 @@ export function ShopCodesCard() {
                 <span>过期 {stats.expired}</span>
                 <span>已兑 {stats.redeemed}</span>
                 <span>禁用 {stats.disabled}</span>
+                <span>赠送 {stats.dailyGift}</span>
+                <span>套餐 {stats.package}</span>
               </div>
             </div>
             {filteredItems.length === 0 ? (
@@ -353,21 +774,31 @@ export function ShopCodesCard() {
             ) : null}
             {visibleItems.map((item) => {
               const isPending = pendingIds.has(item.id);
+              const displayCode = codeDisplay(item);
               return (
                 <div key={item.id} className="flex flex-col gap-3 rounded-xl border border-stone-200 bg-white px-4 py-4 md:flex-row md:items-center md:justify-between">
                   <div className="min-w-0 space-y-2">
                     <div className="flex flex-wrap items-center gap-2">
-                      <div className="font-mono text-sm font-medium text-stone-800">{item.prefix}-****-{item.id.slice(0, 4).toUpperCase()}</div>
+                      <div className={`break-all font-mono text-sm font-medium ${item.code ? "text-stone-800" : "text-stone-500"}`}>{displayCode}</div>
+                      {item.code ? (
+                        <Button variant="outline" className="h-7 rounded-lg border-stone-200 bg-white px-2 text-xs text-stone-600" onClick={() => void copyText(item.code || "")}>
+                          <Copy className="size-3" />
+                          复制
+                        </Button>
+                      ) : null}
                       <Badge variant={item.status === "active" && !isCodeExpired(item) ? "success" : "secondary"} className="rounded-md">
                         {statusLabel(item.status, item)}
                       </Badge>
-                      <span className="text-xs text-stone-500">{item.credits} 次</span>
+                      <Badge variant="outline" className={codeTypeBadgeClass(item.code_type)}>
+                        {codeTypeLabel(item.code_type)}
+                      </Badge>
+                      <span className="text-xs text-stone-500">{normalizeCodeType(item.code_type) === "package" ? packageSummary(item) : `${item.credits} 次`}</span>
                       {item.batch_single_use ? <Badge variant="outline" className="rounded-md">同批限兑</Badge> : null}
                     </div>
                     <div className="flex flex-wrap gap-x-4 gap-y-1 text-xs text-stone-500">
                       <span>创建 {formatDateTime(item.created_at)}</span>
                       <span>兑换 {item.expires_at ? `至 ${formatDateTime(item.expires_at)}` : "永久"}</span>
-                      <span>次数 {item.credit_expires_days ? `到账后 ${item.credit_expires_days} 天内有效` : "永久"}</span>
+                      <span>{normalizeCodeType(item.code_type) === "package" ? `套餐 ${packageSummary(item)}` : normalizeCodeType(item.code_type) === "daily_gift" ? "计入今日赠送" : `次数 ${item.credit_expires_days ? `到账后 ${item.credit_expires_days} 天内有效` : "永久"}`}</span>
                       {item.batch ? <span>批次 {item.batch}</span> : null}
                       {item.redeemed_at ? <span>兑换 {formatDateTime(item.redeemed_at)}</span> : null}
                       {item.redeemed_by ? <span>兑换人 {redeemedUserLabel(item)}</span> : null}
@@ -412,10 +843,11 @@ export function ShopCodesCard() {
         </DialogHeader>
         {deletingItem ? (
           <div className="rounded-xl bg-stone-50 p-4 text-sm text-stone-600">
-            <div>卡密：{deletingItem.prefix}-****-{deletingItem.id.slice(0, 4).toUpperCase()}</div>
-            <div>状态：{statusLabel(deletingItem.status, deletingItem)}，次数：{deletingItem.credits}</div>
+            <div>卡密：{codeDisplay(deletingItem)}</div>
+            <div>状态：{statusLabel(deletingItem.status, deletingItem)}，{normalizeCodeType(deletingItem.code_type) === "package" ? `套餐：${packageSummary(deletingItem)}` : `次数：${deletingItem.credits}`}</div>
+            <div>类型：{codeTypeLabel(deletingItem.code_type)}</div>
             <div>兑换期限：{deletingItem.expires_at ? `至 ${formatDateTime(deletingItem.expires_at)}` : "永久"}</div>
-            <div>次数期限：{deletingItem.credit_expires_days ? `到账后 ${deletingItem.credit_expires_days} 天内有效` : "永久"}</div>
+            <div>{normalizeCodeType(deletingItem.code_type) === "package" ? `到账规则：${packageSummary(deletingItem)}` : normalizeCodeType(deletingItem.code_type) === "daily_gift" ? "到账规则：计入今日赠送" : `次数期限：${deletingItem.credit_expires_days ? `到账后 ${deletingItem.credit_expires_days} 天内有效` : "永久"}`}</div>
             {deletingItem.batch ? <div>批次：{deletingItem.batch}</div> : null}
           </div>
         ) : null}

web/src/app/settings/components/user-keys-card.tsx

@@ -345,9 +345,11 @@ export function UserKeysCard({ kind = "internal" }: UserKeysCardProps) {
                           <>
                             <span>总可用 {item.credits ?? 0} 次</span>
                             <span>购买剩余 {item.paid_credits ?? item.credits ?? 0} 次</span>
+                            <span>套餐剩余 {item.package_credits ?? 0} 次</span>
                             <span>限时剩余 {item.expiring_credits ?? 0} 次</span>
                             <span>永久剩余 {item.permanent_credits ?? 0} 次</span>
                             <span>今日赠送剩余 {item.daily_credits_remaining ?? 0} / {item.daily_credits ?? 0} 次</span>
+                            {(item.daily_bonus_credits ?? 0) > 0 ? <span>卡密赠送 +{item.daily_bonus_credits ?? 0} 次</span> : null}
                             <span>已用 {item.used_credits ?? 0} 次</span>
                             <span>累计充值 {item.total_recharged ?? 0} 次</span>
                           </>

web/src/app/settings/store.ts

@@ -32,6 +32,7 @@ import {
   type FreeAccountCleanupSettings,
   type ImageStorageMode,
   type ImageStorageSettings,
+  type RedeemCodeCleanupSettings,
   type RegisterConfig,
   type SettingsConfig,
 } from "@/lib/api";
@@ -48,6 +49,16 @@ const DEFAULT_FREE_ACCOUNT_CLEANUP: FreeAccountCleanupSettings = {
   action: "mark_abnormal",
 };
 
+const DEFAULT_REDEEM_CODE_CLEANUP: RedeemCodeCleanupSettings = {
+  enabled: false,
+  interval_minutes: 1440,
+  delete_expired: true,
+  delete_disabled: false,
+  archive_redeemed: false,
+  redeemed_older_than_days: 90,
+  limit: 1000,
+};
+
 function normalizeFreeAccountCleanup(value: unknown): FreeAccountCleanupSettings {
   const source = typeof value === "object" && value !== null ? value as Partial<FreeAccountCleanupSettings> : {};
   const action = source.action === "delete" ? "delete" : "mark_abnormal";
@@ -60,6 +71,19 @@ function normalizeFreeAccountCleanup(value: unknown): FreeAccountCleanupSettings
   };
 }
 
+function normalizeRedeemCodeCleanup(value: unknown): RedeemCodeCleanupSettings {
+  const source = typeof value === "object" && value !== null ? value as Partial<RedeemCodeCleanupSettings> : {};
+  return {
+    enabled: Boolean(source.enabled),
+    interval_minutes: Math.max(1, Number(source.interval_minutes) || Number(DEFAULT_REDEEM_CODE_CLEANUP.interval_minutes)),
+    delete_expired: source.delete_expired !== false,
+    delete_disabled: Boolean(source.delete_disabled),
+    archive_redeemed: Boolean(source.archive_redeemed),
+    redeemed_older_than_days: Math.max(1, Number(source.redeemed_older_than_days) || Number(DEFAULT_REDEEM_CODE_CLEANUP.redeemed_older_than_days)),
+    limit: Math.max(1, Math.min(20000, Number(source.limit) || Number(DEFAULT_REDEEM_CODE_CLEANUP.limit))),
+  };
+}
+
 function normalizeConfig(config: SettingsConfig): SettingsConfig {
   const imageStorage = typeof config.image_storage === "object" && config.image_storage
     ? config.image_storage as ImageStorageSettings
@@ -127,6 +151,7 @@ function normalizeConfig(config: SettingsConfig): SettingsConfig {
     auto_remove_invalid_accounts: Boolean(config.auto_remove_invalid_accounts),
     auto_remove_rate_limited_accounts: Boolean(config.auto_remove_rate_limited_accounts),
     free_account_cleanup: normalizeFreeAccountCleanup(config.free_account_cleanup),
+    redeem_code_cleanup: normalizeRedeemCodeCleanup(config.redeem_code_cleanup),
     cleanup_shared_conversations: Boolean(config.cleanup_shared_conversations),
     log_levels: Array.isArray(config.log_levels) ? config.log_levels : [],
     proxy: typeof config.proxy === "string" ? config.proxy : "",
@@ -284,6 +309,7 @@ type SettingsStore = {
   setAutoRemoveInvalidAccounts: (value: boolean) => void;
   setAutoRemoveRateLimitedAccounts: (value: boolean) => void;
   setFreeAccountCleanupField: <K extends keyof FreeAccountCleanupSettings>(key: K, value: FreeAccountCleanupSettings[K]) => void;
+  setRedeemCodeCleanupField: <K extends keyof RedeemCodeCleanupSettings>(key: K, value: RedeemCodeCleanupSettings[K]) => void;
   setCleanupSharedConversations: (value: boolean) => void;
   setLogLevel: (level: string, enabled: boolean) => void;
   setProxy: (value: string) => void;
@@ -446,6 +472,12 @@ export const useSettingsStore = create<SettingsStore>((set, get) => ({
           interval_minutes: Math.max(1, Number(config.free_account_cleanup?.interval_minutes) || 10),
           failure_threshold: Math.max(1, Number(config.free_account_cleanup?.failure_threshold) || 2),
         },
+        redeem_code_cleanup: {
+          ...normalizeRedeemCodeCleanup(config.redeem_code_cleanup),
+          interval_minutes: Math.max(1, Number(config.redeem_code_cleanup?.interval_minutes) || 1440),
+          redeemed_older_than_days: Math.max(1, Number(config.redeem_code_cleanup?.redeemed_older_than_days) || 90),
+          limit: Math.max(1, Math.min(20000, Number(config.redeem_code_cleanup?.limit) || 1000)),
+        },
         cleanup_shared_conversations: Boolean(config.cleanup_shared_conversations),
         proxy: config.proxy.trim(),
         base_url: String(config.base_url || "").trim(),
@@ -605,6 +637,24 @@ export const useSettingsStore = create<SettingsStore>((set, get) => ({
     });
   },
 
+  setRedeemCodeCleanupField: (key, value) => {
+    set((state) => {
+      if (!state.config) {
+        return {};
+      }
+      const current = normalizeRedeemCodeCleanup(state.config.redeem_code_cleanup);
+      return {
+        config: {
+          ...state.config,
+          redeem_code_cleanup: normalizeRedeemCodeCleanup({
+            ...current,
+            [key]: value,
+          }),
+        },
+      };
+    });
+  },
+
   setCleanupSharedConversations: (value) => {
     set((state) => state.config ? { config: { ...state.config, cleanup_shared_conversations: value } } : {});
   },

web/src/components/top-nav.tsx

@@ -2,15 +2,29 @@
 
 import Link from "next/link";
 import { useEffect, useState } from "react";
-import { ExternalLink } from "lucide-react";
+import { ChevronDown, Copy, ExternalLink, KeyRound, LoaderCircle, LogOut, UserRound } from "lucide-react";
 import { usePathname } from "next/navigation";
+import { toast } from "sonner";
 
 import webConfig from "@/constants/common-env";
 import { AnnouncementsPopover } from "@/components/announcements-popover";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { fetchMyApiKey, fetchMyProfile, updateMyProfile, type MyProfile } from "@/lib/api";
 import { getValidatedAuthSession } from "@/lib/auth-session";
+import { formatChinaDateTime } from "@/lib/time";
 import { DEFAULT_BRANDING, type normalizeBranding } from "@/lib/branding";
 import { cn } from "@/lib/utils";
-import { clearStoredAuthSession, type StoredAuthSession } from "@/store/auth";
+import { clearStoredAuthSession, setStoredAuthSession, type StoredAuthSession } from "@/store/auth";
 
 const adminNavItems = [
   { href: "/image", label: "画图" },
@@ -31,11 +45,36 @@ function getRoleLabel(role: StoredAuthSession["role"]) {
     return "管理员";
   }
   if (role === "normal") {
-    return "普通用户";
+    return "微信用户";
   }
   return "内部用户";
 }
 
+function getExternalApiUrl() {
+  const configuredApiUrl = webConfig.apiUrl.replace(/\/$/, "");
+  if (configuredApiUrl) {
+    return configuredApiUrl;
+  }
+  if (typeof window !== "undefined") {
+    return window.location.origin;
+  }
+  return "";
+}
+
+function isTemporaryWechatName(profile: MyProfile | null) {
+  const name = String(profile?.name || "").trim();
+  return Boolean(profile?.wechat_openid) && (
+    !name ||
+    name === "微信用户" ||
+    /^微信用户\s+[A-Za-z0-9_-]{4,}$/.test(name) ||
+    /^Wechat user(?:\s+\d+)?$/i.test(name)
+  );
+}
+
+function canViewApiKey(role: StoredAuthSession["role"]) {
+  return role === "normal" || role === "user";
+}
+
 function sanitizeSvgMarkup(markup: string) {
   const trimmed = markup.trim();
   if (!/^\s*<svg[\s>][\s\S]*<\/svg>\s*$/i.test(trimmed)) {
@@ -90,6 +129,16 @@ type Branding = ReturnType<typeof normalizeBranding>;
 export function TopNav({ branding = DEFAULT_BRANDING }: { branding?: Branding }) {
   const pathname = usePathname();
   const [session, setSession] = useState<StoredAuthSession | null | undefined>(undefined);
+  const [isAccountMenuOpen, setIsAccountMenuOpen] = useState(false);
+  const [isMobileAccountMenuOpen, setIsMobileAccountMenuOpen] = useState(false);
+  const [isApiKeyOpen, setIsApiKeyOpen] = useState(false);
+  const [apiKeyValue, setApiKeyValue] = useState("");
+  const [isLoadingApiKey, setIsLoadingApiKey] = useState(false);
+  const [profile, setProfile] = useState<MyProfile | null>(null);
+  const [isProfileOpen, setIsProfileOpen] = useState(false);
+  const [nicknameValue, setNicknameValue] = useState("");
+  const [isLoadingProfile, setIsLoadingProfile] = useState(false);
+  const [isSavingNickname, setIsSavingNickname] = useState(false);
 
   useEffect(() => {
     let active = true;
@@ -123,6 +172,8 @@ export function TopNav({ branding = DEFAULT_BRANDING }: { branding?: Branding })
   }, [pathname]);
 
   const handleLogout = () => {
+    setIsAccountMenuOpen(false);
+    setIsMobileAccountMenuOpen(false);
     const clearPromise = clearStoredAuthSession();
     setSession(null);
     window.location.replace("/login");
@@ -131,6 +182,92 @@ export function TopNav({ branding = DEFAULT_BRANDING }: { branding?: Branding })
     });
   };
 
+  const handleOpenApiKey = async () => {
+    if (!session || !canViewApiKey(session.role)) {
+      return;
+    }
+    setIsAccountMenuOpen(false);
+    setIsMobileAccountMenuOpen(false);
+    setIsApiKeyOpen(true);
+    setIsLoadingApiKey(true);
+    if (session.role === "user") {
+      setApiKeyValue(session.key);
+      setIsLoadingApiKey(false);
+      return;
+    }
+    try {
+      const data = await fetchMyApiKey();
+      setApiKeyValue(data.api_key);
+    } catch (error) {
+      setApiKeyValue("");
+      toast.error(error instanceof Error ? error.message : "加载密钥失败");
+    } finally {
+      setIsLoadingApiKey(false);
+    }
+  };
+
+  const handleOpenProfile = async () => {
+    setIsAccountMenuOpen(false);
+    setIsMobileAccountMenuOpen(false);
+    setNicknameValue(session?.name || "");
+    setIsProfileOpen(true);
+    setIsLoadingProfile(true);
+    try {
+      const data = await fetchMyProfile();
+      setProfile(data.profile);
+      setNicknameValue(data.profile.name || session?.name || "");
+    } catch (error) {
+      setProfile(null);
+      toast.error(error instanceof Error ? error.message : "加载个人资料失败");
+    } finally {
+      setIsLoadingProfile(false);
+    }
+  };
+
+  const handleSaveNickname = async () => {
+    if (!session || session.role !== "normal") {
+      setIsProfileOpen(false);
+      return;
+    }
+    const normalizedName = nicknameValue.trim();
+    if (!normalizedName) {
+      toast.error("请输入昵称");
+      return;
+    }
+    setIsSavingNickname(true);
+    try {
+      const data = await updateMyProfile(normalizedName);
+      const nextProfile = data.profile;
+      const nextSession = {
+        ...session,
+        name: nextProfile.name || normalizedName,
+        wechatOpenid: nextProfile.wechat_openid || session.wechatOpenid,
+      };
+      setProfile(nextProfile);
+      setNicknameValue(nextProfile.name || "");
+      setSession(nextSession);
+      await setStoredAuthSession(nextSession);
+      setIsProfileOpen(false);
+      toast.success("昵称已保存");
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : "保存昵称失败");
+    } finally {
+      setIsSavingNickname(false);
+    }
+  };
+
+  const handleCopyApiKey = async () => {
+    if (!apiKeyValue) {
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(apiKeyValue);
+      toast.success("密钥已复制");
+    } catch {
+      toast.error("复制失败，请手动选择密钥复制");
+    }
+  };
+
   if (pathname === "/login" || session === undefined || !session) {
     return null;
   }
@@ -150,84 +287,276 @@ export function TopNav({ branding = DEFAULT_BRANDING }: { branding?: Branding })
   const externalLinkIconUrl = branding.site_external_link_icon_url.trim();
   const externalLinkIconSvg = branding.site_external_link_icon_svg.trim();
   const ExternalLinkIcon = ExternalLink;
+  const externalApiUrl = getExternalApiUrl();
+  const profileName = profile?.name?.trim() || displayName;
+  const showApiKey = canViewApiKey(session.role);
 
   return (
-    <header className="border-b border-stone-100/50">
-      <div className="relative flex min-h-12 flex-col gap-1 px-3 py-2 sm:h-12 sm:flex-row sm:items-center sm:justify-between sm:gap-3 sm:px-6 sm:py-0">
-        <div className="flex items-center justify-between gap-2 sm:justify-start sm:gap-3">
-          <Link
-            href="/image"
-            className="inline-flex shrink-0 items-center gap-1.5 py-1 text-[15px] font-bold tracking-tight text-stone-950 transition hover:text-stone-700"
-          >
-            {logoUrl ? <img src={logoUrl} alt="" className="size-5 rounded-md object-cover" /> : null}
-            <span>{headerTitle}</span>
-          </Link>
-          {externalLinkUrl && externalLinkLabel ? (
-            <a
-              href={externalLinkUrl}
-              target="_blank"
-              rel="noreferrer"
-              className="inline-flex items-center gap-1.5 py-1 text-sm text-stone-400 transition hover:text-stone-700"
-              aria-label={externalLinkLabel}
+    <>
+      <header className="border-b border-stone-100/50">
+        <div className="relative flex min-h-12 flex-col gap-1 px-3 py-2 sm:h-12 sm:flex-row sm:items-center sm:justify-between sm:gap-3 sm:px-6 sm:py-0">
+          <div className="flex items-center justify-between gap-2 sm:justify-start sm:gap-3">
+            <Link
+              href="/image"
+              className="inline-flex shrink-0 items-center gap-1.5 py-1 text-[15px] font-bold tracking-tight text-stone-950 transition hover:text-stone-700"
             >
-              {externalLinkIconSvg ? (
-                <InlineSvgIcon svg={externalLinkIconSvg} />
-              ) : externalLinkIconUrl ? (
-                <img src={externalLinkIconUrl} alt="" className="size-4 rounded-sm object-cover" />
-              ) : (
-                <ExternalLinkIcon className="size-4" />
-              )}
-              <span className="hidden md:inline">{externalLinkLabel}</span>
-            </a>
-          ) : null}
-          <button
-            type="button"
-            className="ml-auto shrink-0 py-1 text-xs text-stone-400 transition hover:text-stone-700 sm:hidden"
-            onClick={handleLogout}
-          >
-            退出
-          </button>
-        </div>
-        <nav className="hide-scrollbar -mx-1 flex min-w-0 flex-1 gap-1 overflow-x-auto px-1 sm:mx-0 sm:justify-center sm:gap-8 sm:overflow-visible sm:px-0">
-          {navItems.map((item) => {
-            const active = pathname === item.href;
-            return (
-              <Link
-                key={item.href}
-                href={item.href}
-                className={cn(
-                  "relative shrink-0 whitespace-nowrap rounded-full px-2.5 py-1 text-[13px] font-medium transition sm:rounded-none sm:px-0 sm:text-[15px]",
-                  active
-                    ? "bg-stone-950 text-white sm:bg-transparent sm:font-semibold sm:text-stone-950"
-                    : "text-stone-500 hover:text-stone-900",
-                )}
+              {logoUrl ? <img src={logoUrl} alt="" className="size-5 rounded-md object-cover" /> : null}
+              <span>{headerTitle}</span>
+              <span className="rounded-md bg-stone-100 px-1.5 py-0.5 text-[10px] font-semibold leading-none text-stone-500">
+                v{webConfig.appVersion}
+              </span>
+            </Link>
+            {externalLinkUrl && externalLinkLabel ? (
+              <a
+                href={externalLinkUrl}
+                target="_blank"
+                rel="noreferrer"
+                className="inline-flex items-center gap-1.5 py-1 text-sm text-stone-400 transition hover:text-stone-700"
+                aria-label={externalLinkLabel}
               >
-                {item.label}
-                {active ? <span className="absolute inset-x-0 -bottom-[1px] hidden h-0.5 bg-stone-950 sm:block" /> : null}
-              </Link>
-            );
-          })}
-        </nav>
-        <div className="hidden items-center justify-end gap-2 sm:flex sm:gap-3">
-          <AnnouncementsPopover session={session} />
-          <span className="hidden rounded-md bg-stone-100 px-2 py-1 text-[10px] font-medium text-stone-500 sm:inline-block sm:text-[11px]">
-            {roleLabel} · {displayName}
-          </span>
-          <span className="hidden rounded-md bg-stone-100 px-2 py-1 text-[10px] font-medium text-stone-500 sm:inline-block sm:text-[11px]">
-            v{webConfig.appVersion}
+                {externalLinkIconSvg ? (
+                  <InlineSvgIcon svg={externalLinkIconSvg} />
+                ) : externalLinkIconUrl ? (
+                  <img src={externalLinkIconUrl} alt="" className="size-4 rounded-sm object-cover" />
+                ) : (
+                  <ExternalLinkIcon className="size-4" />
+                )}
+                <span className="hidden md:inline">{externalLinkLabel}</span>
+              </a>
+            ) : null}
+            <div className="ml-auto sm:hidden">
+              <AccountPopover
+                displayName={displayName}
+                roleLabel={roleLabel}
+                session={session}
+                open={isMobileAccountMenuOpen}
+                onOpenChange={setIsMobileAccountMenuOpen}
+                onProfile={() => void handleOpenProfile()}
+                onApiKey={() => void handleOpenApiKey()}
+                onLogout={handleLogout}
+              />
+            </div>
+          </div>
+          <nav className="hide-scrollbar -mx-1 flex min-w-0 flex-1 gap-1 overflow-x-auto px-1 sm:mx-0 sm:justify-center sm:gap-8 sm:overflow-visible sm:px-0">
+            {navItems.map((item) => {
+              const active = pathname === item.href;
+              return (
+                <Link
+                  key={item.href}
+                  href={item.href}
+                  className={cn(
+                    "relative shrink-0 whitespace-nowrap rounded-full px-2.5 py-1 text-[13px] font-medium transition sm:rounded-none sm:px-0 sm:text-[15px]",
+                    active
+                      ? "bg-stone-950 text-white sm:bg-transparent sm:font-semibold sm:text-stone-950"
+                      : "text-stone-500 hover:text-stone-900",
+                  )}
+                >
+                  {item.label}
+                  {active ? <span className="absolute inset-x-0 -bottom-[1px] hidden h-0.5 bg-stone-950 sm:block" /> : null}
+                </Link>
+              );
+            })}
+          </nav>
+          <div className="hidden items-center justify-end gap-2 sm:flex sm:gap-3">
+            <AnnouncementsPopover session={session} />
+            <AccountPopover
+              displayName={displayName}
+              roleLabel={roleLabel}
+              session={session}
+              open={isAccountMenuOpen}
+              onOpenChange={setIsAccountMenuOpen}
+              onProfile={() => void handleOpenProfile()}
+              onApiKey={() => void handleOpenApiKey()}
+              onLogout={handleLogout}
+            />
+          </div>
+          <div className="absolute top-2 right-16 sm:hidden scale-90">
+            <AnnouncementsPopover session={session} />
+          </div>
+        </div>
+      </header>
+      {showApiKey ? (
+        <Dialog
+          open={isApiKeyOpen}
+          onOpenChange={(open) => {
+            setIsApiKeyOpen(open);
+            if (!open) {
+              setIsLoadingApiKey(false);
+            }
+          }}
+        >
+          <DialogContent showCloseButton={false} className="rounded-2xl p-6">
+            <DialogHeader className="gap-2">
+              <DialogTitle className="flex items-center gap-2">
+                <KeyRound className="size-5" />
+                密钥
+              </DialogTitle>
+              <DialogDescription className="text-sm leading-6">
+                这个 Key 可以用于网站登录，也可以填到支持 OpenAI 图片接口的第三方工具里调用当前网站。
+              </DialogDescription>
+            </DialogHeader>
+            <div className="space-y-3">
+              <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm leading-6 text-stone-700">
+                <div className="text-xs font-medium uppercase tracking-wide text-stone-400">URL</div>
+                <div className="break-all font-mono text-xs text-stone-800">
+                  {externalApiUrl || "部署后显示当前网站地址"}
+                </div>
+              </div>
+              <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm leading-6 text-stone-700">
+                <div className="text-xs font-medium uppercase tracking-wide text-stone-400">Key</div>
+                <div className="break-all font-mono text-xs text-stone-800">
+                  {isLoadingApiKey ? "加载中..." : apiKeyValue || "当前密钥无法回显，请联系管理员重置。"}
+                </div>
+              </div>
+            </div>
+            <DialogFooter>
+              <Button variant="outline" onClick={() => setIsApiKeyOpen(false)}>
+                关闭
+              </Button>
+              <Button className="bg-stone-950 text-white hover:bg-stone-800" onClick={() => void handleCopyApiKey()} disabled={!apiKeyValue || isLoadingApiKey}>
+                {isLoadingApiKey ? <LoaderCircle className="size-4 animate-spin" /> : <Copy className="size-4" />}
+                复制密钥
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      ) : null}
+      <Dialog open={isProfileOpen} onOpenChange={setIsProfileOpen}>
+        <DialogContent showCloseButton={false} className="rounded-2xl p-6">
+          <DialogHeader className="gap-2">
+            <DialogTitle>个人资料</DialogTitle>
+            <DialogDescription className="text-sm leading-6">
+              查看当前登录账号信息，微信用户可以在这里修改昵称。
+            </DialogDescription>
+          </DialogHeader>
+          <div className="space-y-3">
+            <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-sm leading-6 text-stone-700">
+              <div className="text-xs font-medium uppercase tracking-wide text-stone-400">账号</div>
+              <div className="break-all text-sm font-medium text-stone-900">{profileName}</div>
+              <div className="text-xs text-stone-500">{roleLabel}</div>
+              <div className="mt-1 text-xs text-stone-500">注册时间：{formatChinaDateTime(profile?.created_at)}</div>
+            </div>
+            {profile?.wechat_openid ? (
+              <div className="rounded-xl border border-stone-200 bg-stone-50 px-3 py-2 text-xs leading-5 text-stone-500 break-all">
+                微信 openid：{profile.wechat_openid}
+              </div>
+            ) : null}
+            {session.role === "normal" ? (
+              <div className="space-y-2">
+                <label className="text-sm font-medium text-stone-700">昵称</label>
+                <Input
+                  value={nicknameValue}
+                  onChange={(event) => setNicknameValue(event.target.value)}
+                  placeholder={isLoadingProfile ? "加载中..." : "请输入一个方便识别的昵称"}
+                  maxLength={32}
+                  className="h-11 rounded-xl border-stone-200 bg-white"
+                  disabled={isLoadingProfile || isSavingNickname}
+                  onKeyDown={(event) => {
+                    if (event.key === "Enter") {
+                      void handleSaveNickname();
+                    }
+                  }}
+                />
+                <p className="text-xs text-stone-400">最多 32 个字符，保存后别人不能再使用同一个昵称。</p>
+              </div>
+            ) : null}
+          </div>
+          <DialogFooter>
+            {session.role !== "normal" || !isTemporaryWechatName(profile) ? (
+              <Button variant="outline" onClick={() => setIsProfileOpen(false)} disabled={isSavingNickname}>
+                关闭
+              </Button>
+            ) : null}
+            {session.role === "normal" ? (
+              <Button className="bg-stone-950 text-white hover:bg-stone-800" onClick={() => void handleSaveNickname()} disabled={isLoadingProfile || isSavingNickname}>
+                {isSavingNickname ? <LoaderCircle className="size-4 animate-spin" /> : null}
+                保存昵称
+              </Button>
+            ) : null}
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </>
+  );
+}
+
+function AccountPopover({
+  displayName,
+  roleLabel,
+  session,
+  open,
+  onOpenChange,
+  onProfile,
+  onApiKey,
+  onLogout,
+}: {
+  displayName: string;
+  roleLabel: string;
+  session: StoredAuthSession;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onProfile: () => void;
+  onApiKey: () => void;
+  onLogout: () => void;
+}) {
+  return (
+    <Popover open={open} onOpenChange={onOpenChange}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          className="inline-flex h-10 shrink-0 items-center gap-1 px-1 text-left text-stone-700 transition hover:text-stone-950"
+          aria-label="账号菜单"
+        >
+          <span className="flex min-w-0 max-w-[120px] flex-col leading-tight">
+            <span className="truncate text-xs font-semibold text-stone-900">{displayName}</span>
+            <span className="truncate text-[11px] font-medium text-stone-400">{roleLabel}</span>
           </span>
-          <button
-            type="button"
-            className="py-1 text-xs text-stone-400 transition hover:text-stone-700 sm:text-sm"
-            onClick={handleLogout}
-          >
-            退出
-          </button>
+          <ChevronDown className={cn("size-3.5 text-stone-400 transition", open && "rotate-180")} />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        align="end"
+        sideOffset={10}
+        className="w-[224px] overflow-hidden rounded-2xl border border-stone-200 bg-white p-0 text-stone-900 shadow-[0_24px_70px_-32px_rgba(15,23,42,0.32)]"
+      >
+        <div className="px-4 py-3">
+          <div className="text-sm font-semibold text-stone-950">{displayName}</div>
+          <div className="mt-0.5 truncate text-xs text-stone-500">{roleLabel}</div>
         </div>
-        <div className="absolute top-2 right-12 sm:hidden scale-90">
-          <AnnouncementsPopover session={session} />
+        <div className="border-t border-stone-100 py-1.5">
+          <AccountMenuButton icon={UserRound} label="个人资料" onClick={onProfile} />
+          {canViewApiKey(session.role) ? <AccountMenuButton icon={KeyRound} label="API 密钥" onClick={onApiKey} /> : null}
         </div>
-      </div>
-    </header>
+        <div className="border-t border-stone-100 py-1.5">
+          <AccountMenuButton icon={LogOut} label="退出登录" tone="danger" onClick={onLogout} />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function AccountMenuButton({
+  icon: Icon,
+  label,
+  tone = "default",
+  onClick,
+}: {
+  icon: React.ComponentType<{ className?: string }>;
+  label: string;
+  tone?: "default" | "danger";
+  onClick: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      className={cn(
+        "flex w-full items-center gap-3 px-4 py-2.5 text-left text-sm transition",
+        tone === "danger" ? "text-rose-600 hover:bg-rose-50 hover:text-rose-700" : "text-stone-700 hover:bg-stone-50 hover:text-stone-950",
+      )}
+      onClick={onClick}
+    >
+      <Icon className={cn("size-4", tone === "danger" ? "text-rose-500" : "text-stone-400")} />
+      <span>{label}</span>
+    </button>
   );
 }

web/src/lib/api.ts

@@ -96,6 +96,16 @@ export type FreeAccountCleanupSettings = {
   action: FreeAccountCleanupAction;
 };
 
+export type RedeemCodeCleanupSettings = {
+  enabled: boolean;
+  interval_minutes: number | string;
+  delete_expired: boolean;
+  delete_disabled: boolean;
+  archive_redeemed: boolean;
+  redeemed_older_than_days: number | string;
+  limit: number | string;
+};
+
 export type SettingsConfig = {
   proxy: string;
   base_url?: string;
@@ -131,6 +141,7 @@ export type SettingsConfig = {
   auto_remove_invalid_accounts?: boolean;
   auto_remove_rate_limited_accounts?: boolean;
   free_account_cleanup?: FreeAccountCleanupSettings;
+  redeem_code_cleanup?: RedeemCodeCleanupSettings;
   cleanup_shared_conversations?: boolean;
   log_levels?: string[];
   backup?: BackupSettings;
@@ -318,6 +329,8 @@ export type UserKey = {
   permanent_credits?: number;
   expiring_credits?: number;
   expiring_reserved_credits?: number;
+  package_credits?: number;
+  package_grants?: PackageGrant[];
   credit_grants?: Array<{
     id?: string;
     remaining?: number;
@@ -328,6 +341,7 @@ export type UserKey = {
   daily_credits?: number;
   daily_credits_remaining?: number;
   daily_credits_used?: number;
+  daily_bonus_credits?: number;
   daily_reserved_credits?: number;
   daily_credits_date?: string;
   has_api_key_display?: boolean;
@@ -341,6 +355,7 @@ export type MyProfile = {
   id: string;
   name: string;
   role: AuthRole | string;
+  created_at?: string | null;
   account_pool_enabled?: boolean;
   wechat_openid?: string;
   wechat_bound_at?: string | null;
@@ -364,26 +379,62 @@ export type CreditSummary = {
     expires_at?: string;
     source?: string;
   }>;
+  package_credits: number;
+  package_grants: PackageGrant[];
   daily_credits: number;
   daily_credits_remaining: number;
   daily_credits_used: number | null;
+  daily_bonus_credits: number;
   daily_reserved_credits: number;
   daily_credits_date: string;
 };
 
+export type PackagePlan = {
+  name?: string | null;
+  duration_days?: number | null;
+  daily_limit?: number | null;
+  weekly_limit?: number | null;
+  monthly_limit?: number | null;
+  total_limit?: number | null;
+};
+
+export type PackageGrant = PackagePlan & {
+  id?: string | null;
+  remaining?: number | null;
+  created_at?: string | null;
+  starts_at?: string | null;
+  expires_at?: string | null;
+  source?: string | null;
+  code_id?: string | null;
+  used_total?: number | null;
+  reserved_total?: number | null;
+  used_daily?: number | null;
+  reserved_daily?: number | null;
+  used_weekly?: number | null;
+  reserved_weekly?: number | null;
+  used_monthly?: number | null;
+  reserved_monthly?: number | null;
+};
+
 export type RedeemCode = {
   id: string;
+  code?: string | null;
   prefix: string;
   credits: number;
   status: "active" | "redeemed" | "disabled" | string;
+  code_type?: "normal" | "daily_gift" | "package" | string | null;
   batch?: string | null;
   batch_id?: string | null;
   batch_single_use?: boolean;
   note?: string | null;
   created_at?: string | null;
+  starts_at?: string | null;
   expires_at?: string | null;
+  daily_gift_date?: string | null;
+  package_plan?: PackagePlan | null;
   credit_expires_days?: number | null;
   credit_expires_at?: string | null;
+  is_not_started?: boolean;
   is_expired?: boolean;
   redeemed_by?: string | null;
   redeemed_at?: string | null;
@@ -393,14 +444,39 @@ export type RedeemCode = {
     wechat_openid?: string | null;
     wechat_nickname?: string | null;
   } | null;
+  cleanup_reason?: string;
+};
+
+export type RedeemCodeCleanupSummary = {
+  matched: number;
+  deleted: number;
+  archived: number;
+  archive_path?: string | null;
+  expired: number;
+  disabled: number;
+  redeemed: number;
+  limit: number;
+};
+
+export type RedeemCodeCleanupResponse = {
+  dry_run: boolean;
+  summary: RedeemCodeCleanupSummary;
+  archive?: {
+    archived: number;
+    path?: string | null;
+  };
+  items: RedeemCode[];
+  all_items?: RedeemCode[];
 };
 
 export type ShopLedgerEntry = {
   id: string;
   time: string;
   type: string;
+  source?: string;
   user_id?: string;
   code_id?: string;
+  code_type?: string;
   delta?: number;
   credits?: number;
   batch?: string;
@@ -883,6 +959,10 @@ export async function fetchMyCredits() {
   return httpRequest<{ credits: CreditSummary }>("/api/me/credits");
 }
 
+export async function fetchMyRedeemCodes() {
+  return httpRequest<{ items: RedeemCode[] }>("/api/me/redeem-codes");
+}
+
 export async function fetchMyProfile() {
   return httpRequest<{ profile: MyProfile }>("/api/me/profile");
 }
@@ -929,6 +1009,14 @@ export async function createRedeemCodes(body: {
   validity_days?: number | null;
   credit_expires_days?: number | null;
   batch_single_use?: boolean;
+  code_type?: string;
+  daily_gift_date?: string;
+  package_name?: string;
+  package_duration_days?: number;
+  package_daily_limit?: number | null;
+  package_weekly_limit?: number | null;
+  package_monthly_limit?: number | null;
+  package_total_limit?: number | null;
 }) {
   return httpRequest<{ codes: string[]; items: RedeemCode[]; all_items: RedeemCode[] }>("/api/shop/codes", {
     method: "POST",
@@ -957,6 +1045,20 @@ export async function deleteRedeemCode(codeId: string) {
   });
 }
 
+export async function cleanupRedeemCodes(body: {
+  delete_expired: boolean;
+  delete_disabled: boolean;
+  archive_redeemed: boolean;
+  redeemed_older_than_days: number;
+  limit: number;
+  dry_run: boolean;
+}) {
+  return httpRequest<RedeemCodeCleanupResponse>("/api/shop/codes/cleanup", {
+    method: "POST",
+    body,
+  });
+}
+
 export async function fetchShopLedger() {
   return httpRequest<{ items: ShopLedgerEntry[] }>("/api/shop/ledger");
 }