fix(fulfillment): 修正直播账号履约绑定与取消流程
- 按活动 alias 与 cjm 双角色快照建立绑定 baseline,避免旧角色被误判为本次扫码 - 确认绑定任务固化目标角色,禁止回退确认旧角色 - 绑定失败状态优先于旧待确认标记,并支持客服重置客户角色资料 - 取消任务改为终态幂等操作,停止关联批次并默认释放账号和租约 - 补充双角色选择、重置绑定和取消释放账号测试
This commit is contained in:
@@ -267,6 +267,78 @@ class BindMixin:
|
||||
results.append(info)
|
||||
return results
|
||||
|
||||
def _role_alias_priority(self, config: dict, primary_alias: str = "") -> list[str]:
|
||||
"""角色来源优先级:当前动作 alias > cjm/legacy 最新态。"""
|
||||
ordered = [
|
||||
primary_alias,
|
||||
str(config.get("confirm_act_alias") or "").strip(),
|
||||
str(config.get("bind_act_alias") or "").strip(),
|
||||
str(config.get("legacy_act_alias") or "").strip(),
|
||||
]
|
||||
aliases: list[str] = []
|
||||
for alias in ordered:
|
||||
if alias and alias not in aliases:
|
||||
aliases.append(alias)
|
||||
return aliases
|
||||
|
||||
def _pick_role_info_for_aliases(
|
||||
self,
|
||||
candidates: list[dict],
|
||||
aliases: list[str],
|
||||
*,
|
||||
pending_only: bool = False,
|
||||
exclude_role_name: str = "",
|
||||
required_role_name: str = "",
|
||||
) -> dict | None:
|
||||
"""按 alias 优先级取角色;可排除指定旧角色,只找发生变化的角色。"""
|
||||
excluded = exclude_role_name.strip().casefold()
|
||||
required = required_role_name.strip().casefold()
|
||||
for alias in aliases:
|
||||
for info in candidates:
|
||||
if str(info.get("act_alias") or "") != alias:
|
||||
continue
|
||||
role_name = str(info.get("role_name") or "").strip()
|
||||
if not role_name:
|
||||
continue
|
||||
if pending_only and self._is_bound_act(info):
|
||||
continue
|
||||
if excluded and role_name.casefold() == excluded:
|
||||
continue
|
||||
if required and role_name.casefold() != required:
|
||||
continue
|
||||
return info
|
||||
return None
|
||||
|
||||
def _pick_target_role_info(
|
||||
self,
|
||||
candidates: list[dict],
|
||||
config: dict,
|
||||
*,
|
||||
primary_alias: str = "",
|
||||
) -> dict | None:
|
||||
"""选本次操作要确认的角色,优先使用活动 alias 上的新待确认角色。"""
|
||||
if not candidates:
|
||||
return None
|
||||
bound = self._pick_current_bound_info(
|
||||
candidates,
|
||||
config,
|
||||
extra_prefer_aliases=[primary_alias] if primary_alias else None,
|
||||
)
|
||||
aliases = self._role_alias_priority(config, primary_alias)
|
||||
if bound is not None:
|
||||
changed_pending = self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
aliases,
|
||||
pending_only=True,
|
||||
exclude_role_name=str(bound.get("role_name") or ""),
|
||||
)
|
||||
return changed_pending or bound
|
||||
return self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
aliases,
|
||||
pending_only=True,
|
||||
) or self._pick_role_info_for_aliases(candidates, aliases)
|
||||
|
||||
def _pick_bind_info(
|
||||
self,
|
||||
candidates: list[dict],
|
||||
@@ -345,15 +417,21 @@ class BindMixin:
|
||||
candidates: list[dict],
|
||||
config: dict,
|
||||
) -> dict | None:
|
||||
"""选“扫码前当前已绑定角色”作为 baseline。
|
||||
"""选“扫码前当前角色”作为 baseline。
|
||||
|
||||
活动 alias(20260120QYOOB)只反映当前已绑定;
|
||||
cjm 才是换绑最新态。baseline 应优先活动 alias 的已绑定结果,
|
||||
避免把 cjm 上的待确认新角色误当成扫码前旧角色。
|
||||
活动 alias(20260120QYOOB)上的已绑定或已选待确认角色都可能是
|
||||
上一次残留。baseline 必须覆盖这两种状态,否则旧角色会被误判成
|
||||
本次扫码产生的新角色。
|
||||
"""
|
||||
if not candidates:
|
||||
return None
|
||||
return self._pick_current_bound_info(candidates, config)
|
||||
current_bound = self._pick_current_bound_info(candidates, config)
|
||||
if current_bound is not None:
|
||||
return current_bound
|
||||
return self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
self._role_alias_priority(config),
|
||||
)
|
||||
|
||||
def _wait_bind_role_result(
|
||||
self,
|
||||
@@ -694,28 +772,59 @@ class BindMixin:
|
||||
db, task, "failed", "查询绑定信息失败,请检查 Cookie 或 actAlias"
|
||||
)
|
||||
return
|
||||
before = (
|
||||
self._pick_bind_info(
|
||||
before_candidates,
|
||||
baseline_role_name="",
|
||||
baseline_is_bound_act=False,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
)
|
||||
or before_candidates[0]
|
||||
)
|
||||
before_snapshot = self._bind_snapshot(before)
|
||||
role_name = before_snapshot["role_name"]
|
||||
query_alias = str(before.get("act_alias") or "")
|
||||
# 确认前“已生效绑定”角色(bound_act=1),确认失败/回查失败时写库用,避免待确认角色污染 game_name
|
||||
before_bound = self._pick_current_bound_info(
|
||||
before_candidates,
|
||||
config,
|
||||
extra_prefer_aliases=[confirm_alias],
|
||||
)
|
||||
expected_role_name = str(
|
||||
(task.result or {}).get("expected_role_name") or ""
|
||||
).strip()
|
||||
if expected_role_name:
|
||||
before = self._pick_role_info_for_aliases(
|
||||
before_candidates,
|
||||
self._role_alias_priority(config, confirm_alias),
|
||||
required_role_name=expected_role_name,
|
||||
)
|
||||
else:
|
||||
before = self._pick_target_role_info(
|
||||
before_candidates,
|
||||
config,
|
||||
primary_alias=confirm_alias,
|
||||
)
|
||||
before = before or before_bound or before_candidates[0]
|
||||
before_snapshot = self._bind_snapshot(before)
|
||||
role_name = before_snapshot["role_name"]
|
||||
query_alias = str(before.get("act_alias") or "")
|
||||
if expected_role_name and role_name.casefold() != expected_role_name.casefold():
|
||||
self._mark_task(
|
||||
db,
|
||||
task,
|
||||
"failed",
|
||||
f"待确认角色已变化,未找到: {expected_role_name}",
|
||||
{
|
||||
"act_alias": confirm_alias,
|
||||
"query_act_aliases": query_aliases,
|
||||
"expected_role_name": expected_role_name,
|
||||
"bind_ready_for_confirm": False,
|
||||
"bind_confirmed": False,
|
||||
"bind_phase": "confirm_failed",
|
||||
"bind_candidates": [
|
||||
{
|
||||
"act_alias": item.get("act_alias"),
|
||||
"role_name": item.get("role_name"),
|
||||
"is_bound_act": self._is_bound_act(item),
|
||||
}
|
||||
for item in before_candidates
|
||||
],
|
||||
},
|
||||
)
|
||||
return
|
||||
self._push_log(
|
||||
"info",
|
||||
f"确认前状态 confirm_act={confirm_alias or '-'} hit={query_alias or '-'} "
|
||||
f"expected={expected_role_name or '-'} "
|
||||
f"{self._format_bind_summary(before)}",
|
||||
)
|
||||
if not role_name:
|
||||
@@ -1131,10 +1240,14 @@ class BindMixin:
|
||||
bound_info = self._pick_current_bound_info(candidates, config)
|
||||
# 2) 待确认角色(cjm 扫码后未确认;无已绑定时也用于首次绑定展示)
|
||||
pending_info = (
|
||||
self._pick_bind_info(
|
||||
self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
self._role_alias_priority(config),
|
||||
pending_only=True,
|
||||
)
|
||||
or self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
self._role_alias_priority(config),
|
||||
)
|
||||
or candidates[0]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user