Upload router_wallet.py

router_wallet.py

@@ -929,13 +929,11 @@ async def refund_purchase(request: Request, account: str, item_id: str, db: Sess
         seller_wallet = db.query(Wallet).filter(Wallet.account == seller_account).with_for_update().first()
         
         if seller_wallet:
+            # 先检查余额是否充足，再扣款
+            if seller_wallet.balance < refund_amount:
+                raise HTTPException(status_code=400, detail="卖家余额不足，无法处理退款")
             seller_wallet.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           # 买家退款
@@ -1071,7 +1069,19 @@ async def complete_withdrawal(
     # 解冻余额（使用 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，兼容旧数据
+        if tx.net_amount is not None:
+            net_amount = tx.net_amount
+        else:
+            # 历史数据兼容：查找关联手续费交易
+            fee_tx = db.query(Transaction).filter(
+                Transaction.account == tx.account,
+                Transaction.tx_type == "WITHDRAW_FEE",
+                Transaction.created_at >= tx.created_at - datetime.timedelta(seconds=5),
+                Transaction.created_at <= tx.created_at + datetime.timedelta(seconds=5)
+            ).first()
+            fee_amount = abs(fee_tx.amount) if fee_tx else 0
+            net_amount = abs(tx.amount) - fee_amount
+            logger.warning(f"WITHDRAW net_amount为NULL，已计算恢复: tx_id={tx.tx_id}, net={net_amount}, fee={fee_amount}")
         wallet.frozen_balance = max(0, wallet.frozen_balance - net_amount)
     
     db.commit()