Upload router_wallet.py

router_wallet.py

@@ -7,7 +7,8 @@ import hashlib
 import os
 from database_sql import get_db
 from models_sql import Wallet, Transaction, Ownership
-from models import RechargeRequest, WithdrawRequest, PurchaseRequest
+# 【修复 1】：在这里补充导入了 TipRequest，防止云端崩溃！
+from models import RechargeRequest, WithdrawRequest, PurchaseRequest, TipRequest
 import 数据库连接 as json_db
 from router_users import VERIFY_CODES
 
@@ -227,6 +228,7 @@ async def withdraw_earnings(req: WithdrawRequest, db: Session = Depends(get_db))
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"提现接口异常: {str(e)}")
 
+# 【修复 2】：去除了底部重复多余的旧代码，只保留最新正确的一个打赏接口
 @router.post("/api/wallet/tip")
 async def tip_user(req: TipRequest, db: Session = Depends(get_db)):
     """赞赏接口：处理扣费、收益及赞赏榜单记录"""
@@ -274,53 +276,4 @@ async def tip_user(req: TipRequest, db: Session = Depends(get_db)):
     db.commit()
     json_db.save_data("users.json", users_db)
 
-    return {"status": "success", "balance": sender_wallet.balance}
-
-@router.post("/api/wallet/tip")
-async def tip_user(req: TipRequest, db: Session = Depends(get_db)):
-    """赞赏接口：处理扣费、收益及赞赏榜单记录"""
-    if req.sender_account == req.target_account:
-        raise HTTPException(status_code=400, detail="不能打赏自己")
-    if req.amount <= 0:
-        raise HTTPException(status_code=400, detail="打赏金额必须大于0")
-
-    users_db = json_db.load_data("users.json", default_data={})
-    if req.target_account not in users_db:
-        raise HTTPException(status_code=404, detail="目标用户不存在")
-
-    target_user = users_db[req.target_account]
-    tips_received = target_user.get("tips_received", {})
-
-    # 计算等级额度 (10分=1星, 50分=1月, 250分=1太阳。上限9太阳=2250分)
-    current_tip = tips_received.get(req.sender_account, {}).get("amount", 0)
-    if current_tip + req.amount > 2250:
-        raise HTTPException(status_code=400, detail=f"您对该用户的打赏已达上限 (9个太阳/2250积分)，最多还能打赏 {2250 - current_tip} 积分")
-
-    # 1. 扣除打赏者余额 (悲观锁防并发)
-    sender_wallet = db.query(Wallet).filter(Wallet.account == req.sender_account).with_for_update().first()
-    if not sender_wallet or sender_wallet.balance < req.amount:
-        raise HTTPException(status_code=400, detail="积分余额不足，请先充值")
-    
-    sender_wallet.balance -= req.amount
-    record_transaction(db, req.sender_account, "TIP_SEND", -req.amount, req.target_account)
-
-    # 2. 增加作者收益
-    target_wallet = db.query(Wallet).filter(Wallet.account == req.target_account).with_for_update().first()
-    if not target_wallet:
-        target_wallet = Wallet(account=req.target_account)
-        db.add(target_wallet)
-    target_wallet.earn_balance += req.amount
-    record_transaction(db, req.target_account, "TIP_RECEIVE", req.amount, req.sender_account)
-
-    # 3. 永久记录到该用户的榜单 JSON 中
-    tips_received[req.sender_account] = {
-        "amount": current_tip + req.amount,
-        "is_anonymous": req.is_anonymous,
-        "sender_name": users_db.get(req.sender_account, {}).get("name", req.sender_account)
-    }
-    target_user["tips_received"] = tips_received
-    
-    db.commit()
-    json_db.save_data("users.json", users_db)
-
     return {"status": "success", "balance": sender_wallet.balance}