Upload 2 files

models_sql.py

@@ -11,14 +11,15 @@ class Wallet(Base):
     
     account = Column(String, primary_key=True, index=True)
     balance = Column(Integer, default=0)         # 用于消费的余额 (充值获得)
-    earn_balance = Column(Integer, default=0)    # 创作者收益余额 (别人购买获得)
+    earn_balance = Column(Integer, default=0)    # 创作者销售收益余额 (别人购买获得)
+    tip_balance = Column(Integer, default=0)     # 【新增】创作者打赏收益余额 (粉丝赞助获得)
     frozen_balance = Column(Integer, default=0)  # 提现审核冻结中的余额
     
     # 乐观锁版本号，防止并发扣款被击穿
     version = Column(Integer, default=1)
 
 class Ownership(Base):
-    """资源所有权表 (解决Req 4：一次购买，终身免费)"""
+    """资源所有权表"""
     __tablename__ = "ownerships"
     
     id = Column(Integer, primary_key=True, autoincrement=True)
@@ -27,17 +28,14 @@ class Ownership(Base):
     purchased_at = Column(DateTime, default=datetime.datetime.utcnow)
 
 class Transaction(Base):
-    """交易流水表 (复式记账，解决Req 6, 7：税务对账与哈希防篡改)"""
+    """交易流水表"""
     __tablename__ = "transactions"
     
-    tx_id = Column(String, primary_key=True)  # 全局唯一流水号 (如 ORDER_uuid)
+    tx_id = Column(String, primary_key=True)
     account = Column(String, index=True)
-    tx_type = Column(String)                  # RECHARGE, CONSUME, EARN, WITHDRAW
-    amount = Column(Integer)                  # 交易额 (正负值)
-    target_id = Column(String, nullable=True) # 关联的 item_id 或第三方支付宝流水号
-    
-    # 区块链级安全：哈希防篡改链
-    prev_hash = Column(String, nullable=True) # 上一笔交易的哈希值
-    tx_hash = Column(String)                  # 当前交易哈希值
-    
+    tx_type = Column(String)                  
+    amount = Column(Integer)                  
+    target_id = Column(String, nullable=True) 
+    prev_hash = Column(String, nullable=True) 
+    tx_hash = Column(String)                  
     created_at = Column(DateTime, default=datetime.datetime.utcnow)

router_wallet.py

@@ -7,16 +7,12 @@ import hashlib
 import os
 from database_sql import get_db
 from models_sql import Wallet, Transaction, Ownership
-# 【修复 1】：在这里补充导入了 TipRequest，防止云端崩溃！
 from models import RechargeRequest, WithdrawRequest, PurchaseRequest, TipRequest
 import 数据库连接 as json_db
 from router_users import VERIFY_CODES
 
 router = APIRouter()
 
-# =======================================================
-# 🏦 支付宝 SDK 初始化 (带防崩溃保护)
-# =======================================================
 try:
     from alipay import AliPay
     from alipay.utils import AliPayConfig
@@ -26,159 +22,110 @@ try:
         app_private_key_string=os.environ.get("ALIPAY_PRIVATE_KEY", "").replace("\\n", "\n"),
         alipay_public_key_string=os.environ.get("ALIPAY_PUBLIC_KEY", "").replace("\\n", "\n"),
         sign_type="RSA2",
-        debug=False, # 生产环境设为 False
+        debug=False,
         config=AliPayConfig(timeout=15)
     )
 except Exception as e:
     alipay = None
-    print("⚠️ 支付宝 SDK 初始化跳过 (环境变量未配置，处于开发模式):", e)
-
 
 def calculate_tx_hash(tx_id, account, tx_type, amount, prev_hash):
-    """计算哈希值：依赖前一笔订单的哈希，实现链式防篡改"""
     data = f"{tx_id}{account}{tx_type}{amount}{prev_hash}"
     return hashlib.sha256(data.encode()).hexdigest()
 
 def record_transaction(db: Session, account: str, tx_type: str, amount: int, target_id: str = None):
-    """安全记录交易流水"""
     last_tx = db.query(Transaction).filter(Transaction.account == account).order_by(Transaction.created_at.desc()).first()
     prev_hash = last_tx.tx_hash if last_tx else "GENESIS"
-    
     tx_id = f"TX_{int(time.time())}_{uuid.uuid4().hex[:8]}"
     tx_hash = calculate_tx_hash(tx_id, account, tx_type, amount, prev_hash)
-    
     new_tx = Transaction(tx_id=tx_id, account=account, tx_type=tx_type, amount=amount, target_id=target_id, prev_hash=prev_hash, tx_hash=tx_hash)
     db.add(new_tx)
     return new_tx
 
-# =======================================================
-# 💰 充值入金链路 (真实预下单 -> 扫码 -> 异步回调 -> 查单)
-# =======================================================
+@router.get("/api/wallet/{account}")
+async def get_wallet(account: str, db: Session = Depends(get_db)):
+    """【新增】获取用户真实的金融余额数据"""
+    wallet = db.query(Wallet).filter(Wallet.account == account).first()
+    if not wallet:
+        return {"balance": 0, "earn_balance": 0, "tip_balance": 0, "frozen_balance": 0}
+    return {
+        "balance": wallet.balance,
+        "earn_balance": wallet.earn_balance,
+        "tip_balance": getattr(wallet, 'tip_balance', 0), 
+        "frozen_balance": wallet.frozen_balance
+    }
 
 @router.post("/api/wallet/create_recharge_order")
 async def create_recharge_order(req: RechargeRequest, db: Session = Depends(get_db)):
-    """生成真实的支付宝当面付二维码"""
-    if not alipay:
-        raise HTTPException(status_code=500, detail="后台未配置支付密钥，暂不支持真实付款")
-
-    # 1. 使用 target_id 存储订单状态 "PENDING"，不影响哈希校验
+    if not alipay: raise HTTPException(status_code=500, detail="后台未配置支付密钥")
     tx = record_transaction(db, req.account, "RECHARGE", req.amount, "PENDING")
     out_trade_no = tx.tx_id
     db.commit()
-
     try:
-        # 2. 向支付宝发起真实预下单
-        result = alipay.api_alipay_trade_precreate(
-            subject=f"ComfyUI社区精选 - 充值 {req.amount} 积分",
-            out_trade_no=out_trade_no,
-            total_amount=str(req.amount),
-        )
-        if result.get("code") == "10000":
-            return {"status": "success", "order_id": out_trade_no, "qr_code_url": result.get("qr_code")}
-        else:
-            raise HTTPException(status_code=500, detail=f"生成支付码失败: {result.get('msg')}")
+        result = alipay.api_alipay_trade_precreate(subject=f"充值 {req.amount} 积分", out_trade_no=out_trade_no, total_amount=str(req.amount))
+        if result.get("code") == "10000": return {"status": "success", "order_id": out_trade_no, "qr_code_url": result.get("qr_code")}
+        else: raise HTTPException(status_code=500, detail=f"生成支付码失败: {result.get('msg')}")
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"支付接口异常: {str(e)}")
 
 @router.post("/api/wallet/alipay_notify")
 async def alipay_notify(request: Request, db: Session = Depends(get_db)):
-    """🚨 核心：接收支付宝付款成功的异步回调，验签并加钱"""
     data = dict(await request.form())
     signature = data.pop("sign", None)
-
-    if not alipay or not signature:
-        return "fail"
-
-    # 1. 严格验签，防伪造
-    success = alipay.verify(data, signature)
-    if success and data.get("trade_status") in ("TRADE_SUCCESS", "TRADE_FINISHED"):
+    if not alipay or not signature: return "fail"
+    if alipay.verify(data, signature) and data.get("trade_status") in ("TRADE_SUCCESS", "TRADE_FINISHED"):
         out_trade_no = data.get("out_trade_no")
         total_amount = float(data.get("total_amount", 0))
-
-        # 2. 悲观锁查询该笔 PENDING 订单，防并发重复加款
         tx = db.query(Transaction).filter(Transaction.tx_id == out_trade_no).with_for_update().first()
-        if not tx or tx.target_id == "SUCCESS":
-            return "success" # 已经处理过，直接返回成功让支付宝停止轰炸
-
-        if tx.amount != int(total_amount):
-            return "fail" # 金额对不上，拦截黑客攻击
-
-        # 3. 安全加款
+        if not tx or tx.target_id == "SUCCESS": return "success"
+        if tx.amount != int(total_amount): return "fail"
         wallet = db.query(Wallet).filter(Wallet.account == tx.account).with_for_update().first()
         if not wallet:
             wallet = Wallet(account=tx.account)
             db.add(wallet)
-
         wallet.balance += tx.amount
-        tx.target_id = "SUCCESS" # 将流水标记为已完成
+        tx.target_id = "SUCCESS" 
         db.commit()
-
-        return "success" # 必须返回纯文本 success 给支付宝
+        return "success" 
     return "fail"
 
 @router.get("/api/wallet/check_order/{order_id}")
 async def check_order(order_id: str, db: Session = Depends(get_db)):
-    """前端轮询查单接口"""
     tx = db.query(Transaction).filter(Transaction.tx_id == order_id).first()
-    if not tx:
-        raise HTTPException(status_code=404, detail="订单不存在")
-    return {"status": tx.target_id} # 返回 PENDING 或 SUCCESS
-
-
-# =======================================================
-# 🛒 消费闭环链路
-# =======================================================
+    if not tx: raise HTTPException(status_code=404, detail="订单不存在")
+    return {"status": tx.target_id}
 
 @router.post("/api/wallet/purchase")
 async def purchase_item(req: PurchaseRequest, db: Session = Depends(get_db)):
-    """消费购买接口：严密的并发防刷控制，以及早鸟保护机制"""
     items_db = json_db.load_data("items.json", default_data=[])
     item = next((i for i in items_db if i["id"] == req.item_id), None)
     if not item: raise HTTPException(status_code=404, detail="商品不存在")
-    
     price = int(item.get("price", 0))
     author = item.get("author")
-    
     owned = db.query(Ownership).filter(Ownership.account == req.account, Ownership.item_id == req.item_id).first()
-    if owned: 
-        return {"status": "success", "message": "已永久授权，无需重复扣费", "already_owned": True}
-    
+    if owned: return {"status": "success", "message": "已永久授权", "already_owned": True}
     if price <= 0 or req.account == author:
-        new_owner = Ownership(account=req.account, item_id=req.item_id)
-        db.add(new_owner)
+        db.add(Ownership(account=req.account, item_id=req.item_id))
         record_transaction(db, req.account, "CONSUME", 0, req.item_id)
         db.commit()
-        return {"status": "success", "message": "免费商品或创作者本人，已永久授权", "already_owned": True}
+        return {"status": "success", "message": "免费获取", "already_owned": True}
         
     buyer_wallet = db.query(Wallet).filter(Wallet.account == req.account).with_for_update().first()
-    if not buyer_wallet or buyer_wallet.balance < price:
-        raise HTTPException(status_code=400, detail="余额不足")
-        
+    if not buyer_wallet or buyer_wallet.balance < price: raise HTTPException(status_code=400, detail="余额不足")
     buyer_wallet.balance -= price
     record_transaction(db, req.account, "CONSUME", -price, req.item_id)
-    
-    new_owner = Ownership(account=req.account, item_id=req.item_id)
-    db.add(new_owner)
+    db.add(Ownership(account=req.account, item_id=req.item_id))
     
     author_wallet = db.query(Wallet).filter(Wallet.account == author).with_for_update().first()
     if not author_wallet:
         author_wallet = Wallet(account=author)
         db.add(author_wallet)
-        
     author_wallet.earn_balance += price
     record_transaction(db, author, "EARN", price, req.item_id)
-    
     db.commit()
     return {"status": "success", "already_owned": False}
 
-
-# =======================================================
-# 💸 提现出金链路 (引入支付宝自动单笔打款)
-# =======================================================
-
 @router.post("/api/wallet/withdraw")
 async def withdraw_earnings(req: WithdrawRequest, db: Session = Depends(get_db)):
-    """提现接口"""
     users_db = json_db.load_data("users.json", default_data={})
     user = users_db.get(req.account)
     if not user: raise HTTPException(status_code=404, detail="账号异常")
@@ -189,67 +136,59 @@ async def withdraw_earnings(req: WithdrawRequest, db: Session = Depends(get_db))
         raise HTTPException(status_code=400, detail="验证码不正确或已过期")
         
     wallet = db.query(Wallet).filter(Wallet.account == req.account).with_for_update().first()
-    if not wallet or wallet.earn_balance < req.amount:
-        raise HTTPException(status_code=400, detail="可提现收益不足")
-        
-    if req.amount < 100:
-        raise HTTPException(status_code=400, detail="最低提现金额为 100 积分")
-        
-    if not alipay:
-        # 降级模式：如果没配置真实支付，仅记录冻结流水，需人工审核打款
+    if not wallet: raise HTTPException(status_code=400, detail="钱包不存在")
+    
+    # 【核心修改】：合并计算可提现金额，但分别扣除以确保账目清晰
+    tip_bal = getattr(wallet, 'tip_balance', 0)
+    total_withdrawable = wallet.earn_balance + tip_bal
+    
+    if total_withdrawable < req.amount: raise HTTPException(status_code=400, detail="可提现收益不足")
+    if req.amount < 100: raise HTTPException(status_code=400, detail="最低提现金额为 100 积分")
+    
+    if wallet.earn_balance >= req.amount:
         wallet.earn_balance -= req.amount
+    else:
+        remaining = req.amount - wallet.earn_balance
+        wallet.earn_balance = 0
+        wallet.tip_balance -= remaining
+
+    if not alipay:
         wallet.frozen_balance += req.amount
         record_transaction(db, req.account, "WITHDRAW_FREEZE", -req.amount, req.alipay_account)
         VERIFY_CODES.pop(cache_key, None)
         db.commit()
-        return {"status": "success", "earn_balance": wallet.earn_balance, "message": "提现申请已提交 (暂为开发模式，已冻结)"}
+        return {"status": "success", "earn_balance": wallet.earn_balance, "tip_balance": wallet.tip_balance, "message": "提现申请已提交 (暂为开发模式)"}
 
-    # 真实企业级模式：直接调用支付宝单笔转账接口打款到用户余额
     out_biz_no = f"WD_{int(time.time())}_{uuid.uuid4().hex[:6]}"
     try:
         result = alipay.api_alipay_fund_trans_toaccount_transfer(
-            out_biz_no=out_biz_no,
-            payee_type="ALIPAY_LOGONID",
-            payee_account=req.alipay_account,
-            amount=str(req.amount),
-            payee_real_name=req.real_name,
-            remark="ComfyUI社区精选创作者收益提现"
+            out_biz_no=out_biz_no, payee_type="ALIPAY_LOGONID", payee_account=req.alipay_account,
+            amount=str(req.amount), payee_real_name=req.real_name, remark="收益提现"
         )
-        
         if result.get("code") == "10000":
-            # 打款秒成功，彻底扣除可提现收益
-            wallet.earn_balance -= req.amount
             record_transaction(db, req.account, "WITHDRAW", -req.amount, req.alipay_account)
             VERIFY_CODES.pop(cache_key, None)
             db.commit()
-            return {"status": "success", "earn_balance": wallet.earn_balance, "message": "打款已秒到账您的支付宝！"}
+            return {"status": "success", "earn_balance": wallet.earn_balance, "tip_balance": wallet.tip_balance, "message": "打款已秒到账！"}
         else:
             raise HTTPException(status_code=400, detail=f"打款风控拦截: {result.get('sub_msg')}")
     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)):
-    """赞赏接口：处理扣费、收益及赞赏榜单记录"""
-    if req.sender_account == req.target_account:
-        raise HTTPException(status_code=400, detail="不能打赏自己")
-    if req.amount <= 0:
-        raise HTTPException(status_code=400, detail="打赏金额必须大于0")
+    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="目标用户不存在")
-
+    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", {})
 
-    # 计算等级额度 (100分=1星, 500分=1月, 2500分=1太阳。上限9太阳=22500分)
     current_tip = tips_received.get(req.sender_account, {}).get("amount", 0)
     if current_tip + req.amount > 22500:
         raise HTTPException(status_code=400, detail=f"您对该用户的打赏已达上限 (9个太阳/22500积分)，最多还能打赏 {22500 - 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="积分余额不足，请先充值")
@@ -257,22 +196,25 @@ async def tip_user(req: TipRequest, db: Session = Depends(get_db)):
     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
+        
+    # 【核心修改】：打赏金额独立进入 tip_balance 账目
+    if hasattr(target_wallet, 'tip_balance'):
+        target_wallet.tip_balance += req.amount
+    else:
+        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)