Upload 4 files

database_sql.py

@@ -141,7 +141,21 @@ def _auto_migrate_p7_fields():
                 
                 conn.commit()
         
-        # ========== 2. 迁移 transactions 表（提现相关新字段） ==========
+        # ========== 2. 迁移 wallets 表（新增 task_balance 字段） ==========
+        if 'wallets' in inspector.get_table_names():
+            columns = [col['name'] for col in inspector.get_columns('wallets')]
+            
+            with engine.connect() as conn:
+                if 'task_balance' not in columns:
+                    if 'sqlite' in SQLALCHEMY_DATABASE_URL:
+                        conn.execute(text("ALTER TABLE wallets ADD COLUMN task_balance INTEGER DEFAULT 0"))
+                    else:
+                        conn.execute(text("ALTER TABLE wallets ADD COLUMN task_balance INTEGER DEFAULT 0"))
+                    logger.info("[DB Migration] 添加列 wallets.task_balance")
+                
+                conn.commit()
+        
+        # ========== 3. 迁移 transactions 表（提现相关新字段） ==========
         if 'transactions' in inspector.get_table_names():
             columns = [col['name'] for col in inspector.get_columns('transactions')]
             
@@ -170,7 +184,7 @@ def _auto_migrate_p7_fields():
                 
                 conn.commit()
                 
-                # ========== 3. 回填旧提现记录数据 ==========
+                # ========== 4. 回填旧提现记录数据 ==========
                 # 将旧 WITHDRAW 记录的 withdraw_status 从 NULL 更新为 "completed"
                 result = conn.execute(text(
                     "UPDATE transactions SET withdraw_status = 'completed' "

models_sql.py

@@ -19,6 +19,7 @@ class Wallet(Base):
     balance = Column(Integer, default=0, nullable=False)         # 用于消费的余额 (充值获得)
     earn_balance = Column(Integer, default=0, nullable=False)    # 创作者销售收益余额 (别人购买获得)
     tip_balance = Column(Integer, default=0, nullable=False)     # 【新增】创作者打赏收益余额 (粉丝赞助获得)
+    task_balance = Column(Integer, default=0, nullable=False)    # 【新增】任务相关余额
     frozen_balance = Column(Integer, default=0, nullable=False)  # 提现审核冻结中的余额
     
     # 乐观锁版本号，防止并发扣款被击穿

router_tasks.py

@@ -806,7 +806,7 @@ async def accept_task(task_id: str, is_accepted: bool, feedback: str = None, cur
                         db_session.flush()
                     
                     assignee_wallet.balance += total_price  # 全款进入可用余额
-                    assignee_wallet.earn_balance += total_price     # 累计任务收益统计（只增不减）
+                    assignee_wallet.task_balance += total_price     # 累计任务收益统计（只增不减）
                     
                     # 获取双方用户名
                     users_db = db.load_data("users.json", default_data={})
@@ -1159,7 +1159,7 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
                         publisher_wallet.frozen_balance = max(0, publisher_wallet.frozen_balance - remaining)
                         # 接单者获得全款
                         assignee_wallet.balance += total_price
-                        assignee_wallet.earn_balance += total_price
+                        assignee_wallet.task_balance += total_price
                         
                         # 记录交易
                         create_task_transaction(
@@ -1186,7 +1186,7 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
                         publisher_wallet.frozen_balance = max(0, publisher_wallet.frozen_balance - remaining)
                         # 接单者获得全款
                         assignee_wallet.balance += total_price
-                        assignee_wallet.earn_balance += total_price
+                        assignee_wallet.task_balance += total_price
                         
                         # 记录交易
                         create_task_transaction(
@@ -1240,7 +1240,7 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
                     # 分配资金
                     publisher_wallet.balance += pub_refund
                     assignee_wallet.balance += assignee_earn
-                    assignee_wallet.earn_balance += assignee_earn
+                    assignee_wallet.task_balance += assignee_earn
                     
                     # 记录交易
                     create_task_transaction(

router_wallet.py

@@ -37,6 +37,9 @@ REFUND_WINDOW_HOURS = 24
 # 🔄 P7后悔模式：退款后30天禁购
 REFUND_BAN_DAYS = 30
 
+# 💰 系统手续费账户
+SYSTEM_FEE_ACCOUNT = "system_fee_account"
+
 # 📝 P2优化：审计日志
 logger = logging.getLogger("ComfyUI-Ranking.Wallet")
 
@@ -253,13 +256,14 @@ async def get_wallet(account: str, db: Session = Depends(get_db)):
     total_withdrawn = abs(total_withdrawn)  # 提现金额是负数
     
     if not wallet: 
-        return {"status": "success", "balance": 0, "earn_balance": 0, "tip_balance": 0, "frozen_balance": 0, "total_withdrawn": total_withdrawn}
+        return {"status": "success", "balance": 0, "earn_balance": 0, "tip_balance": 0, "task_balance": 0, "frozen_balance": 0, "total_withdrawn": total_withdrawn}
         
     return {
         "status": "success", 
         "balance": wallet.balance, 
         "earn_balance": wallet.earn_balance, 
         "tip_balance": wallet.tip_balance, 
+        "task_balance": wallet.task_balance or 0,
         "frozen_balance": wallet.frozen_balance,
         "total_withdrawn": total_withdrawn  # 暴露给前端
     }
@@ -624,6 +628,15 @@ async def withdraw(request: Request, req: WithdrawRequest, db: Session = Depends
         wallet.balance -= actual_withdraw  # 直接从统一余额扣除
         wallet.frozen_balance += net_amount  # 冻结的是到账金额，非手续费部分
         
+        # 💰 手续费转入系统账户
+        if fee_amount > 0:
+            sys_wallet = db.query(Wallet).filter(Wallet.account == SYSTEM_FEE_ACCOUNT).with_for_update().first()
+            if not sys_wallet:
+                sys_wallet = Wallet(account=SYSTEM_FEE_ACCOUNT, balance=0, earn_balance=0, tip_balance=0, task_balance=0, frozen_balance=0)
+                db.add(sys_wallet)
+                db.flush()
+            sys_wallet.balance += fee_amount
+        
         tx_id = f"WD_{int(time.time())}_{uuid.uuid4().hex[:6]}"
         last_tx = db.query(Transaction).filter(Transaction.account == req.account).order_by(Transaction.created_at.desc()).first()
         prev_hash = last_tx.tx_hash if last_tx else "GENESIS_HASH"
@@ -917,7 +930,12 @@ async def refund_purchase(request: Request, account: str, item_id: str, db: Sess
         
         if seller_wallet:
             seller_wallet.balance -= refund_amount          # 卖家扣回
-            seller_wallet.earn_balance = max(0, seller_wallet.earn_balance - refund_amount)     # 累计统计回退（防止负数）
+            # 不修改 earn_balance（保持"累计销售收益只增不减"语义）
+            
+            # P1 退款负数保护
+            if seller_wallet.balance < 0:
+                db.rollback()
+                raise HTTPException(status_code=400, detail="卖家余额不足，无法处理退款")
         
         if buyer_wallet:
             buyer_wallet.balance += refund_amount           # 买家退款