Upload 7 files

database_sql.py

@@ -161,7 +161,11 @@ def _auto_migrate_p7_fields():
                 
                 for col_name, col_type in new_columns.items():
                     if col_name not in columns:
-                        conn.execute(text(f"ALTER TABLE transactions ADD COLUMN {col_name} {col_type}"))
+                        # VARCHAR 类型添加 DEFAULT NULL 避免 PostgreSQL NOT NULL 冲突
+                        if col_type == 'VARCHAR':
+                            conn.execute(text(f"ALTER TABLE transactions ADD COLUMN {col_name} {col_type} DEFAULT NULL"))
+                        else:
+                            conn.execute(text(f"ALTER TABLE transactions ADD COLUMN {col_name} {col_type}"))
                         logger.info(f"[DB Migration] 添加列 transactions.{col_name}")
                 
                 conn.commit()

router_tasks.py

@@ -1091,7 +1091,7 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
     
     disputes_db = db.load_data("disputes.json", default_data=[])
     tasks_db = db.load_data("tasks.json", default_data=[])
-    users_db = db.load_data("users.json", default_data=[])
+    users_db = db.load_data("users.json", default_data={})
     
     for dispute in disputes_db:
         if dispute["id"] == dispute_id:
@@ -1106,8 +1106,8 @@ async def resolve_dispute(dispute_id: str, resolution: str, ratio: int = None, n
             total_price = task.get("total_price", 0)
             deposit = task.get("deposit_amount", 0)
             
-            publisher = next((u for u in users_db if u["account"] == dispute.get("publisher")), None)
-            assignee = next((u for u in users_db if u["account"] == dispute.get("assignee")), None)
+            publisher = users_db.get(dispute.get("publisher"))
+            assignee = users_db.get(dispute.get("assignee"))
             
             is_publisher_initiator = dispute.get("initiator_role") == "publisher"
             initiator = publisher if is_publisher_initiator else assignee

router_wallet.py

@@ -45,6 +45,22 @@ from verify_code_engine import VERIFY_CODES
 
 router = APIRouter()
 
+# ==========================================
+# 脱敏工具函数
+# ==========================================
+def _mask_alipay(account):
+    """脱敏支付宝账号"""
+    if account and len(account) >= 7:
+        return account[:3] + "****" + account[-4:]
+    return account or ""
+
+def _mask_name(name):
+    """脱敏姓名"""
+    if name and len(name) > 0:
+        return name[0] + "*" * (len(name) - 1)
+    return name or ""
+
+
 # ==========================================
 # 🚨 替换这里的支付宝初始化逻辑 🚨
 # ==========================================
@@ -577,8 +593,8 @@ async def withdraw(request: Request, req: WithdrawRequest, db: Session = Depends
         tx_hash = calculate_tx_hash(tx_id, req.account, "WITHDRAW", -actual_withdraw, prev_hash)
         
         # 脱敏支付宝账号和姓名
-        masked_alipay = req.alipayAccount[:3] + "****" + req.alipayAccount[-4:] if len(req.alipayAccount) > 7 else req.alipayAccount
-        masked_name = req.real_name[0] + "*" * (len(req.real_name) - 1) if req.real_name else ""
+        masked_alipay = _mask_alipay(req.alipayAccount)
+        masked_name = _mask_name(req.real_name)
         
         new_tx = Transaction(
             tx_id=tx_id, account=req.account, tx_type="WITHDRAW", amount=-actual_withdraw,
@@ -668,10 +684,9 @@ async def get_transactions(
         if tx.tx_type == "WITHDRAW":
             # 脱敏支付宝账号
             if tx.alipay_account:
-                a = tx.alipay_account
-                tx_data["alipay_account"] = a[:3] + "****" + a[-4:] if len(a) > 7 else a
+                tx_data["alipay_account"] = _mask_alipay(tx.alipay_account)
             if tx.real_name:
-                tx_data["real_name"] = tx.real_name[0] + "*" * (len(tx.real_name) - 1)
+                tx_data["real_name"] = _mask_name(tx.real_name)
             tx_data["withdraw_status"] = tx.withdraw_status
             tx_data["net_amount"] = tx.net_amount