diff --git a/tests/test_douyu_binding_state.py b/tests/test_douyu_binding_state.py index 2ad4e8c..1d08db5 100644 --- a/tests/test_douyu_binding_state.py +++ b/tests/test_douyu_binding_state.py @@ -11,10 +11,12 @@ from web.backend.services.account_binding import ( BIND_BOUND, BIND_PENDING, BIND_UNBOUND, + binding_role_from_result, binding_snapshot, derive_from_bind_info, is_pending_binding_role, is_role_change_cooling, + pending_binding_role_from_result, role_change_available_at, ) from web.backend.services.douyu_runner_bind import BindMixin @@ -204,6 +206,48 @@ def test_same_role_after_activity_bind_transition_is_pending(): ) +def test_pending_candidate_picker_ignores_legacy_same_role_residual(): + old_role = "少和我较劲" + baseline = _role_candidate(ACT_ALIAS, old_role, bound_act=True) + legacy = _role_candidate(LEGACY_ALIAS, old_role, bound_act=False) + activity = _role_candidate(ACT_ALIAS, old_role, bound_act=True) + + selected = _RolePicker()._pick_pending_role_info( + [legacy, activity], + prefer_aliases=[LEGACY_ALIAS, ACT_ALIAS], + baseline_role_name=old_role, + baseline_is_bound_act=True, + baseline_info=baseline, + ) + + assert selected is None + + +def test_task_result_helpers_use_shared_same_role_transition_rule(): + baseline = _role_candidate(ACT_ALIAS, "少和我较劲", bound_act=True) + stale = { + "role_name": "少和我较劲", + "baseline_role_name": "少和我较劲", + "baseline_is_bound_act": True, + "need_bind_act": False, + "is_bound_act": False, + "bind_ready_for_confirm": True, + "bind_confirmed": False, + "before_bind_info": baseline, + } + same_role_scanned = { + **stale, + "act_alias": ACT_ALIAS, + "need_bind_act": True, + "bind_ready_for_confirm": True, + } + + assert pending_binding_role_from_result(stale) == "" + assert binding_role_from_result(stale) == "" + assert pending_binding_role_from_result(same_role_scanned) == "少和我较劲" + assert binding_role_from_result(same_role_scanned) == "少和我较劲" + + def test_confirmed_new_role_replaces_account_current_role(): account = Account( username="replace-role", diff --git a/tests/test_platform_fulfillment.py b/tests/test_platform_fulfillment.py index e9baa58..3fb511f 100644 --- a/tests/test_platform_fulfillment.py +++ b/tests/test_platform_fulfillment.py @@ -900,9 +900,15 @@ class TestBindingAndCompletion(_Base): status="success", result={ "url": "https://example.com/new-qr", + "act_alias": "20260120QYOOB", "role_name": "少和我较劲", "current_role_name": "少和我较劲", "baseline_role_name": "少和我较劲", + "before_bind_info": { + "act_alias": "20260120QYOOB", + "role_name": "少和我较劲", + "is_bound_act": True, + }, "need_bind_act": True, "is_bound_act": False, "bind_ready_for_confirm": True, diff --git a/web/backend/services/account_binding.py b/web/backend/services/account_binding.py index f737284..01ece2c 100644 --- a/web/backend/services/account_binding.py +++ b/web/backend/services/account_binding.py @@ -322,6 +322,53 @@ def is_pending_binding_role( ) +def pending_binding_role_from_result(result: dict[str, Any] | None) -> str: + """从执行器结果中提取“本次扫码产生的待确认角色”。 + + 执行器结果已经是归一化快照,但仍必须复用 :func:`is_pending_binding_role` + 判断,避免履约 API、客户页和任务工作台各自实现一套同名角色规则。 + """ + if not isinstance(result, dict) or bool(result.get("bind_confirmed")): + return "" + role_name = str(result.get("role_name") or "").strip() + if not role_name or not bool(result.get("bind_ready_for_confirm")): + return "" + + baseline = str( + result.get("baseline_role_name") or result.get("current_role_name") or "" + ).strip() + baseline_info = result.get("before_bind_info") + # 没有完整 before_bind_info 时无法证明同名角色发生过状态转换。 + # 此时宁可先不展示,也不能把账号历史角色误报成本次绑定结果。 + if is_pending_binding_role( + result, + baseline_role_name=baseline, + baseline_is_bound_act=bool(result.get("baseline_is_bound_act")), + baseline_info=baseline_info, + ): + return role_name + return "" + + +def binding_role_from_result(result: dict[str, Any] | None) -> str: + """返回页面可展示的本次绑定角色。 + + - 待确认:只返回本次扫码产生的新角色。 + - 已确认:返回最终 ``bindAct=1`` 回查角色。 + - 其他状态:返回空,绝不把账号历史角色当成本次结果展示。 + """ + if not isinstance(result, dict): + return "" + pending_role = pending_binding_role_from_result(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 binding_channel(info: dict | None) -> str: """统一游戏渠道展示:区服 / 平台。""" if not isinstance(info, dict): diff --git a/web/backend/services/douyu_runner_bind.py b/web/backend/services/douyu_runner_bind.py index dfda65d..5d0831d 100644 --- a/web/backend/services/douyu_runner_bind.py +++ b/web/backend/services/douyu_runner_bind.py @@ -359,6 +359,30 @@ class BindMixin: if not candidates: return None + ordered = self._ordered_bind_candidates(candidates, prefer_aliases) + + if prefer_pending: + pending = self._pick_pending_role_info( + ordered, + prefer_aliases=prefer_aliases, + baseline_role_name=baseline_role_name, + baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, + ) + if pending is not None: + return pending + for info in ordered: + if str(info.get("role_name") or "").strip(): + return info + return ordered[0] + + @staticmethod + def _ordered_bind_candidates( + candidates: list[dict], + prefer_aliases: list[str] | None, + ) -> list[dict]: + """按业务 alias 优先级稳定排序,供所有角色候选选择复用。""" + def _alias_rank(info: dict) -> int: alias = str(info.get("act_alias") or "") if not prefer_aliases: @@ -369,23 +393,34 @@ class BindMixin: return len(prefer_aliases) + 1 ranked = sorted( - enumerate(candidates), key=lambda item: (_alias_rank(item[1]), item[0]) + enumerate(candidates), + key=lambda item: (_alias_rank(item[1]), item[0]), ) - ordered = [item[1] for item in ranked] + return [item[1] for item in ranked] - if prefer_pending: - for info in ordered: - if self._is_pending_role( - 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: - if str(info.get("role_name") or "").strip(): + def _pick_pending_role_info( + self, + candidates: list[dict], + *, + prefer_aliases: list[str] | None, + baseline_role_name: str = "", + baseline_is_bound_act: bool = False, + baseline_info: dict | None = None, + ) -> dict | None: + """唯一的新角色候选选择入口。 + + “是否 pending”只调用 ``_is_pending_role``;二维码轮询、查询角色和换绑 + 时间查询都从这里选候选,避免各自用角色名或 bindRole 再写一套判断。 + """ + for info in self._ordered_bind_candidates(candidates, prefer_aliases): + if self._is_pending_role( + info, + baseline_role_name=baseline_role_name, + baseline_is_bound_act=baseline_is_bound_act, + baseline_info=baseline_info, + ): return info - return ordered[0] + return None def _pick_current_bound_info( self, @@ -1246,24 +1281,18 @@ class BindMixin: # 1) 优先“已生效绑定”角色(bound_act=1 且有角色名,通常是活动 alias)。 # 避免把扫码后未确认的新角色当成当前绑定结果。 bound_info = self._pick_current_bound_info(candidates, config) - # 2) 待确认角色(cjm 扫码后未确认;无已绑定时也用于首次绑定展示) - pending_info = ( - self._pick_role_info_for_aliases( - candidates, - self._role_alias_priority(config), - pending_only=True, - ) - or self._pick_role_info_for_aliases( - candidates, - self._role_alias_priority(config), - ) - or candidates[0] + # 2) 待确认角色统一交给共享状态机判断。cjm 中与当前绑定同名的残留 + # 不算 pending;同名但活动状态发生 needBindAct 转换才算 pending。 + pending_info = self._pick_pending_role_info( + candidates, + prefer_aliases=self._role_alias_priority(config), + baseline_role_name=str((bound_info or {}).get("role_name") or ""), + baseline_is_bound_act=self._is_bound_act(bound_info), + baseline_info=bound_info, ) - pending_role = str(pending_info.get("role_name") or "").strip() + pending_role = str((pending_info or {}).get("role_name") or "").strip() bound_role = str(bound_info.get("role_name") or "") if bound_info else "" - has_pending = bool(pending_role) and ( - pending_role != bound_role or not bound_info - ) + has_pending = pending_info is not None and bool(pending_role) # 查询结果角色 = 已生效绑定;首次绑定(无绑定)时回退待确认角色 bind_info = ( @@ -1282,7 +1311,7 @@ class BindMixin: "info", "查询角色 " f"aliases={','.join(query_aliases)} bound_hit={(bound_info or {}).get('act_alias') or '-'} " - f"pending_hit={pending_info.get('act_alias') or '-'} " + f"pending_hit={(pending_info or {}).get('act_alias') or '-'} " f"{self._format_bind_summary(bind_info) if bind_info else 'role=- bound_act=-'}", ) # 只有已生效绑定才写账号表;待确认角色不污染 game_name @@ -1371,6 +1400,15 @@ class BindMixin: f"查询换绑时间候选 act={item.get('act_alias') or '-'} " f"{self._format_bind_summary(item)}", ) + current_bound = self._pick_current_bound_info(candidates, config) + pending_info = self._pick_pending_role_info( + candidates, + prefer_aliases=self._role_alias_priority(config), + baseline_role_name=str((current_bound or {}).get("role_name") or ""), + baseline_is_bound_act=self._is_bound_act(current_bound), + baseline_info=current_bound, + ) + pending_role = str((pending_info or {}).get("role_name") or "").strip() # 换绑时间看“当前已绑定”活动态,不要优先 cjm(cjm 常无 changeRoleWaitTime) bind_info = ( self._pick_change_wait_bind_info(candidates, config) or candidates[0] @@ -1401,8 +1439,9 @@ class BindMixin: "query_act_aliases": query_aliases, **snapshot, "change_role_wait_text": wait_text, - "bind_ready_for_confirm": bool(snapshot["role_name"]) - and not snapshot["is_bound_act"], + # 待确认语义统一由 _pick_pending_role_info 决定;这里不再根据 + # “只是有角色名且 bindAct=0”自行推断。 + "bind_ready_for_confirm": pending_info is not None, "bind_confirmed": snapshot["is_bound_act"], "bind_summary": f"act={source_alias or '-'} {self._format_bind_summary(bind_info)}", "bind_candidates": [ @@ -1418,6 +1457,13 @@ class BindMixin: for item in candidates ], } + if ( + pending_info is not None + and pending_role != str(snapshot["role_name"] or "").strip() + ): + result["pending_role_name"] = pending_role + result["pending_area_name"] = str(pending_info.get("area_name") or "") + result["pending_plat_name"] = str(pending_info.get("plat_name") or "") self._push_log( "info", f"查询换绑时间 hit={source_alias or '-'} role={role_name} " diff --git a/web/backend/services/platform_fulfillment/service.py b/web/backend/services/platform_fulfillment/service.py index 9743785..90869d9 100644 --- a/web/backend/services/platform_fulfillment/service.py +++ b/web/backend/services/platform_fulfillment/service.py @@ -24,6 +24,10 @@ from ...models import ( PlatformFulfillmentTask, User, ) +from ..account_binding import ( + binding_role_from_result, + pending_binding_role_from_result, +) from ..douyu_account_state import DouyuLiveAccountState, refresh_douyu_account_state from ..douyu_activity_query import activity_client, query_exchange_eligibility from ..douyu_batch_launcher import start_douyu_batch, stop_douyu_batches @@ -514,39 +518,6 @@ def list_tasks( } -def _pending_binding_role_name(result: dict[str, Any]) -> str: - if bool(result.get("bind_confirmed")) or 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, @@ -569,7 +540,8 @@ def _task_out( else None ) bind_result = (bind_task.result or {}) if bind_task else {} - pending_role = _pending_binding_role_name(bind_result) + # 外层只消费共享绑定规则,不再自己比较角色名或 bindAct。 + pending_role = pending_binding_role_from_result(bind_result) return { "id": task.id, "sourceSystem": task.source_system, @@ -632,7 +604,7 @@ def _task_out( "status": bind_task.status, "message": bind_task.message, "qrUrl": str(bind_result.get("url") or "") if include_qr else "", - "roleName": _binding_role_out(bind_result), + "roleName": binding_role_from_result(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 ""), @@ -715,7 +687,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) + pending_role = pending_binding_role_from_result(bind_result) lease = ( db.query(AccountLease).filter(AccountLease.id == task.lease_id).first() if task.lease_id @@ -742,7 +714,7 @@ 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": _binding_role_out(bind_result), + "roleName": binding_role_from_result(bind_result), "areaName": str(bind_result.get("area_name") or ""), "platName": str(bind_result.get("plat_name") or ""), "bindReadyForConfirm": (bool(pending_role) and not binding_failed), @@ -1245,7 +1217,7 @@ async def start_binding( existing = db.query(DouyuTask).filter(DouyuTask.id == task.bind_task_id).first() if existing: result = existing.result or {} - pending_role = _pending_binding_role_name(result) + pending_role = pending_binding_role_from_result(result) stale_pending = ( bool(result.get("bind_ready_for_confirm")) and not pending_role ) @@ -1329,7 +1301,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) + pending_role = pending_binding_role_from_result(result) if bind_task.status in {"failed", "error", "stopped"}: task.binding_status = "failed" task.execution_status = "manual_required"