优化流水记录

models_sql.py

@@ -68,6 +68,13 @@ class Transaction(Base):
     prev_hash = Column(String)                   # 上一笔订单的哈希
     tx_hash = Column(String)                     # 本笔订单的哈希 (防篡改)
     
+    # 💰 提现相关字段 (仅 WITHDRAW_APPLY 类型交易使用)
+    alipay_account = Column(String, nullable=True)      # 收款支付宝账号
+    real_name = Column(String, nullable=True)            # 收款人姓名
+    withdraw_status = Column(String, nullable=True)      # pending / completed
+    payment_order_id = Column(String, nullable=True)     # 管理员填写的打款订单号
+    net_amount = Column(Integer, nullable=True)          # 实际到账金额（用于解冻时准确扣减）
+    
     # 🚀 P1性能优化：复合索引
     __table_args__ = (
         Index('ix_transactions_account_type', 'account', 'tx_type'),

router_wallet.py

@@ -13,6 +13,7 @@
 from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import Response
 from sqlalchemy.orm import Session
+from pydantic import BaseModel
 import time
 import uuid
 import hashlib
@@ -24,6 +25,7 @@ from models_sql import Wallet, Transaction, Ownership, Refund
 from models import RechargeRequest, WithdrawRequest, PurchaseRequest, TipRequest
 import 数据库连接 as json_db
 from notifications import add_notification
+from 安全认证 import require_auth, is_admin
 
 # 🔒 P0安全优化：API限流
 from slowapi import Limiter
@@ -536,6 +538,10 @@ async def withdraw(request: Request, req: WithdrawRequest, db: Session = Depends
         
         new_tx = Transaction(
             tx_id=tx_id, account=req.account, tx_type="WITHDRAW", amount=-actual_withdraw,
+            alipay_account=req.alipayAccount,
+            real_name=req.real_name,
+            withdraw_status="pending",
+            net_amount=net_amount,  # 记录实际到账金额，用于解冻时准确扣减
             prev_hash=prev_hash, tx_hash=tx_hash
         )
         db.add(new_tx)
@@ -859,4 +865,72 @@ async def refund_purchase(request: Request, account: str, item_id: str, db: Sess
     except Exception as e:
         db.rollback()
         logger.error(f"REFUND_ERROR | buyer={account} | item={item_id} | amount={refund_amount} | error={str(e)}")
-        raise HTTPException(status_code=500, detail="退款处理失败，请稍后重试")
+        raise HTTPException(status_code=500, detail="退款处理失败，请稍后重试")
+
+# ==========================================
+# 💰 管理员提现管理 API
+# ==========================================
+
+@router.get("/api/admin/withdrawals")
+async def get_admin_withdrawals(
+    status: str = None,
+    current_user: str = Depends(require_auth),
+    db: Session = Depends(get_db)
+):
+    """管理员查看提现记录列表"""
+    if not is_admin(current_user):
+        raise HTTPException(status_code=403, detail="需要管理员权限")
+    
+    query = db.query(Transaction).filter(Transaction.tx_type == "WITHDRAW")
+    if status:
+        query = query.filter(Transaction.withdraw_status == status)
+    
+    records = query.order_by(Transaction.created_at.desc()).all()
+    
+    return {
+        "status": "success",
+        "data": [{
+            "tx_id": r.tx_id,
+            "account": r.account,
+            "amount": r.amount,
+            "alipay_account": r.alipay_account,
+            "real_name": r.real_name,
+            "withdraw_status": r.withdraw_status,
+            "payment_order_id": r.payment_order_id,
+            "created_at": r.created_at.isoformat() if r.created_at else None
+        } for r in records]
+    }
+
+class CompleteWithdrawRequest(BaseModel):
+    payment_order_id: str
+
+@router.post("/api/admin/withdrawals/{tx_id}/complete")
+async def complete_withdrawal(
+    tx_id: str,
+    req: CompleteWithdrawRequest,
+    current_user: str = Depends(require_auth),
+    db: Session = Depends(get_db)
+):
+    """管理员确认打款完成"""
+    if not is_admin(current_user):
+        raise HTTPException(status_code=403, detail="需要管理员权限")
+    
+    tx = db.query(Transaction).filter(Transaction.tx_id == tx_id, Transaction.tx_type == "WITHDRAW").first()
+    if not tx:
+        raise HTTPException(status_code=404, detail="提现记录不存在")
+    if tx.withdraw_status == "completed":
+        raise HTTPException(status_code=400, detail="该提现已完成打款")
+    
+    # 更新提现状态
+    tx.withdraw_status = "completed"
+    tx.payment_order_id = req.payment_order_id
+    
+    # 解冻余额（使用 net_amount 字段，确保解冻金额与冻结时一致）
+    wallet = db.query(Wallet).filter(Wallet.account == tx.account).first()
+    if wallet:
+        net_amount = tx.net_amount if tx.net_amount is not None else abs(tx.amount)  # 优先使用 net_amount，兼容旧数据
+        wallet.frozen_balance = max(0, wallet.frozen_balance - net_amount)
+    
+    db.commit()
+    
+    return {"status": "success", "message": f"提现 {tx_id} 已确认打款完成"}