refactor(douyu): 统一活动查询与直播商品映射

- 收口斗鱼活动、商品、绑定信息和兑换资格查询
- 工作台改为复用统一客户端、快照与实时商品目录
- 补充活动查询与商品映射测试
This commit is contained in:
yml
2026-11-18 10:59:20 +08:00
parent 1ca768eba5
commit 0220ef995f
15 changed files with 711 additions and 303 deletions
+34
View File
@@ -20,6 +20,7 @@ from sqlalchemy import case, func, or_, select
from sqlalchemy.orm import Session, joinedload
from core.douyu import (
DouyuActivityError,
FishFinRechargeClient,
FishFinRechargeConfig,
FishFinRechargeConfigError,
@@ -53,7 +54,9 @@ from ..schemas import (
from ..services.account_binding import bind_payload
from ..services.audit_service import record_audit
from ..services.business_events import record_recharge
from ..services.douyu_activity_query import activity_client, query_activity_goods
from ..services.douyu_batch_launcher import start_douyu_batch
from ..services.douyu_goods_service import serialize_goods
from ..services.douyu_runner import DouyuBatchRunner, douyu_batch_registry
from ..services.douyu_service import (
DOUYU_CONFIG_FIELDS,
@@ -662,6 +665,37 @@ def list_goods(
return rows
@router.get("/goods/live", response_model=list[DouyuGoodsOut])
def list_live_goods(
db: Session = Depends(get_db),
current: User = Depends(require_permission("douyu:task")),
):
"""实时读取精英宝典活动商品,不依赖账号或本地刷新任务。"""
del current
config = ensure_douyu_config(db)
try:
goods = query_activity_goods(
activity_client(),
manual_id=str(douyu_config_value("manual_id", config.manual_id)),
rid=str(douyu_config_value("rid", config.rid)),
)
except DouyuActivityError as exc:
raise HTTPException(status_code=502, detail=f"活动商品加载失败:{exc}") from exc
now = datetime.now(UTC)
return [
DouyuGoodsOut(
id=-(index + 1),
commodity_id=str(item.get("commodity_id") or ""),
name=str(item.get("name") or ""),
score=item.get("score"),
status=str(item.get("status") or ""),
raw=item.get("raw") if isinstance(item.get("raw"), dict) else None,
updated_at=now,
)
for index, item in enumerate(serialize_goods(raw) for raw in goods)
]
@router.get("/esports-goods", response_model=list[DouyuGoodsOut])
def list_esports_goods(
db: Session = Depends(get_db),