diff --git a/tests/test_douyu_binding_state.py b/tests/test_douyu_binding_state.py index 443a54f..2ad4e8c 100644 --- a/tests/test_douyu_binding_state.py +++ b/tests/test_douyu_binding_state.py @@ -6,6 +6,7 @@ from datetime import UTC, datetime from typing import Any from core.douyu import DouyuActivityClient +from web.backend.models import Account from web.backend.services.account_binding import ( BIND_BOUND, BIND_PENDING, @@ -172,6 +173,51 @@ def test_existing_pending_role_is_baseline_not_new_scan_result(): baseline_role_name=old_role, baseline_is_bound_act=False, ) + assert not is_pending_binding_role( + candidates[0], + baseline_role_name=old_role, + baseline_is_bound_act=True, + ) + assert not is_pending_binding_role( + candidates[1], + baseline_role_name=old_role, + baseline_is_bound_act=True, + ) + assert not is_pending_binding_role( + candidates[0], + baseline_role_name=old_role, + baseline_is_bound_act=True, + baseline_info=candidates[1], + ) + + +def test_same_role_after_activity_bind_transition_is_pending(): + old_role = "少和我较劲" + baseline = _role_candidate(ACT_ALIAS, old_role, bound_act=True) + after_scan = _role_candidate(ACT_ALIAS, old_role, bound_act=False) + + assert is_pending_binding_role( + after_scan, + baseline_role_name=old_role, + baseline_is_bound_act=True, + baseline_info=baseline, + ) + + +def test_confirmed_new_role_replaces_account_current_role(): + account = Account( + username="replace-role", + password="p", + email="replace-role@example.com", + email_password="ep", + status="active", + game_name="少和我较劲", + ) + new_role = _role_candidate(ACT_ALIAS, "新的绑定角色", bound_act=True) + + _RolePicker()._apply_bind_info_to_account(account, new_role) + + assert account.game_name == "新的绑定角色" def test_new_role_wins_when_cjm_and_activity_snapshots_differ(): diff --git a/tests/test_platform_fulfillment.py b/tests/test_platform_fulfillment.py index 86ba5c1..bcac252 100644 --- a/tests/test_platform_fulfillment.py +++ b/tests/test_platform_fulfillment.py @@ -825,7 +825,12 @@ class TestBindingAndCompletion(_Base): task_type="get_bind_qr", handbook_scope="elite", status="success", - result={"url": "https://example.com/qr", "role_name": "测试角色"}, + result={ + "url": "https://example.com/qr", + "role_name": "测试角色", + "need_bind_act": True, + "bind_ready_for_confirm": True, + }, created_by=self.admin_id, ) self.session.add(bind_task) @@ -841,6 +846,84 @@ class TestBindingAndCompletion(_Base): assert detail["task"]["bindTask"]["roleName"] == "测试角色" assert notified == [task.id] + def test_refresh_binding_ignores_legacy_same_role_pending(self): + task = self._allocated() + bind_task = DouyuTask( + batch_id="bind-stale-same-role", + account_id=task.account_id, + account_assigned_to=self.admin_id, + task_type="get_bind_qr", + handbook_scope="elite", + status="success", + result={ + "url": "https://example.com/old-qr", + "role_name": "少和我较劲", + "current_role_name": "少和我较劲", + "baseline_role_name": "少和我较劲", + "need_bind_act": False, + "is_bound_act": False, + "bind_ready_for_confirm": True, + "bind_confirmed": False, + "bind_phase": "role_ready", + }, + created_by=self.admin_id, + ) + self.session.add(bind_task) + self.session.flush() + task.bind_task_id = bind_task.id + task.binding_status = "role_ready" + task.execution_status = "role_ready" + self.session.commit() + + detail = service.refresh_binding(self.session, task_id=task.id) + + self.session.refresh(task) + assert task.bind_task_id is None + assert task.binding_status == "not_started" + assert task.execution_status == "allocated" + assert detail["task"]["bindTask"] is None + event = ( + self.session.query(PlatformFulfillmentEvent) + .filter_by(task_id=task.id, event_type="binding_stale_role_ignored") + .one() + ) + assert event.detail_json["roleName"] == "少和我较劲" + + def test_refresh_binding_keeps_same_role_after_pending_transition(self): + task = self._allocated() + bind_task = DouyuTask( + batch_id="bind-new-same-role", + account_id=task.account_id, + account_assigned_to=self.admin_id, + task_type="get_bind_qr", + handbook_scope="elite", + status="success", + result={ + "url": "https://example.com/new-qr", + "role_name": "少和我较劲", + "current_role_name": "少和我较劲", + "baseline_role_name": "少和我较劲", + "need_bind_act": True, + "is_bound_act": False, + "bind_ready_for_confirm": True, + "bind_confirmed": False, + "bind_phase": "role_ready", + }, + created_by=self.admin_id, + ) + self.session.add(bind_task) + self.session.flush() + task.bind_task_id = bind_task.id + task.binding_status = "waiting_bind" + task.execution_status = "waiting_bind" + self.session.commit() + + detail = service.refresh_binding(self.session, task_id=task.id) + + assert detail["task"]["bindingStatus"] == "role_ready" + assert detail["task"]["bindTask"]["roleName"] == "少和我较劲" + assert detail["task"]["bindTask"]["bindReadyForConfirm"] is True + def test_refresh_binding_clears_stale_failure_when_qr_is_pending(self): task = self._allocated() bind_task = DouyuTask( diff --git a/web/backend/services/account_binding.py b/web/backend/services/account_binding.py index 98ca3dc..f737284 100644 --- a/web/backend/services/account_binding.py +++ b/web/backend/services/account_binding.py @@ -289,25 +289,37 @@ def is_pending_binding_role( *, baseline_role_name: str = "", baseline_is_bound_act: bool = False, + baseline_info: dict | None = None, ) -> bool: - """是否出现了可确认的扫码角色。""" + """是否出现了本次扫码产生的可确认角色。 + + 角色名不是唯一事实:用户可能换绑到同名角色。判断还要对比扫码前后的 + 活动绑定状态,尤其是活动 alias 从 ``bindAct=1`` 转为 + ``bindAct=0 + needBindAct=1`` 的待确认转换。 + """ if not isinstance(info, dict): return False snapshot = binding_snapshot(info) role_name = snapshot["role_name"] if not role_name: return False + baseline = baseline_role_name.strip() + if not baseline: + return True + if role_name.casefold() != baseline.casefold(): + return True if snapshot["is_bound_act"]: - return bool(baseline_role_name) and role_name != baseline_role_name - if snapshot["need_bind_act"] or snapshot["need_bind_role"]: - if not baseline_role_name: - return True - return role_name != baseline_role_name or baseline_is_bound_act - if not baseline_role_name: - return True - if role_name != baseline_role_name: - return True - return baseline_is_bound_act + return False + if not isinstance(baseline_info, dict): + return False + + baseline_snapshot = binding_snapshot(baseline_info) + same_alias = str(info.get("act_alias") or "") == str( + baseline_info.get("act_alias") or "" + ) + return bool( + same_alias and baseline_snapshot["is_bound_act"] and snapshot["need_bind_act"] + ) def binding_channel(info: dict | None) -> str: diff --git a/web/backend/services/douyu_runner_bind.py b/web/backend/services/douyu_runner_bind.py index c7e777f..dfda65d 100644 --- a/web/backend/services/douyu_runner_bind.py +++ b/web/backend/services/douyu_runner_bind.py @@ -126,20 +126,22 @@ class BindMixin: *, baseline_role_name: str = "", baseline_is_bound_act: bool = False, + baseline_info: dict | None = None, ) -> bool: """判断是否出现了可确认的扫码角色。 规则: 1. 必须有角色名 - 2. 已绑定同一角色(或无 baseline 的已绑定)不算 pending - 3. 角色名相对 baseline 变化,或从已绑定变成待确认,算 pending - 4. need_bind_act / need_bind_role 且角色相对 baseline 有变化,算 pending - 5. 无 baseline 且未绑定但有角色,视为待确认残留 + 2. 角色名相对 baseline 变化,说明出现了新角色 + 3. 角色名相同但活动状态从已绑定转为 needBindAct,说明用户本次 + 扫码选择了同名角色,仍算 pending + 4. 无 baseline 且有角色,视为首次绑定的待确认角色 """ return is_pending_binding_role( bind_info, baseline_role_name=baseline_role_name, baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, ) def _bind_snapshot(self, bind_info: dict | None) -> dict: @@ -345,6 +347,7 @@ class BindMixin: *, baseline_role_name: str = "", baseline_is_bound_act: bool = False, + baseline_info: dict | None = None, prefer_pending: bool = True, prefer_aliases: list[str] | None = None, ) -> dict | None: @@ -376,6 +379,7 @@ class BindMixin: info, baseline_role_name=baseline_role_name, baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, ): return info for info in ordered: @@ -443,6 +447,7 @@ class BindMixin: result: dict, baseline_role_name: str = "", baseline_is_bound_act: bool = False, + baseline_info: dict | None = None, ) -> tuple[str, dict]: """生成二维码后轮询绑定信息,直到识别到待确认角色、超时或停止。""" deadline = time.monotonic() + DOUYU_BIND_ROLE_POLL_SECONDS @@ -483,6 +488,7 @@ class BindMixin: candidates, baseline_role_name=baseline_role_name, baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, prefer_pending=True, prefer_aliases=query_aliases, ) @@ -493,6 +499,7 @@ class BindMixin: bind_info, baseline_role_name=baseline_role_name, baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, ) query_alias = str(bind_info.get("act_alias") or "") summary = ( @@ -734,6 +741,7 @@ class BindMixin: result, baseline_role_name=current_role_name, baseline_is_bound_act=before_snapshot["is_bound_act"], + baseline_info=before, ) if role_name: self._mark_task( diff --git a/web/backend/services/platform_fulfillment/service.py b/web/backend/services/platform_fulfillment/service.py index aa72a3f..42372b0 100644 --- a/web/backend/services/platform_fulfillment/service.py +++ b/web/backend/services/platform_fulfillment/service.py @@ -514,6 +514,37 @@ def list_tasks( } +def _pending_binding_role_name(result: dict[str, Any]) -> str: + if not bool(result.get("bind_ready_for_confirm")): + return "" + role_name = str(result.get("role_name") or "").strip() + if not role_name: + return "" + baseline = str( + result.get("baseline_role_name") or result.get("current_role_name") or "" + ).strip() + if baseline and role_name.casefold() == baseline.casefold(): + # 同名角色仍可能是本次新绑定:活动状态必须出现从已绑定到 + # needBindAct 的待确认转换。仅凭 cjm 中残留的同名 bindRole 不算。 + transitioned_to_pending = bool(result.get("need_bind_act")) and not bool( + result.get("is_bound_act") + ) + if not transitioned_to_pending: + return "" + return role_name + + +def _binding_role_out(result: dict[str, Any]) -> str: + pending_role = _pending_binding_role_name(result) + if pending_role: + return pending_role + if bool(result.get("bind_confirmed")): + return str( + result.get("role_name") or result.get("current_role_name") or "" + ).strip() + return "" + + def _task_out( db: Session, task: PlatformFulfillmentTask, @@ -536,6 +567,7 @@ def _task_out( else None ) bind_result = (bind_task.result or {}) if bind_task else {} + pending_role = _pending_binding_role_name(bind_result) return { "id": task.id, "sourceSystem": task.source_system, @@ -598,15 +630,11 @@ def _task_out( "status": bind_task.status, "message": bind_task.message, "qrUrl": str(bind_result.get("url") or "") if include_qr else "", - "roleName": str( - bind_result.get("role_name") - or bind_result.get("current_role_name") - or "" - ), + "roleName": _binding_role_out(bind_result), "areaName": str(bind_result.get("area_name") or ""), "platName": str(bind_result.get("plat_name") or ""), "bindPhase": str(bind_result.get("bind_phase") or ""), - "bindReadyForConfirm": bool(bind_result.get("bind_ready_for_confirm")), + "bindReadyForConfirm": bool(pending_role), "bindConfirmed": bool(bind_result.get("bind_confirmed")), } if bind_task @@ -685,6 +713,7 @@ def customer_binding_out(db: Session, task_id: int) -> dict[str, Any]: else None ) bind_result = (bind_task.result or {}) if bind_task else {} + pending_role = _pending_binding_role_name(bind_result) lease = ( db.query(AccountLease).filter(AccountLease.id == task.lease_id).first() if task.lease_id @@ -711,14 +740,10 @@ def customer_binding_out(db: Session, task_id: int) -> dict[str, Any]: "qrUrl": str(bind_result.get("url") or ""), "qrGeneratedAt": str(bind_result.get("qr_generated_at") or ""), "qrExpiresAt": str(bind_result.get("qr_expires_at") or ""), - "roleName": str( - bind_result.get("role_name") or bind_result.get("current_role_name") or "" - ), + "roleName": _binding_role_out(bind_result), "areaName": str(bind_result.get("area_name") or ""), "platName": str(bind_result.get("plat_name") or ""), - "bindReadyForConfirm": ( - bool(bind_result.get("bind_ready_for_confirm")) and not binding_failed - ), + "bindReadyForConfirm": (bool(pending_role) and not binding_failed), "bindConfirmed": bool(bind_result.get("bind_confirmed")) and binding_confirmed, "completedAt": _jsonable(task.completed_at), "updatedAt": _jsonable(task.updated_at), @@ -1218,13 +1243,19 @@ async def start_binding( existing = db.query(DouyuTask).filter(DouyuTask.id == task.bind_task_id).first() if existing: result = existing.result or {} - if bool(result.get("bind_confirmed")) or bool( - result.get("bind_ready_for_confirm") - ): + pending_role = _pending_binding_role_name(result) + stale_pending = ( + bool(result.get("bind_ready_for_confirm")) and not pending_role + ) + if bool(result.get("bind_confirmed")) or pending_role: return get_task_detail(db, task.id) if existing.status in {"planned", "pending", "running"}: return get_task_detail(db, task.id) - if existing.status == "success" and not _binding_qr_expired(existing): + if ( + existing.status == "success" + and not _binding_qr_expired(existing) + and not stale_pending + ): return get_task_detail(db, task.id) if not force_refresh and existing.status not in { "success", @@ -1296,6 +1327,7 @@ def refresh_binding(db: Session, *, task_id: int) -> dict[str, Any]: task.last_error, ) result = bind_task.result or {} + pending_role = _pending_binding_role_name(result) if bind_task.status in {"failed", "error", "stopped"}: task.binding_status = "failed" task.execution_status = "manual_required" @@ -1306,11 +1338,38 @@ def refresh_binding(db: Session, *, task_id: int) -> dict[str, Any]: task.execution_status = "bound" task.issue_code = "" task.last_error = "" - elif bool(result.get("bind_ready_for_confirm")) or result.get("role_name"): + elif pending_role: task.binding_status = "role_ready" task.execution_status = "role_ready" task.issue_code = "" task.last_error = "" + elif bool(result.get("bind_ready_for_confirm")): + # 兼容旧快照:同名旧角色曾被误标为待确认。清掉绑定指针后,客户页会 + # 回到已分配状态,并在下一次刷新时自动生成新二维码、重新开始轮询。 + previous_bind_task_id = task.bind_task_id + task.bind_task_id = None + task.binding_status = "not_started" + task.execution_status = "allocated" + task.issue_code = "" + task.last_error = "" + task.updated_at = _now() + _append_event( + db, + task.id, + "binding_stale_role_ignored", + detail={ + "bindTaskId": previous_bind_task_id, + "roleName": str(result.get("role_name") or "")[:100], + "baselineRoleName": str( + result.get("baseline_role_name") + or result.get("current_role_name") + or "" + )[:100], + }, + ) + _emit_order_site_binding_state(db, task.id) + db.commit() + return get_task_detail(db, task.id) elif result.get("url"): task.binding_status = "qr_pending" task.execution_status = "waiting_bind" diff --git a/web/frontend/src/pages/PlatformFulfillmentPage.tsx b/web/frontend/src/pages/PlatformFulfillmentPage.tsx index c8f8e95..f0fea2a 100644 --- a/web/frontend/src/pages/PlatformFulfillmentPage.tsx +++ b/web/frontend/src/pages/PlatformFulfillmentPage.tsx @@ -79,6 +79,7 @@ const EVENT_LABELS: Record = { binding_confirm_started: '提交角色绑定确认', binding_failed: '游戏角色绑定失败', binding_reset: '重置角色资料和绑定记录', + binding_stale_role_ignored: '忽略账号旧角色', eligibility_check_failed: '兑换资格查询失败', exchange_eligibility_checked: '刷新兑换资格', manual_exchange_completed: '人工兑换完成',