修复虎牙宝典开通中状态与支付监听异常
This commit is contained in:
@@ -39,6 +39,12 @@ ELITE_HANDBOOK_SPU_IDS = frozenset(
|
||||
ELITE_HANDBOOK_NAME_KEYWORD = "精英宝典"
|
||||
ELITE_ORDER_PAGE_SIZE = 20
|
||||
ELITE_ORDER_MAX_PAGES = 3
|
||||
# 已支付但 redeem 还没翻成已开通时,在这个窗口内视为「开通中」而不是「未开通」。
|
||||
ELITE_OPENING_WINDOW_MS = 24 * 60 * 60 * 1000
|
||||
# 官方订单状态:10=待支付、1000=尾款待支付;90=已取消。
|
||||
ELITE_PENDING_ORDER_STATUSES = frozenset({10, 1000})
|
||||
ELITE_CANCELLED_ORDER_STATUSES = frozenset({90, 1001})
|
||||
ELITE_PAID_ORDER_STATUSES = frozenset({20, 30, 40, 50, 55, 60, 70, 80})
|
||||
# 赛季(福利季)节点的毫秒时间戳下限:2001-09 之后的值才认
|
||||
ELITE_SEASON_MS_FLOOR = 1_000_000_000_000
|
||||
|
||||
@@ -126,6 +132,79 @@ class EliteMixin:
|
||||
offset += len(orders)
|
||||
return latest or None
|
||||
|
||||
def _latest_elite_order(self, client: Any, uid: int, cookie: str) -> dict | None:
|
||||
"""最近一张宝典订单(不要求已支付),用于识别开通中/待支付/已取消。"""
|
||||
latest: dict | None = None
|
||||
latest_key = -1
|
||||
offset = 0
|
||||
for _page in range(ELITE_ORDER_MAX_PAGES):
|
||||
resp = client.query_user_order_list(
|
||||
uid=uid,
|
||||
guid="",
|
||||
cookie=cookie,
|
||||
offset=offset,
|
||||
page_size=ELITE_ORDER_PAGE_SIZE,
|
||||
order_type=1,
|
||||
status=0,
|
||||
)
|
||||
if resp is None:
|
||||
break
|
||||
orders = list(getattr(resp, "orders", None) or [])
|
||||
for order in orders:
|
||||
item = order.to_dict() if hasattr(order, "to_dict") else dict(order)
|
||||
if not self._is_elite_order(item):
|
||||
continue
|
||||
key = int(item.get("create_time") or 0)
|
||||
if key >= latest_key:
|
||||
latest = item
|
||||
latest_key = key
|
||||
total = self._to_int(getattr(resp, "totalCount", 0))
|
||||
if len(orders) < ELITE_ORDER_PAGE_SIZE or offset + len(orders) >= total:
|
||||
break
|
||||
offset += len(orders)
|
||||
return latest
|
||||
|
||||
@staticmethod
|
||||
def _elite_order_state(
|
||||
order: dict | None, *, opened: bool | None, now_ms: int | None = None
|
||||
) -> dict[str, Any]:
|
||||
"""把「redeem 开通位 + 最近订单」解释成可展示状态。
|
||||
|
||||
订单状态 10 是待支付,不代表开通中;只有已支付/有 pay_time 且权益尚未到账,
|
||||
才归为「开通中」。超出交付窗口后仍没开通,不再继续误导成开通中。
|
||||
"""
|
||||
if opened is True:
|
||||
return {"status": "opened", "label": "已开通"}
|
||||
if not order:
|
||||
return {"status": "unopened", "label": "未开通"}
|
||||
|
||||
status = int(order.get("order_status") or 0)
|
||||
pay_time = int(order.get("pay_time") or 0)
|
||||
current_ms = int(now_ms if now_ms is not None else time.time() * 1000)
|
||||
paid = pay_time > 0 or status in ELITE_PAID_ORDER_STATUSES
|
||||
observed_ms = pay_time or int(order.get("create_time") or 0)
|
||||
if paid and (
|
||||
observed_ms <= 0 or current_ms - observed_ms <= ELITE_OPENING_WINDOW_MS
|
||||
):
|
||||
return {
|
||||
"status": "opening",
|
||||
"label": "开通中",
|
||||
"order": order,
|
||||
}
|
||||
if status in ELITE_PENDING_ORDER_STATUSES:
|
||||
return {
|
||||
"status": "pending_payment",
|
||||
"label": "待支付",
|
||||
"order": order,
|
||||
}
|
||||
if status in ELITE_CANCELLED_ORDER_STATUSES:
|
||||
return {
|
||||
"status": "cancelled",
|
||||
"label": "订单已取消",
|
||||
"order": order,
|
||||
}
|
||||
return {"status": "unopened", "label": "未开通", "order": order}
|
||||
|
||||
@classmethod
|
||||
def _walk_season_nodes(cls, node: Any, found: list[dict]) -> None:
|
||||
"""递归找「赛季」节点:同时带 tag10/tag11 毫秒起止时间的结构。"""
|
||||
@@ -210,9 +289,38 @@ class EliteMixin:
|
||||
if redeem is not None and getattr(redeem, "code", 0) == 200:
|
||||
state["redeem"] = redeem.to_dict()
|
||||
state["redeem_points"] = self._to_int(redeem.value("tag2"))
|
||||
latest_order = self._latest_elite_order(client, uid, cookie)
|
||||
elite_state = self._elite_order_state(
|
||||
latest_order,
|
||||
opened=opened,
|
||||
now_ms=pay_time_ms,
|
||||
)
|
||||
if latest_order:
|
||||
state["elite_order"] = latest_order
|
||||
|
||||
def mark_opening() -> None:
|
||||
state.update(
|
||||
{
|
||||
"elite_opened": None,
|
||||
"elite_opening": True,
|
||||
"elite_status": "opening",
|
||||
"elite_status_label": "开通中",
|
||||
}
|
||||
)
|
||||
if pay_time_ms:
|
||||
state["elite_order_paid_time"] = int(pay_time_ms) // 1000
|
||||
|
||||
if opened is None:
|
||||
if pay_time_ms or elite_state["status"] == "opening":
|
||||
mark_opening()
|
||||
return state
|
||||
|
||||
if not opened:
|
||||
opening = bool(pay_time_ms) or elite_state["status"] == "opening"
|
||||
if opening:
|
||||
mark_opening()
|
||||
return state
|
||||
|
||||
open_time: int | None = pay_time_ms or None
|
||||
if opened and not open_time:
|
||||
open_time = self._resolve_elite_open_time(client, uid, cookie)
|
||||
@@ -220,10 +328,17 @@ class EliteMixin:
|
||||
expire_time = self._to_int(season["end_ms"]) if season else None
|
||||
self._apply_elite_state(account, opened, open_time, expire_time)
|
||||
|
||||
state["elite_opened"] = opened
|
||||
state["elite_open_time"] = (open_time // 1000) if open_time else None
|
||||
state["elite_open_time_text"] = (
|
||||
self._format_local_time(open_time // 1000) if open_time else ""
|
||||
state.update(
|
||||
{
|
||||
"elite_opened": opened,
|
||||
"elite_opening": False,
|
||||
"elite_status": elite_state["status"],
|
||||
"elite_status_label": elite_state["label"],
|
||||
"elite_open_time": (open_time // 1000) if open_time else None,
|
||||
"elite_open_time_text": (
|
||||
self._format_local_time(open_time // 1000) if open_time else ""
|
||||
),
|
||||
}
|
||||
)
|
||||
if season:
|
||||
state["elite_season"] = season
|
||||
@@ -379,17 +494,32 @@ class EliteMixin:
|
||||
)
|
||||
message_parts.append(f"积分 {points}")
|
||||
|
||||
latest_order = (
|
||||
self._latest_elite_order(shop_client, uid, cookie)
|
||||
if opened is not None
|
||||
else None
|
||||
)
|
||||
elite_state = self._elite_order_state(latest_order, opened=opened)
|
||||
open_time: int | None = None
|
||||
if opened:
|
||||
# 已开通才去翻订单:既省一次请求,也避免给未开通账号显示旧订单时间
|
||||
open_time = self._resolve_elite_open_time(shop_client, uid, cookie)
|
||||
season = (
|
||||
self._resolve_elite_season(shop_client, uid, cookie) if opened else None
|
||||
)
|
||||
expire_time = self._to_int(season["end_ms"]) if season else None
|
||||
if opened is not None:
|
||||
self._apply_elite_state(account, opened, open_time, expire_time)
|
||||
result["elite_opened"] = opened
|
||||
opening = elite_state["status"] == "opening"
|
||||
if not opening:
|
||||
self._apply_elite_state(account, opened, open_time, expire_time)
|
||||
result["elite_opened"] = None if opening else opened
|
||||
result["elite_opening"] = opening
|
||||
result["elite_status"] = elite_state["status"]
|
||||
result["elite_status_label"] = elite_state["label"]
|
||||
if latest_order:
|
||||
result["elite_order"] = latest_order
|
||||
paid_at = int(latest_order.get("pay_time") or 0)
|
||||
if paid_at:
|
||||
result["elite_order_paid_time"] = paid_at // 1000
|
||||
result["elite_open_time"] = (open_time // 1000) if open_time else None
|
||||
result["elite_open_time_text"] = (
|
||||
self._format_local_time(open_time // 1000) if open_time else ""
|
||||
@@ -408,8 +538,21 @@ class EliteMixin:
|
||||
opened_text += (
|
||||
f",有效期至 {self._format_local_time(expire_time // 1000)}"
|
||||
)
|
||||
elif opening:
|
||||
order_id = (latest_order or {}).get("order_id") or ""
|
||||
opened_text = "开通中宝典"
|
||||
if order_id:
|
||||
opened_text += f"(订单 #{order_id},等待权益到账)"
|
||||
else:
|
||||
opened_text = "未开通宝典"
|
||||
order_id = (latest_order or {}).get("order_id") or ""
|
||||
if elite_state["status"] == "pending_payment":
|
||||
opened_text = (
|
||||
f"宝典订单 #{order_id} 待支付" if order_id else "宝典待支付"
|
||||
)
|
||||
elif elite_state["status"] == "cancelled":
|
||||
opened_text = "未开通宝典(最近订单已取消)"
|
||||
else:
|
||||
opened_text = "未开通宝典"
|
||||
message_parts.append(opened_text)
|
||||
|
||||
account.points = points if points is not None else account.points
|
||||
|
||||
Reference in New Issue
Block a user