From e9937419cb19966c0647f780d7213ba63e786c34 Mon Sep 17 00:00:00 2001 From: yml Date: Fri, 20 Nov 2026 00:22:48 +0800 Subject: [PATCH] feat(douyu): include binding roles in batch verification Expose CK and binding-role validity from batch verification and summarize invalid CK, missing roles, and request failures in the collaboration workbench. --- tests/test_douyu_collab_orders.py | 71 ++++++++++++++++++++++ web/backend/routers/douyu_collab.py | 6 +- web/frontend/src/api/douyuCollab.ts | 26 +++++++- web/frontend/src/pages/DouyuCollabPage.tsx | 24 ++++++-- 4 files changed, 119 insertions(+), 8 deletions(-) diff --git a/tests/test_douyu_collab_orders.py b/tests/test_douyu_collab_orders.py index f04ee9f..3d43a6c 100644 --- a/tests/test_douyu_collab_orders.py +++ b/tests/test_douyu_collab_orders.py @@ -1482,6 +1482,77 @@ class TestDouyuCollabOrders: assert "douyu:collab:ck_export" in ROLE_PERMISSIONS["super_admin"] assert "douyu:collab:ck_export" not in ROLE_PERMISSIONS["support"] + def test_batch_verify_returns_ck_and_binding_role_results(self, monkeypatch): + first = collab.create_order( + self.session, + self.admin, + order_no="DY-BATCH-VERIFY-1", + account_username="douyu-account-a", + draft=True, + ) + second = collab.create_order( + self.session, + self.admin, + order_no="DY-BATCH-VERIFY-2", + account_username="douyu-account-a", + draft=True, + ) + orders = {first.id: first, second.id: second} + + monkeypatch.setattr( + collab, + "get_order", + lambda _db, order_id: orders[order_id], + ) + + def fake_verify(_db, _current, order): + if order.id == first.id: + probe = { + "ok": True, + "ck_status": collab.CK_VALID, + "bind_game_role": "角色A", + "message": "", + } + else: + probe = { + "ok": False, + "ck_status": collab.CK_VALID, + "bind_game_role": "", + "message": "绑定角色: 未绑定", + } + return {"order": order, "probe": probe} + + monkeypatch.setattr(collab, "verify_order", fake_verify) + monkeypatch.setattr( + collab_api, "_publish_change", lambda *_args, **_kwargs: None + ) + + result = collab_api.verify_external_orders_batch( + [first.id, second.id], + db=self.session, + current=self.admin, + ) + + assert result["success"] is True + assert result["results"][0] == { + "id": first.id, + "success": True, + "ok": True, + "ck_status": collab.CK_VALID, + "role": "角色A", + "role_ok": True, + "message": "", + } + assert result["results"][1] == { + "id": second.id, + "success": True, + "ok": False, + "ck_status": collab.CK_VALID, + "role": "", + "role_ok": False, + "message": "绑定角色: 未绑定", + } + def test_douyu_collab_routes_registered(self): from web.backend.main import app diff --git a/web/backend/routers/douyu_collab.py b/web/backend/routers/douyu_collab.py index 51134f2..6ea2b5d 100644 --- a/web/backend/routers/douyu_collab.py +++ b/web/backend/routers/douyu_collab.py @@ -361,12 +361,16 @@ def verify_external_orders_batch( order = collab.get_order(db, order_id) result = collab.verify_order(db, current, order) probe = result["probe"] + role = str(probe.get("bind_game_role") or "") results.append( { "id": order_id, "success": True, + "ok": bool(probe.get("ok")), "ck_status": probe.get("ck_status"), - "role": probe.get("bind_game_role"), + "role": role, + "role_ok": bool(role), + "message": probe.get("message") or "", } ) except Exception as exc: # noqa: BLE001 - 批量逐行隔离 diff --git a/web/frontend/src/api/douyuCollab.ts b/web/frontend/src/api/douyuCollab.ts index 71cdc55..cdd960a 100644 --- a/web/frontend/src/api/douyuCollab.ts +++ b/web/frontend/src/api/douyuCollab.ts @@ -387,8 +387,30 @@ export const douyuCollabApi = { ), batchVerify: (ids: number[]) => api.post< - { results: Array<{ id: number; success: boolean; ck_status?: string; role?: string; message?: string }>; success: boolean }, - { results: Array<{ id: number; success: boolean; ck_status?: string; role?: string; message?: string }>; success: boolean } + { + results: Array<{ + id: number; + success: boolean; + ok?: boolean; + ck_status?: string; + role?: string; + role_ok?: boolean; + message?: string; + }>; + success: boolean; + }, + { + results: Array<{ + id: number; + success: boolean; + ok?: boolean; + ck_status?: string; + role?: string; + role_ok?: boolean; + message?: string; + }>; + success: boolean; + } >('/douyu/external-orders/verify/batch', ids), queryActivity: (id: number) => api.post( `/douyu/external-orders/${id}/activity/query`, diff --git a/web/frontend/src/pages/DouyuCollabPage.tsx b/web/frontend/src/pages/DouyuCollabPage.tsx index 3295261..983fb36 100644 --- a/web/frontend/src/pages/DouyuCollabPage.tsx +++ b/web/frontend/src/pages/DouyuCollabPage.tsx @@ -938,11 +938,25 @@ export default function DouyuCollabPage() { setLoading(true); try { const result = await douyuCollabApi.batchVerify(selectedIds); - const ok = result.results.filter((item) => item.success).length; + const valid = result.results.filter((item) => item.success && item.ok).length; const invalid = result.results.filter((item) => item.ck_status === 'invalid').length; - message.success( - `校验完成:${ok}/${result.results.length}${invalid ? `,其中 CK 异常 ${invalid} 单` : ''}`, - ); + const missingRole = result.results.filter( + (item) => item.success && !(item.role_ok ?? Boolean(item.role)), + ).length; + const failed = result.results.filter((item) => !item.success).length; + const details = [ + invalid ? `CK 异常 ${invalid} 单` : '', + missingRole ? `角色未绑定 ${missingRole} 单` : '', + failed ? `请求失败 ${failed} 单` : '', + ].filter(Boolean); + const summary = `账号校验完成:${valid}/${result.results.length} 单通过${ + details.length ? `;${details.join(',')}` : '' + }`; + if (details.length > 0) { + message.warning(summary); + } else { + message.success(summary); + } refreshAll(); } catch (error) { message.error(getErrorMessage(error)); @@ -1725,7 +1739,7 @@ export default function DouyuCollabPage() { disabled={selectedCount === 0 || loading} onClick={() => void batchVerify()} > - 批量验证 CK{selectedCount > 0 ? `(${selectedCount})` : ''} + 批量验证 CK/角色{selectedCount > 0 ? `(${selectedCount})` : ''}