同步就提现数据

database_sql.py

@@ -162,6 +162,25 @@ def _auto_migrate_p7_fields():
                 
                 conn.commit()
                 
+                # ========== 3. 回填旧提现记录数据 ==========
+                # 将旧 WITHDRAW 记录的 withdraw_status 从 NULL 更新为 "completed"
+                result = conn.execute(text(
+                    "UPDATE transactions SET withdraw_status = 'completed' "
+                    "WHERE tx_type = 'WITHDRAW' AND withdraw_status IS NULL"
+                ))
+                if result.rowcount > 0:
+                    logger.info(f"[DB Migration] 回填旧提现记录: 更新 {result.rowcount} 条记录的 withdraw_status 为 'completed'")
+                
+                # 将旧记录的 net_amount 从 NULL 更新为 ABS(amount)
+                result = conn.execute(text(
+                    "UPDATE transactions SET net_amount = ABS(amount) "
+                    "WHERE tx_type = 'WITHDRAW' AND net_amount IS NULL"
+                ))
+                if result.rowcount > 0:
+                    logger.info(f"[DB Migration] 回填旧提现记录: 更新 {result.rowcount} 条记录的 net_amount 为 ABS(amount)")
+                
+                conn.commit()
+                
     except Exception as e:
         logger.warning(f"字段迁移跳过 (可能已存在): {e}")
 

router_wallet.py

@@ -883,7 +883,12 @@ async def get_admin_withdrawals(
     
     query = db.query(Transaction).filter(Transaction.tx_type == "WITHDRAW")
     if status:
-        query = query.filter(Transaction.withdraw_status == status)
+        # 当查询 completed 状态时，同时包含 withdraw_status == "completed" 和 withdraw_status IS NULL（兼容旧数据）
+        if status == "completed":
+            from sqlalchemy import or_
+            query = query.filter(or_(Transaction.withdraw_status == status, Transaction.withdraw_status.is_(None)))
+        else:
+            query = query.filter(Transaction.withdraw_status == status)
     
     records = query.order_by(Transaction.created_at.desc()).all()
     
@@ -893,9 +898,9 @@ async def get_admin_withdrawals(
             "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,
+            "alipay_account": r.alipay_account if r.alipay_account else "未记录",
+            "real_name": r.real_name if r.real_name else "未记录",
+            "withdraw_status": r.withdraw_status if r.withdraw_status else "completed",
             "payment_order_id": r.payment_order_id,
             "created_at": r.created_at.isoformat() if r.created_at else None
         } for r in records]