refactor(douyu): 统一活动查询与直播商品映射
- 收口斗鱼活动、商品、绑定信息和兑换资格查询 - 工作台改为复用统一客户端、快照与实时商品目录 - 补充活动查询与商品映射测试
This commit is contained in:
@@ -13,6 +13,14 @@ from core.douyu import DouyuActivityClient, DouyuActivityError
|
||||
|
||||
from ..models import Account, DouyuEsportsGoodsSnapshot, DouyuGoodsSnapshot, DouyuTask
|
||||
from .business_events import record_exchange
|
||||
from .douyu_activity_query import (
|
||||
query_activity_goods,
|
||||
query_csrf,
|
||||
query_elite_user_info,
|
||||
query_esports_goods_result,
|
||||
query_exchange_records_result,
|
||||
query_limited_goods_result,
|
||||
)
|
||||
from .high_value_service import (
|
||||
DEFAULT_HIGH_VALUE_GOODS,
|
||||
HIGH_VALUE_STATUS_OWNED,
|
||||
@@ -70,8 +78,11 @@ class GoodsMixin:
|
||||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||||
):
|
||||
client = self._client(cookie)
|
||||
result = client.list_goods(manual_id=config["manual_id"], rid=config["rid"])
|
||||
goods = result["goods"]
|
||||
goods = query_activity_goods(
|
||||
client,
|
||||
manual_id=str(config["manual_id"]),
|
||||
rid=str(config["rid"]),
|
||||
)
|
||||
self._upsert_goods(db, goods)
|
||||
high_value_goods = extract_high_value_goods(goods, DEFAULT_HIGH_VALUE_GOODS, [])
|
||||
apply_high_value_goods(account, high_value_goods)
|
||||
@@ -99,7 +110,7 @@ class GoodsMixin:
|
||||
) -> None:
|
||||
"""兑换成功后立即刷新官方准入;失败时只标记本次已换套装。"""
|
||||
try:
|
||||
goods = client.list_goods(manual_id=manual_id, rid=rid).get("goods") or []
|
||||
goods = query_activity_goods(client, manual_id=manual_id, rid=rid)
|
||||
evaluated = extract_high_value_goods(goods, DEFAULT_HIGH_VALUE_GOODS, [])
|
||||
apply_high_value_goods(account, evaluated)
|
||||
key = high_value_key(commodity_name)
|
||||
@@ -132,7 +143,8 @@ class GoodsMixin:
|
||||
):
|
||||
"""刷新电竞手册皮肤商城快照。"""
|
||||
client = self._client(cookie)
|
||||
result = client.list_esports_goods(
|
||||
result = query_esports_goods_result(
|
||||
client,
|
||||
manual_id=str(config["esports_manual_id"]),
|
||||
rid=str(config["room_id"]),
|
||||
)
|
||||
@@ -243,7 +255,7 @@ class GoodsMixin:
|
||||
or f"#{account.id}",
|
||||
}
|
||||
try:
|
||||
ctn = client.acf_ccn(refresh_subscribe=False)
|
||||
ctn = query_csrf(client)
|
||||
result.update(
|
||||
self._refresh_account_points(client, account, cookie, ctn=ctn)
|
||||
)
|
||||
@@ -356,7 +368,7 @@ class GoodsMixin:
|
||||
# ---- 对齐浏览器:先查手册状态 + 商品详情,按页面状态机选兑换链路 ----
|
||||
manual_type = None
|
||||
try:
|
||||
user_info = client.elite_user_info(manual_id=manual_id, rid=rid)
|
||||
user_info = query_elite_user_info(client, manual_id=manual_id, rid=rid)
|
||||
manual_type = user_info.get("manual_type")
|
||||
except DouyuActivityError as exc:
|
||||
self._push_log("warning", f"查询手册状态失败,按经典流程继续: {exc}")
|
||||
@@ -554,7 +566,7 @@ class GoodsMixin:
|
||||
# 兑换成功后自动刷新积分,更新账号最新积分信息(失败不阻断兑换成功)
|
||||
points_refresh = None
|
||||
try:
|
||||
ctn = client.acf_ccn(refresh_subscribe=False)
|
||||
ctn = query_csrf(client)
|
||||
points_refresh = self._refresh_account_points(
|
||||
client, account, cookie, ctn=ctn
|
||||
)
|
||||
@@ -704,8 +716,8 @@ class GoodsMixin:
|
||||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||||
):
|
||||
client = self._client(cookie)
|
||||
result = client.query_limited_goods(
|
||||
manual_id=str(config["manual_id"]), rid=str(config["rid"])
|
||||
result = query_limited_goods_result(
|
||||
client, manual_id=str(config["manual_id"]), rid=str(config["rid"])
|
||||
)
|
||||
limited = result["limited_goods"]
|
||||
goods = (result.get("raw") or {}).get("data", {}).get("list") or []
|
||||
@@ -738,8 +750,13 @@ class GoodsMixin:
|
||||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||||
):
|
||||
client = self._client(cookie)
|
||||
result = client.exchange_records(manual_id=str(config["manual_id"]))
|
||||
records = result["records"]
|
||||
result = query_exchange_records_result(
|
||||
client,
|
||||
manual_id=str(config["manual_id"]),
|
||||
limit=100,
|
||||
offset=0,
|
||||
)
|
||||
records = result.get("records") or []
|
||||
account.updated_at = datetime.now(UTC)
|
||||
self._mark_task(
|
||||
db,
|
||||
|
||||
Reference in New Issue
Block a user