yml/live-hub-py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构虎牙精英宝典协议与支付状态链路

Browse Source
This commit is contained in:
yml2213
2026-09-01 11:31:15 +08:00
parent 955ba45488
commit 684e16a07a
12 changed files with 937 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/backend/services/huya_runner_recharge.py
+57 -36
View File
@@ -86,52 +86,66 @@ class RechargeMixin:
guid: str,
cookie: str,
order_id: int,
sid: int,
result: dict,
) -> tuple[str, dict | None]:
deadline = time.time() + HUYA_PAYMENT_POLL_SECONDS
order_id_text = str(order_id)
last_order = None
while not self._stop.is_set() and time.time() < deadline:
resp = client.query_user_order_list(
uid=uid,
guid=guid,
cookie=cookie,
offset=0,
page_size=10,
order_type=1,
status=0,
timeout=10.0,
detail = client.order_detail(
uid=uid, guid=guid, cookie=cookie, order_id=order_id, timeout=10.0
)
checked_at = datetime.now(UTC).isoformat()
if resp is not None and getattr(resp, "orders", None):
for order in resp.orders:
if str(getattr(order, "orderId", "")) != order_id_text:
continue
last_order = order.to_dict()
status = int(getattr(order, "orderStatus", 0) or 0)
order = getattr(detail, "order", None) if detail is not None else None
if order is not None and (
not getattr(order, "orderId", 0)
or str(getattr(order, "orderId", "")) == order_id_text
):
last_order = order.to_dict()
status = int(getattr(order, "orderStatus", 0) or 0)
result.update(
{
"payment_checked_at": checked_at,
"payment_order": last_order,
"payment_order_status": status,
"payment_order_status_label": self._huya_order_status_label(status),
}
)
if self._is_huya_order_paid(order):
result.update(
{
"payment_checked_at": checked_at,
"payment_order": last_order,
"payment_order_status": status,
"payment_order_status_label": self._huya_order_status_label(
status
),
"payment_status": "paid",
"payment_status_label": "已支付",
"payment_paid": True,
"payment_paid_at": checked_at,
}
)
if self._is_huya_order_paid(order):
result.update(
{
"payment_status": "paid",
"payment_status_label": "已支付",
"payment_paid": True,
"payment_paid_at": checked_at,
}
)
return "paid", last_order
break
return "paid", last_order
else:
result["payment_checked_at"] = checked_at
# 兼容旧 HTTP 网关不提供 orderDetailV5 的情况。
resp = client.query_user_order_list(
uid=uid, guid=guid, cookie=cookie, offset=0, page_size=10,
order_type=1, status=0, timeout=10.0,
)
for legacy_order in getattr(resp, "orders", []) if resp else []:
if str(getattr(legacy_order, "orderId", "")) != order_id_text:
continue
last_order = legacy_order.to_dict()
status = int(getattr(legacy_order, "orderStatus", 0) or 0)
result.update({
"payment_checked_at": checked_at,
"payment_order": last_order,
"payment_order_status": status,
"payment_order_status_label": self._huya_order_status_label(status),
})
if self._is_huya_order_paid(legacy_order):
result.update({
"payment_status": "paid", "payment_status_label": "已支付",
"payment_paid": True, "payment_paid_at": checked_at,
})
return "paid", last_order
result.setdefault("payment_checked_at", checked_at)
if self._stop.wait(HUYA_PAYMENT_POLL_INTERVAL):
break
@@ -260,7 +274,7 @@ class RechargeMixin:
pid=pid,
spu_id=spu_id,
sku_id=0,
game_id="0",
game_id="",
source_id=HUYA_RECHARGE_SOURCE_ID,
scene=HUYA_RECHARGE_SCENE,
)
@@ -389,7 +403,7 @@ class RechargeMixin:
pid=pid,
spu_id=spu_id,
sku_id=sku_id or 0,
game_id="0",
game_id="",
source_id=HUYA_RECHARGE_SOURCE_ID,
scene=HUYA_RECHARGE_SCENE,
)
@@ -515,11 +529,18 @@ class RechargeMixin:
guid="",
cookie=cookie,
order_id=order_resp.orderId,
sid=self._to_int(config_info.get("sid")) or 2203,
result=result,
)
account.updated_at = datetime.now(UTC)
if payment_status == "paid":
account.status = "recharge_paid"
post_score = client.query_user_score(
uid=uid, cookie=cookie, sid=self._to_int(config_info.get("sid")) or 2203
)
if post_score is not None:
result["post_payment_score"] = post_score.to_dict()
account.points = post_score.available_score
paid_message = f"支付成功: {product_name} x{count} {result['amount_text']}"
if payment_order and payment_order.get("pay_time"):
paid_message += f"，支付时间 {self._format_local_time(int(payment_order['pay_time']) // 1000)}"
@@ -534,4 +555,4 @@ class RechargeMixin:
account.status = "recharge_order_created"
timeout_message = f"{message}，{result['payment_status_label']}"
self._mark_task(worker_db, task, "success", timeout_message, result)
self._mark_task(worker_db, task, "timeout", timeout_message, result)