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

video-gen-api/app/api/v1/admin.py

@@ -279,6 +279,26 @@ async def update_user_status(
     return {"message": "ok"}
 
 
+@router.put("/users/{user_id}/admin-status")
+async def update_user_admin_status(
+    user_id: str,
+    body: dict,
+    admin: User = Depends(get_admin_user),
+    db: AsyncSession = Depends(get_db),
+):
+    is_admin = body.get("is_admin", False)
+    result = await db.execute(select(User).where(User.id == user_id).limit(1))
+    user = result.scalar_one_or_none()
+    if not user:
+        raise HTTPException(status_code=404, detail="用户不存在")
+    if user.user_type != "admin":
+        raise HTTPException(status_code=400, detail="仅后台用户支持设置超级管理员状态")
+    user.is_admin = is_admin
+    await db.flush()
+    await log_operation(db, admin.id, admin.username, f"{is_admin and '设为' or '取消'}超级管理员", "PUT", f"/admin/users/{user_id}/admin-status")
+    return {"message": "ok"}
+
+
 @router.put("/users/{user_id}/frontend-kind", response_model=AdminUserOut)
 async def update_user_frontend_kind(
     user_id: str,

video-gen-api/app/api/v1/team.py

@@ -245,13 +245,14 @@ async def get_join_info_public(
 
 @router.get("/join-requests", )
 async def list_join_requests(
+    status: str | None = Query(None),
     current_user: User = Depends(get_current_user),
     db: AsyncSession = Depends(get_db),
 ):
     team = await get_managed_team(db, current_user.id)
     if not team:
         raise HTTPException(status_code=403, detail="只有团队管理人可查看")
-    requests = await team_invitation_service.get_pending_requests(db, team.id)
+    requests = await team_invitation_service.get_all_requests(db, team.id, status)
 
     # 获取团队名
     team_name_result = await db.execute(
@@ -269,7 +270,8 @@ async def list_join_requests(
             phone=r.get("phone"),
             status=r["status"],
             note=r.get("note"),
-            created_at=r.get("created_at"),
+            created_at=r["created_at"],
+            handled_at=r.get("handled_at"),
         )
         for r in requests
     ]