feat(huya): 开通支付码支持多选批量 + 支付后自动确认开通
多选账号点「生成开通支付码」以前只有弹窗里最后一个码能被看到(每个账号一个 任务,前端只留一个 qrTask),实际只能一个账号一个账号地开。 - 前端:支付码弹窗改成列表 —— 一次列出该批次所有账号的二维码(账号/UID/ 商品金额/状态),未支付的排前面,可逐个扫也可一起扫;行点击也会打开对应批次 - 支付成功后自动确认开通:新增 EliteMixin._refresh_elite_open_after_payment, 交付有几秒延迟,tag5 还没翻成 1 时重试(默认 4 次 × 3 秒),顺带取最新积分, 并把 elite_opened/elite_open_time/elite_expire_time 写回账号 - 已支付或已开通的账号二维码自动从弹窗收起,只留一行「已开通」标签 - 开通时间优先用支付回调里的支付时间(比再去翻订单更准,也少一次请求) - 补 3 条测试:重试到已开通、重试到上限、支付成功后任务结果与账号字段齐全 全量 746 passed / 6 skipped,前端 tsc 通过
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
from datetime import UTC, datetime
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
@@ -168,6 +169,62 @@ class EliteMixin:
|
||||
return None
|
||||
return self._extract_elite_season(getattr(resp, "payload", None))
|
||||
|
||||
def _refresh_elite_open_after_payment(
|
||||
self,
|
||||
client: Any,
|
||||
account: HuyaAccount,
|
||||
uid: int,
|
||||
cookie: str,
|
||||
*,
|
||||
goods_num: int,
|
||||
pay_time_ms: int | None = None,
|
||||
attempts: int = 4,
|
||||
interval: float = 3.0,
|
||||
) -> dict:
|
||||
"""支付完成后确认宝典是否已开通,并写回账号。
|
||||
|
||||
交付有几秒延迟,所以 ``tag5`` 还没翻成 1 时会重试(默认 4 次 × 3 秒)。
|
||||
返回可直接并入任务结果的 dict(含 ``redeem_points``,省掉一次重复查询)。
|
||||
"""
|
||||
redeem = None
|
||||
opened: bool | None = None
|
||||
total = max(1, attempts)
|
||||
for index in range(total):
|
||||
redeem = client.get_redeem_need_goods(
|
||||
uid=uid, guid="", cookie=cookie, goods_num=int(goods_num or 0)
|
||||
)
|
||||
opened = self._elite_opened_from_redeem(redeem)
|
||||
if opened or index == total - 1:
|
||||
break
|
||||
time.sleep(interval)
|
||||
|
||||
state: dict[str, Any] = {"elite_checked_at": datetime.now(UTC).isoformat()}
|
||||
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"))
|
||||
if opened is None:
|
||||
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)
|
||||
season = self._resolve_elite_season(client, uid, cookie) if opened else None
|
||||
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 ""
|
||||
)
|
||||
if season:
|
||||
state["elite_season"] = season
|
||||
state["elite_expire_time"] = expire_time // 1000
|
||||
state["elite_expire_time_text"] = self._format_local_time(
|
||||
expire_time // 1000
|
||||
)
|
||||
return state
|
||||
|
||||
def _apply_elite_state(
|
||||
self,
|
||||
account: HuyaAccount,
|
||||
|
||||
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from core.huya.wss_client import SHOP_APP_SCENE
|
||||
from core.huya.wss_client import POINTS_REDEEM_GOODS_NUM, SHOP_APP_SCENE
|
||||
|
||||
from ..models import HuyaAccount, HuyaRechargeGoodsSnapshot, HuyaTask
|
||||
from .huya_shop_flow import run_open_flow
|
||||
@@ -91,6 +91,18 @@ class RechargeMixin:
|
||||
def _update_task_progress(self, *args: Any, **kwargs: Any) -> None: ...
|
||||
def _open_wss_session(self, uid: int, cookie: str, kind: str): ...
|
||||
def _shop_client(self, uid: int, cookie: str): ...
|
||||
def _refresh_elite_open_after_payment(
|
||||
self,
|
||||
client: Any,
|
||||
account: HuyaAccount,
|
||||
uid: int,
|
||||
cookie: str,
|
||||
*,
|
||||
goods_num: int,
|
||||
pay_time_ms: int | None = None,
|
||||
attempts: int = 4,
|
||||
interval: float = 3.0,
|
||||
) -> dict: ...
|
||||
|
||||
@staticmethod
|
||||
def _format_local_time(timestamp: int) -> str: ...
|
||||
@@ -561,12 +573,25 @@ class RechargeMixin:
|
||||
account.updated_at = datetime.now(UTC)
|
||||
if payment_status == "paid":
|
||||
account.status = "recharge_paid"
|
||||
# 支付后刷新积分:旧活动接口 getUserScore 已下线(603 活动已结束),
|
||||
# 改走积分中心 getRedeemNeedGoods(tag2 = 当前积分)。
|
||||
post_redeem = client.get_redeem_need_goods(uid=uid, guid="", cookie=cookie)
|
||||
if post_redeem is not None and post_redeem.code == 200:
|
||||
result["post_payment_points"] = self._to_int(post_redeem.value("tag2"))
|
||||
account.points = result["post_payment_points"]
|
||||
# 支付后自动确认宝典开通状态(顺带取最新积分):交付有几秒延迟,
|
||||
# _refresh_elite_open_after_payment 会重试到 tag5 变成已开通。
|
||||
elite_state = self._refresh_elite_open_after_payment(
|
||||
client,
|
||||
account,
|
||||
uid,
|
||||
cookie,
|
||||
goods_num=self._to_int(self.payload.get("goods_num"))
|
||||
or POINTS_REDEEM_GOODS_NUM,
|
||||
pay_time_ms=(
|
||||
self._to_int(payment_order.get("pay_time"))
|
||||
if payment_order
|
||||
else None
|
||||
),
|
||||
)
|
||||
result.update(elite_state)
|
||||
if "redeem_points" in elite_state:
|
||||
result["post_payment_points"] = elite_state["redeem_points"]
|
||||
account.points = elite_state["redeem_points"]
|
||||
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)}"
|
||||
|
||||
Reference in New Issue
Block a user