's'

app/routers/_digital_base.py

@@ -7,10 +7,9 @@ import random
 import string
 import time
 
-import requests
 from fastapi import APIRouter, Request, HTTPException
 
-from ..config import BASE_URL, ZPAY_PID, ZPAY_KEY
+from ..config import BASE_URL
 from ..payment import get_payment_provider
 from ..payment.zpay import ZPayProvider
 from ..services import handle_payment_success, processed_orders
@@ -142,27 +141,12 @@ def create_digital_router(prefix: str, project_name: str) -> APIRouter:
     async def zpay_order_status(out_trade_no: str):
         """查询 ZPAY 订单支付状态"""
         provider = get_payment_provider()
-        if provider.name != "zpay":
+        if not isinstance(provider, ZPayProvider):
             raise HTTPException(status_code=400, detail="仅 zpay 渠道支持")
-        url = f"https://zpayz.cn/api.php?act=order&pid={ZPAY_PID}&key={ZPAY_KEY}&out_trade_no={out_trade_no}"
-        try:
-            resp = requests.get(url, timeout=10)
-            result = resp.json() if resp.ok else {}
-        except Exception as e:
-            logging.warning(f"ZPAY 订单查询失败: {e}")
-            return {"paid": False, "error": str(e)}
-        try:
-            code = result.get("code", 0)
-            code = int(code) if isinstance(code, (int, float)) or str(code).isdigit() else 0
-        except (ValueError, TypeError):
-            code = 0
-        if code != 1:
-            return {"paid": False, "msg": result.get("msg", "查询失败")}
-        try:
-            status = int(result.get("status", 0))
-        except (ValueError, TypeError):
-            status = 0
-        return {"paid": status == 1, "status": status}
+        result = provider.query_order_status(out_trade_no, timeout=15)
+        if result.get("error"):
+            logging.warning(f"{project_name} ZPAY 订单查询失败: {result.get('error')}")
+        return result
 
     @router.post("/xorpay_notify")
     async def xorpay_notify(request: Request):