feat(huya): 协作台账店铺字典·新建强校验·同买家多单 + uid 放开(迁移 0057/0058)
- 店铺字典(迁移 0057):大按钮点选 + 「新店」自定义自动登记;重命名可级联、 停用/备注;列表行内改、详情、筛选条共用同一个 picker - 新建强校验:订单编号/店铺/CK/礼包名/主页截图必填;贴 CK 即探针预览, 读不到绑定角色禁止提交;礼包用工作台配置的活动 SID 现拉(浏览器缓存 + 强制刷新) - 图片:绑定图停用、「绑定斗鱼号」下线(绑定关系改由探针读 bind_game_*), 主页截图改为新建必填(弹窗内先传 OSS 再随表单落库) - 同买家多单软识别:按「绑定账号 + 绑定角色」整批一次查询,列表「同买家」列 + 详情分组,点单号直接切单 - uid 放开唯一性(迁移 0058):同一份 CK 可服务多单,原 409 冲突改为提示 + 审计 - 列表体验:序号列、搜索扩到 11 个字段、CK 状态列截断、新建弹窗放大并去滚动条 - 验证:pytest 932 passed / 6 skipped;接口冒烟 56 项全绿;tsc+eslint+build 通过
This commit is contained in:
@@ -24,6 +24,11 @@ from ...database import get_db
|
||||
from ...deps import require_permission
|
||||
from ...models import AuditLog, HuyaExternalOrder, User
|
||||
from ...schemas import (
|
||||
HuyaCollabCkPreviewOut,
|
||||
HuyaCollabCkPreviewRequest,
|
||||
HuyaCollabShopCreate,
|
||||
HuyaCollabShopOut,
|
||||
HuyaCollabShopUpdate,
|
||||
HuyaExternalOrderAuditOut,
|
||||
HuyaExternalOrderCkRequest,
|
||||
HuyaExternalOrderCkStatusRequest,
|
||||
@@ -52,7 +57,12 @@ def _http_error(exc: collab.CollabError) -> HTTPException:
|
||||
|
||||
|
||||
def _serialize_one(db: Session, order: HuyaExternalOrder) -> dict:
|
||||
return collab.serialize_order(order, users=collab.users_by_id(db, [order]))
|
||||
clusters = collab.buyer_clusters(db, [order])
|
||||
return collab.serialize_order(
|
||||
order,
|
||||
users=collab.users_by_id(db, [order]),
|
||||
buyer_cluster=clusters.get(int(order.id)),
|
||||
)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
@@ -89,10 +99,81 @@ def external_orders_shops(
|
||||
db: Session = Depends(get_db),
|
||||
_current: User = Depends(require_permission("huya:collab:view")),
|
||||
):
|
||||
"""已用过的店铺列表(筛选下拉)。"""
|
||||
"""店铺名列表(现在就是**店铺字典**里的名字;筛选下拉用)。"""
|
||||
return collab.list_shops(db)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# 店铺字典(新建协作单时点选;也支持自定义输入后自动登记)
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
|
||||
@router.get("/collab-shops", response_model=list[HuyaCollabShopOut])
|
||||
def list_collab_shops(
|
||||
db: Session = Depends(get_db),
|
||||
_current: User = Depends(require_permission("huya:collab:view")),
|
||||
):
|
||||
"""全部店铺(**含停用的**:管理弹窗要看到;新建下拉由前端按 `is_active` 过滤)。"""
|
||||
shops = collab.list_shop_records(db)
|
||||
names = collab.user_names(
|
||||
db,
|
||||
[shop.created_by for shop in shops] + [shop.updated_by for shop in shops],
|
||||
)
|
||||
return [collab.serialize_shop(shop, users=names) for shop in shops]
|
||||
|
||||
|
||||
@router.post("/collab-shops", response_model=HuyaCollabShopOut)
|
||||
def create_collab_shop(
|
||||
req: HuyaCollabShopCreate,
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("huya:collab:edit")),
|
||||
):
|
||||
"""新增店铺(重名 409)。"""
|
||||
try:
|
||||
shop = collab.create_shop(
|
||||
db, current, name=req.name, sort_order=req.sort_order, remark=req.remark
|
||||
)
|
||||
except collab.CollabError as exc:
|
||||
raise _http_error(exc) from exc
|
||||
return collab.serialize_shop(shop)
|
||||
|
||||
|
||||
@router.put("/collab-shops/{shop_id}", response_model=HuyaCollabShopOut)
|
||||
def update_collab_shop(
|
||||
shop_id: int,
|
||||
req: HuyaCollabShopUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("huya:collab:edit")),
|
||||
):
|
||||
"""改店铺:名字 / 排序 / 停用启用 / 备注。
|
||||
|
||||
``rename_orders``(默认 true)为真时,改名会级联改掉已有订单里的旧名字。
|
||||
"""
|
||||
payload = req.model_dump(exclude_unset=True)
|
||||
rename_orders = bool(payload.pop("rename_orders", True))
|
||||
try:
|
||||
shop = collab.get_shop(db, shop_id)
|
||||
collab.update_shop(db, current, shop, payload, rename_orders=rename_orders)
|
||||
except collab.CollabError as exc:
|
||||
raise _http_error(exc) from exc
|
||||
return collab.serialize_shop(shop)
|
||||
|
||||
|
||||
@router.delete("/collab-shops/{shop_id}")
|
||||
def delete_collab_shop(
|
||||
shop_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("huya:collab:manage")),
|
||||
):
|
||||
"""从字典里删掉(**只给运营**)。不动订单:订单存的是店铺名,历史单子照旧。"""
|
||||
try:
|
||||
shop = collab.get_shop(db, shop_id)
|
||||
snapshot = collab.delete_shop(db, current, shop)
|
||||
except collab.CollabError as exc:
|
||||
raise _http_error(exc) from exc
|
||||
return {"success": True, "name": snapshot["name"]}
|
||||
|
||||
|
||||
@router.get("/external-orders", response_model=HuyaExternalOrderListOut)
|
||||
def list_external_orders(
|
||||
shop: str = Query("", max_length=64),
|
||||
@@ -119,8 +200,15 @@ def list_external_orders(
|
||||
page_size=page_size,
|
||||
)
|
||||
names = collab.users_by_id(db, rows)
|
||||
# 「同一买家的其它单」整页一次算完(按绑定账号 + 绑定角色软识别,只读派生)
|
||||
clusters = collab.buyer_clusters(db, rows)
|
||||
return {
|
||||
"items": [collab.serialize_order(row, users=names) for row in rows],
|
||||
"items": [
|
||||
collab.serialize_order(
|
||||
row, users=names, buyer_cluster=clusters.get(int(row.id))
|
||||
)
|
||||
for row in rows
|
||||
],
|
||||
"total": total,
|
||||
"page": page,
|
||||
"page_size": page_size,
|
||||
@@ -133,7 +221,12 @@ def create_external_order(
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(require_permission("huya:collab:edit")),
|
||||
):
|
||||
"""新建一行(可同时贴一份外部 CK)。订单号唯一,重复会 409。"""
|
||||
"""新建一行(可同时贴一份外部 CK)。订单号唯一,重复会 409。
|
||||
|
||||
``require_verified``(默认 true):人工新建表单的严格模式 —— 订单编号 / 店铺 / CK /
|
||||
礼包名 / 主页截图必填,且 CK 必须探针通并读到绑定角色,否则 400
|
||||
(粘贴导入走另一个接口,不受影响)。
|
||||
"""
|
||||
try:
|
||||
order = collab.create_order(
|
||||
db,
|
||||
@@ -144,7 +237,9 @@ def create_external_order(
|
||||
ck_text=req.ck_text,
|
||||
bind_douyu_account=req.bind_douyu_account,
|
||||
gift_name=req.gift_name,
|
||||
home_images=req.home_images,
|
||||
remark=req.remark,
|
||||
require_verified=req.require_verified,
|
||||
)
|
||||
except collab.CollabError as exc:
|
||||
raise _http_error(exc) from exc
|
||||
@@ -167,6 +262,33 @@ def import_external_orders(
|
||||
return collab.import_orders(db, current, req.text, owner_by_name=owners)
|
||||
|
||||
|
||||
@router.post("/external-orders/ck/preview", response_model=HuyaCollabCkPreviewOut)
|
||||
def preview_external_order_ck(
|
||||
req: HuyaCollabCkPreviewRequest,
|
||||
db: Session = Depends(get_db),
|
||||
_current: User = Depends(require_permission("huya:collab:edit")),
|
||||
):
|
||||
"""粘贴 CK 后的**即时预览**(只读):探针 + 顺带拉活动礼包,一行都不写库。
|
||||
|
||||
新建弹窗据此决定能不能提交:``ok`` 且 ``has_role`` 才允许
|
||||
(服务端在创建时还会再校验一次,见 ``POST /external-orders``)。
|
||||
|
||||
礼包用**工作台配置里的活动 SID**(``huya_config.sid``)拉:SID 就是活动 ID,
|
||||
换活动就得换它,写死会出现「接口 200 但礼包列表是空的」(真机 2026-10-16)。
|
||||
"""
|
||||
try:
|
||||
preview = collab.preview_ck(
|
||||
req.ck_text,
|
||||
with_gifts=req.with_gifts,
|
||||
sid=collab.resolve_gifts_sid(db),
|
||||
)
|
||||
except collab.CollabError as exc:
|
||||
raise _http_error(exc) from exc
|
||||
# 「这个虎牙号已经在哪些单上」:允许同一份 CK 服务多单,这里只提示、不挡
|
||||
preview["uid_used_by"] = collab.uids_in_use(db, preview.get("uid"))
|
||||
return preview
|
||||
|
||||
|
||||
@router.post("/external-orders/ck/verify", response_model=HuyaExternalOrderVerifyOut)
|
||||
def verify_external_orders_ck(
|
||||
req: HuyaExternalOrderVerifyRequest,
|
||||
|
||||
Reference in New Issue
Block a user