第一次提交哦啊

backend/app/routers/user.py

@@ -5,6 +5,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from typing import List
 from ..core.database import get_db
+from ..models.user import User
 from ..schemas.user import UserResponse, UserUpdate, TransactionResponse, ChangePasswordRequest
 from ..services.user_service import UserService
 from ..utils.deps import get_current_user, get_current_admin
@@ -13,7 +14,7 @@ router = APIRouter(prefix="/api/users", tags=["users"])
 
 
 @router.get("/me", response_model=UserResponse)
-def get_me(current_user: UserService = Depends(get_current_user)):
+def get_me(current_user: User = Depends(get_current_user)):
     """
     获取当前用户信息
     """
@@ -24,18 +25,18 @@ def get_me(current_user: UserService = Depends(get_current_user)):
 def get_my_transactions(
     limit: int = 50,
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_user)
+    current_user: User = Depends(get_current_user)
 ):
     """
     获取我的交易流水
     """
-    return UserService.get_user_transactions(db, current_user.id, limit)
+    return UserService.get_user_transactions(db, current_user.id, 0, limit)
 
 
 @router.post("/me/allowance")
 def claim_allowance(
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_user)
+    current_user: User = Depends(get_current_user)
 ):
     """
     领取低保
@@ -50,7 +51,7 @@ def claim_allowance(
 @router.get("/me/allowance-info")
 def get_allowance_info(
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_user)
+    current_user: User = Depends(get_current_user)
 ):
     """
     获取低保领取信息
@@ -74,12 +75,11 @@ def get_users(
     skip: int = 0,
     limit: int = 100,
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_admin)
+    current_user: User = Depends(get_current_admin)
 ):
     """
     获取用户列表（仅管理员）
     """
-    from ..models.user import User
     return db.query(User).offset(skip).limit(limit).all()
 
 
@@ -88,7 +88,7 @@ def update_user(
     user_id: int,
     user_data: UserUpdate,
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_admin)
+    current_user: User = Depends(get_current_admin)
 ):
     """
     更新用户信息（仅管理员）
@@ -106,7 +106,7 @@ def adjust_user_balance(
     amount: int,
     description: str,
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_admin)
+    current_user: User = Depends(get_current_admin)
 ):
     """
     管理员调整用户余额
@@ -115,7 +115,7 @@ def adjust_user_balance(
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
 
-    UserService.adjust_balance(db, user, amount, description, current_user)
+    UserService.adjust_balance_with_version(db, user, amount, description, current_user)
     return {"message": "余额调整成功", "new_balance": user.balance}
 
 
@@ -123,7 +123,7 @@ def adjust_user_balance(
 def change_password(
     change_request: ChangePasswordRequest,
     db: Session = Depends(get_db),
-    current_user: UserService = Depends(get_current_user)
+    current_user: User = Depends(get_current_user)
 ):
     """
     修改当前用户密码