refactor(douyu): 统一活动查询与直播商品映射
- 收口斗鱼活动、商品、绑定信息和兑换资格查询 - 工作台改为复用统一客户端、快照与实时商品目录 - 补充活动查询与商品映射测试
This commit is contained in:
@@ -19,6 +19,7 @@ from .account_binding import (
|
||||
set_bind_status,
|
||||
)
|
||||
from .business_events import record_exchange
|
||||
from .douyu_activity_query import query_xpd_bind_info
|
||||
|
||||
DOUYU_XPD_BIND_POLL_SECONDS = 300
|
||||
DOUYU_XPD_BIND_POLL_INTERVAL = 5
|
||||
@@ -138,7 +139,7 @@ class XpdMixin:
|
||||
db.commit()
|
||||
# 记录绑定前状态:已绑定账号生成二维码后必须等扫码换绑,不能立即成功
|
||||
try:
|
||||
before = client.xpd_bind_info(act_alias=act_alias)
|
||||
before = query_xpd_bind_info(client, act_alias=act_alias)
|
||||
result["before_bound"] = bool(before.get("bind_role"))
|
||||
result["before_role_name"] = str(before.get("role_name") or "")
|
||||
result["before_area_name"] = str(before.get("area_name") or "")
|
||||
@@ -193,7 +194,7 @@ class XpdMixin:
|
||||
poll_count = 0
|
||||
while not self._stop.is_set() and time.monotonic() <= deadline:
|
||||
try:
|
||||
info = client.xpd_bind_info(act_alias=act_alias)
|
||||
info = query_xpd_bind_info(client, act_alias=act_alias)
|
||||
poll_count += 1
|
||||
result["bind_poll_count"] = poll_count
|
||||
result["bind_polling"] = True
|
||||
@@ -246,7 +247,7 @@ class XpdMixin:
|
||||
if not act_alias:
|
||||
self._mark_task(db, task, "failed", "请先配置小店活动代号 actAlias")
|
||||
return
|
||||
result = client.xpd_bind_info(act_alias=act_alias)
|
||||
result = query_xpd_bind_info(client, act_alias=act_alias)
|
||||
role_name = str(result.get("role_name") or "")
|
||||
if not result.get("bind_role") or not role_name:
|
||||
set_bind_status(account, SCOPE_PEACE, BIND_UNBOUND)
|
||||
@@ -294,7 +295,7 @@ class XpdMixin:
|
||||
if not act_alias:
|
||||
self._mark_task(db, task, "failed", "请先配置小店活动代号 actAlias")
|
||||
return
|
||||
result = client.xpd_bind_info(act_alias=act_alias)
|
||||
result = query_xpd_bind_info(client, act_alias=act_alias)
|
||||
status = "已绑定" if result.get("bind_role") else "未绑定"
|
||||
text = str(result.get("role_name") or result.get("nick") or "-")
|
||||
self._mark_task(
|
||||
|
||||
Reference in New Issue
Block a user