feat(semi-auto): 重构客户资料收集与虎牙绑定确认流程

- 客户资料页按设计稿重构，区服固定四项下拉，游戏编号/角色名校验

- 虎牙登录与绑定页统一深色样式，扫码页新增改用手机号登录

- 待确认角色 UID 改用 huyaUid，不再展示虎牙加密 roleId

- 绑定确认新增两侧角色比对，不一致禁止确认，会话过期引导重新登录

- 新增迁移 168/169 与角色绑定单测，脚本换行符固定为 LF

apps/backend/src/services/semi-auto/binding-role-id.ts

@@ -0,0 +1,16 @@
+/**
+ * 虎牙 checkUserBindGameAccount 返回的 gameRole.roleId 是 40 位加密串，
+ * 无法直接和客户填写的游戏编号比对；平台侧可用于核对的是登录账号的数值 UID（huyaUid）。
+ *
+ * 取数优先级：角色 ID 本身是纯数字 > 数值 UID > 原始角色 ID。
+ * 这样既兼容未来虎牙直接下发数值角色 ID，也避免把加密串展示给客户。
+ */
+export function resolveBindingRoleId(roleId: unknown, huyaUid: unknown): string {
+  const rawRoleId = String(roleId ?? '').trim()
+
+  if (/^\d+$/.test(rawRoleId)) return rawRoleId
+
+  const uid = String(huyaUid ?? '').trim()
+
+  return /^\d+$/.test(uid) ? uid : rawRoleId
+}

apps/backend/src/services/semi-auto/huya-connector-client.ts

@@ -95,8 +95,10 @@ export type ConnectorBindingSession = {
     | 'failed'
   qrImage: string
   qrExpiresAt: string
+  qrUrl: string
   bindGameAccount: string
   bindGameRole: string
+  bindGameRoleId: string
   bindGameChannel: string
   hasExistingBinding?: boolean
   rebindRequested?: boolean

apps/backend/src/services/semi-auto/huya-native/huya-native-connector.ts

@@ -12,6 +12,7 @@ import path from 'node:path'
 import { runtimeConfig } from '../../../config/runtime.js'
 import { createHttpError } from '../../../utils/http.js'
 import { logWarn } from '../../../utils/logger.js'
+import { resolveBindingRoleId } from '../binding-role-id.js'
 import type {
   ConnectorBindingSession,
   ConnectorBrowserTicket,
@@ -62,10 +63,12 @@ type NativeBindingStatus = ConnectorBindingSession['status']
 type NativeBindState = {
   status: NativeBindingStatus
   qrImage: string
+  qrUrl: string
   qrToken: string
   expiresAtMs: number
   account: string
   role: string
+  roleId: string
   channel: string
   hasExistingBinding: boolean
   rebindRequested: boolean
@@ -135,10 +138,12 @@ function defaultBindingState(): NativeBindState {
   return {
     status: 'not_started',
     qrImage: '',
+    qrUrl: '',
     qrToken: '',
     expiresAtMs: 0,
     account: '',
     role: '',
+    roleId: '',
     channel: '',
     hasExistingBinding: false,
     rebindRequested: false,
@@ -223,18 +228,29 @@ function smsBehavior(page = 'https://www.huya.com/g'): { behavior: string; page:
 function parseRole(response: HuyaBindResponse | null): {
   account: string
   role: string
+  roleId: string
   channel: string
 } {
-  if (!response || response.status !== 200) return { account: '', role: '', channel: '' }
+  if (!response || response.status !== 200) {
+    return { account: '', role: '', roleId: '', channel: '' }
+  }
   const data: HuyaGameAccountData = response.accountData
   const account = data.gameAccount.nick || data.gameRole.roleName
   const role = data.gameRole.roleName
   const channel = [data.gameRole.platName, data.gameRole.areaName].filter(Boolean).join(' · ')
-  return { account, role, channel }
+  // 虎牙 checkUserBindGameAccount 的 gameRole.roleId 就是平台侧角色 ID；
+  // 该字段一直存在于 RPC 响应里，之前被丢弃，导致客户页无法做两侧角色比对。
+  const roleId = String(data.gameRole.roleId || '').trim()
+  return { account, role, roleId, channel }
 }
 
-function bindingRoleKey(role: { account: string; role: string; channel: string }): string {
-  return [role.account, role.role, role.channel].join('\u0000')
+function bindingRoleKey(role: {
+  account: string
+  role: string
+  roleId?: string
+  channel: string
+}): string {
+  return [role.account, role.role, role.roleId || '', role.channel].join('\u0000')
 }
 
 function configValues() {
@@ -720,6 +736,7 @@ export class HuyaNativeConnector {
       }
       session.binding.status = 'qr_pending'
       session.binding.qrImage = mini.image
+      session.binding.qrUrl = urls.qrUrl
       session.binding.qrToken = mini.token
       session.binding.expiresAtMs = this.now() + BINDING_QR_TTL_MS
       session.binding.message = options.forceRebind
@@ -1042,12 +1059,13 @@ export class HuyaNativeConnector {
 
   private markRoleReady(
     session: NativeSession,
-    role: { account: string; role: string; channel: string },
+    role: { account: string; role: string; roleId?: string; channel: string },
     existingBinding = false,
   ): void {
     session.binding.status = 'role_ready'
     session.binding.account = role.account
     session.binding.role = role.role
+    session.binding.roleId = role.roleId || ''
     session.binding.channel = role.channel
     session.binding.message = existingBinding
       ? '当前账号已有绑定角色，请确认直接使用'
@@ -1131,8 +1149,10 @@ export class HuyaNativeConnector {
       status: binding.status,
       qrImage: binding.qrImage,
       qrExpiresAt: binding.expiresAtMs ? iso(binding.expiresAtMs) : '',
+      qrUrl: binding.qrUrl,
       bindGameAccount: binding.account,
       bindGameRole: binding.role,
+      bindGameRoleId: resolveBindingRoleId(binding.roleId, session.uid),
       bindGameChannel: binding.channel,
       hasExistingBinding: binding.hasExistingBinding,
       rebindRequested: binding.rebindRequested,

apps/backend/src/services/semi-auto/semi-auto-binding-role.test.ts

@@ -0,0 +1,142 @@
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+
+import { resolveBindingRoleId } from './binding-role-id.js'
+import { compareBindingRole, normalizeCustomerProfile } from './semi-auto-task-service.js'
+
+const task = (id: string, name: string, huyaUid = '') => ({
+  customer_game_id: id,
+  customer_game_role: name,
+  huya_uid: huyaUid,
+})
+
+describe('待确认角色 UID 取数（huyaUid）', () => {
+  it('角色 ID 本身是纯数字时直接使用', () => {
+    assert.equal(resolveBindingRoleId('1192083858', 1199608910400), '1192083858')
+  })
+
+  it('角色 ID 是加密串时改用数值 UID', () => {
+    assert.equal(
+      resolveBindingRoleId('834ee3e75a1bfc9f65fb6b966bac7ef318e68ea', '1199608910400'),
+      '1199608910400',
+    )
+  })
+
+  it('缺少角色 ID 时回退到数值 UID', () => {
+    assert.equal(resolveBindingRoleId('', 1199608910400), '1199608910400')
+  })
+
+  it('没有可用数值 UID 时保留原始角色 ID', () => {
+    assert.equal(
+      resolveBindingRoleId('834ee3e75a1bfc9f65fb6b966bac7ef318e68ea', ''),
+      '834ee3e75a1bfc9f65fb6b966bac7ef318e68ea',
+    )
+    assert.equal(resolveBindingRoleId(null, undefined), '')
+  })
+
+  it('虎牙加密串角色 ID 改用 huyaUid 参与比对', () => {
+    const result = compareBindingRole(task('1199608910400', '大鲨鱼伊塞53', '1199608910400'), {
+      bindGameRole: '大鲨鱼伊塞53',
+      bindGameRoleId: '834ee3e75a1bfc9f65fb6b966bac7ef318e68ea',
+    })
+    assert.equal(result.verdict, 'match')
+    assert.equal(result.boundRoleId, '1199608910400')
+  })
+
+  it('没有 huyaUid 时保留原始加密串，仍判不一致', () => {
+    const result = compareBindingRole(task('1199608910400', '大鲨鱼伊塞53'), {
+      bindGameRole: '大鲨鱼伊塞53',
+      bindGameRoleId: '834ee3e75a1bfc9f65fb6b966bac7ef318e68ea',
+    })
+    assert.equal(result.verdict, 'mismatch')
+    assert.equal(result.boundRoleId, '834ee3e75a1bfc9f65fb6b966bac7ef318e68ea')
+  })
+})
+
+describe('客户填写角色与平台识别角色比对', () => {
+  it('两侧角色 ID 一致时允许确认', () => {
+    const result = compareBindingRole(task('1192083858', '巫师基尔斯84'), {
+      bindGameRole: '巫师基尔斯84',
+      bindGameRoleId: '1192083858',
+    })
+    assert.equal(result.verdict, 'match')
+    assert.equal(result.customerRoleId, '1192083858')
+    assert.equal(result.boundRoleId, '1192083858')
+  })
+
+  it('两侧角色 ID 不一致时禁止确认', () => {
+    const result = compareBindingRole(task('1192083858', '巫师基尔斯84'), {
+      bindGameRole: '我是火星人2222',
+      bindGameRoleId: '166909256',
+    })
+    assert.equal(result.verdict, 'mismatch')
+    assert.match(result.message, /不一致/)
+  })
+
+  it('缺少角色 ID 时退回角色名称比对', () => {
+    const matched = compareBindingRole(task('', '巫师基尔斯84'), {
+      bindGameRole: '巫师基尔斯84',
+      bindGameRoleId: '',
+    })
+    assert.equal(matched.verdict, 'match')
+
+    const mismatched = compareBindingRole(task('', '巫师基尔斯84'), {
+      bindGameRole: '我是火星人2222',
+      bindGameRoleId: '',
+    })
+    assert.equal(mismatched.verdict, 'mismatch')
+  })
+
+  it('两侧都没有可核对信息时标记为 unknown', () => {
+    const result = compareBindingRole(task('', ''), { bindGameRole: '', bindGameRoleId: '' })
+    assert.equal(result.verdict, 'unknown')
+  })
+})
+
+describe('客户角色资料校验', () => {
+  it('清理空白并保留纯数字角色 ID', () => {
+    const profile = normalizeCustomerProfile({
+      roleName: ' 巫师基尔斯84 ',
+      roleId: ' 1192083858 ',
+      serverZone: ' 苹果V区 ',
+    })
+    assert.deepEqual(profile, {
+      roleName: '巫师基尔斯84',
+      roleId: '1192083858',
+      serverZone: '苹果V区',
+    })
+  })
+
+  it('角色 ID 非数字时拒绝保存', () => {
+    assert.throws(
+      () => normalizeCustomerProfile({ roleName: '巫师基尔斯84', roleId: 'abc123' }),
+      /只能是数字/,
+    )
+  })
+
+  it('缺区服时拒绝保存', () => {
+    assert.throws(
+      () => normalizeCustomerProfile({ roleName: '巫师基尔斯84', roleId: '1192083858' }),
+      /区服只能选择/,
+    )
+  })
+
+  it('区服不在固定选项时拒绝保存', () => {
+    assert.throws(
+      () =>
+        normalizeCustomerProfile({
+          roleName: '巫师基尔斯84',
+          roleId: '1192083858',
+          serverZone: '苹果微信区',
+        }),
+      /区服只能选择/,
+    )
+  })
+
+  it('角色名称与角色 ID 都为空时拒绝保存', () => {
+    assert.throws(
+      () => normalizeCustomerProfile({ roleName: ' ', roleId: '', serverZone: '苹果V区' }),
+      /请完整填写区服/,
+    )
+  })
+})

apps/backend/src/services/semi-auto/semi-auto-task-service.ts

@@ -98,7 +98,14 @@ type TaskRow = {
   platform_nickname: string
   bind_game_account: string
   bind_game_role: string
+  bind_game_role_id: string
   bind_game_channel: string
+  customer_game_role_name: string
+  customer_game_role_id: string
+  customer_game_server_zone: string
+  customer_game_id: string
+  customer_game_role: string
+  customer_server_zone: string
   target_quantity: number
   completed_quantity: number
   assigned_admin_user_id: number | null
@@ -175,7 +182,20 @@ function displayStatus(task: TaskRow) {
     return { key: 'failed', label: '需客服处理' }
   }
   if (task.login_status === 'authenticated') {
-    return { key: 'waiting_operator', label: '等待客服处理' }
+    // 虎牙需要客户确认绑定角色后才算授权完成；微博登录即授权。
+    if (task.platform === 'weibo' || task.binding_status === 'confirmed') {
+      return { key: 'waiting_operator', label: '等待客服处理' }
+    }
+    if (task.binding_status === 'role_ready') {
+      return { key: 'binding_confirm', label: '待确认绑定角色' }
+    }
+    if (task.binding_status === 'expired') {
+      return { key: 'binding_expired', label: '绑定二维码已过期' }
+    }
+    if (task.binding_status === 'failed') {
+      return { key: 'binding_failed', label: '绑定失败，需重新扫码' }
+    }
+    return { key: 'waiting_binding', label: '等待客户绑定角色' }
   }
   if (task.login_status === 'scanned') return { key: 'login_scanned', label: '已扫码，确认中' }
   if (task.login_status === 'qr_pending') return { key: 'waiting_login', label: '等待客户登录' }
@@ -205,7 +225,11 @@ function mapTask(task: TaskRow) {
     platformNickname: task.platform_nickname,
     bindGameAccount: task.bind_game_account,
     bindGameRole: task.bind_game_role,
+    bindGameRoleId: task.bind_game_role_id,
     bindGameChannel: task.bind_game_channel,
+    customerGameRoleId: task.customer_game_id || '',
+    customerGameRoleName: task.customer_game_role || '',
+    customerServerZone: task.customer_server_zone || '',
     targetQuantity: Number(task.target_quantity || 1),
     completedQuantity: Number(task.completed_quantity || 0),
     assignedAdminUserId: task.assigned_admin_user_id ? Number(task.assigned_admin_user_id) : null,
@@ -289,13 +313,41 @@ const TASK_SELECT = `
     cfg.semi_auto_config_json,
     credential.credential_status,
     credential.credential_source,
-    credential.credential_updated_at
+    credential.credential_updated_at,
+    COALESCE(
+      NULLIF(task.customer_game_role_id, ''),
+      wo.material_json->'collect'->'fields'->>'gameId',
+      wo.material_json->'collect'->'fields'->>'characterId',
+      ''
+    ) AS customer_game_id,
+    COALESCE(
+      NULLIF(task.customer_game_role_name, ''),
+      NULLIF(wo.material_json->'collect'->'fields'->>'gameNickname', ''),
+      NULLIF(wo.material_json->'collect'->'fields'->>'roleName', ''),
+      ''
+    ) AS customer_game_role,
+    COALESCE(
+      NULLIF(task.customer_game_server_zone, ''),
+      wo.material_json->'collect'->'fields'->>'serverZone',
+      ''
+    ) AS customer_server_zone
   FROM semi_auto_tasks task
   JOIN orders o ON o.id = task.order_id
   JOIN order_items oi ON oi.id = task.order_item_id
   LEFT JOIN manual_fulfillment_configs cfg ON cfg.id = task.manual_fulfillment_config_id
   LEFT JOIN admin_users admin ON admin.id = task.assigned_admin_user_id
   LEFT JOIN semi_auto_credentials credential ON credential.id = task.credential_id
+  LEFT JOIN LATERAL (
+    SELECT candidate.material_json
+    FROM work_orders candidate
+    WHERE candidate.order_item_id = task.order_item_id
+       OR (candidate.order_item_id IS NULL AND candidate.order_id = task.order_id)
+       OR (o.platform_order_id <> '' AND candidate.platform_order_id = o.platform_order_id)
+    ORDER BY (candidate.order_item_id = task.order_item_id) DESC NULLS LAST,
+             (candidate.order_id = task.order_id) DESC NULLS LAST,
+             candidate.id DESC
+    LIMIT 1
+  ) wo ON TRUE
 `
 
 async function loadTask(taskId: number): Promise<TaskRow> {
@@ -354,6 +406,24 @@ function assertHuyaTask(task: TaskRow) {
   }
 }
 
+/**
+ * 半自动订单没有工单，资料页 /c/<订单号> 是唯一入口。
+ * 未提交区服 / 游戏编号 / 角色名时，不允许开始登录，避免后续无法比对角色。
+ */
+function assertCustomerProfileReady(task: TaskRow) {
+  if (task.platform !== 'huya') return
+  if (
+    !String(task.customer_game_server_zone || '').trim() ||
+    !String(task.customer_game_role_id || '').trim() ||
+    !String(task.customer_game_role_name || '').trim()
+  ) {
+    throw createHttpError('请先提交游戏角色资料', {
+      statusCode: 409,
+      errorCode: 'semi_auto_profile_required',
+    })
+  }
+}
+
 async function createLoginSessionForTask(
   task: TaskRow,
   orderNo: string,
@@ -679,6 +749,98 @@ export async function markCustomerLinkOpened(orderNoInput: unknown, taskIdInput:
   return { ok: true }
 }
 
+export type CustomerProfileInput = {
+  roleName?: unknown
+  roleId?: unknown
+  serverZone?: unknown
+}
+
+const CUSTOMER_SERVER_ZONES = new Set(['苹果Q区', '苹果V区', '安卓Q区', '安卓V区'])
+
+export function normalizeCustomerProfile(input: CustomerProfileInput = {}) {
+  const roleName = String(input.roleName ?? '')
+    .trim()
+    .slice(0, 100)
+  const roleId = String(input.roleId ?? '')
+    .replace(/\s+/g, '')
+    .slice(0, 64)
+  const serverZone = String(input.serverZone ?? '')
+    .trim()
+    .slice(0, 100)
+  if (roleId && !/^\d+$/.test(roleId)) {
+    throw createHttpError('游戏编号 / 角色 ID 只能是数字', {
+      statusCode: 400,
+      errorCode: 'semi_auto_profile_role_id_invalid',
+    })
+  }
+  if (!CUSTOMER_SERVER_ZONES.has(serverZone)) {
+    throw createHttpError('区服只能选择 苹果Q区 / 苹果V区 / 安卓Q区 / 安卓V区', {
+      statusCode: 400,
+      errorCode: 'semi_auto_profile_server_zone_invalid',
+    })
+  }
+  if (!roleName || !roleId) {
+    throw createHttpError('请完整填写区服、游戏编号和角色名', {
+      statusCode: 400,
+      errorCode: 'semi_auto_profile_required',
+    })
+  }
+  return { roleName, roleId, serverZone }
+}
+
+/**
+ * 半自动订单没有 work_orders，客户资料只能在授权页 /c/<订单号> 收集。
+ * 保存后立即参与“客户填写角色 vs 平台识别角色”的比对。
+ */
+export async function savePublicTaskProfile(
+  orderNoInput: unknown,
+  taskIdInput: unknown,
+  payload: CustomerProfileInput = {},
+) {
+  const orderNo = normalizeOrderNo(orderNoInput)
+  const taskId = normalizeId(taskIdInput)
+  const task = await loadTaskForOrder(orderNo, taskId)
+  if (task.platform !== 'huya') {
+    throw createHttpError('当前平台不需要填写游戏角色', {
+      statusCode: 409,
+      errorCode: 'semi_auto_profile_not_supported',
+    })
+  }
+  if (task.execution_status === 'completed' || task.execution_status === 'cancelled') {
+    throw createHttpError('当前订单已结束，不能修改角色资料', {
+      statusCode: 409,
+      errorCode: 'semi_auto_task_closed',
+    })
+  }
+  if (task.binding_status === 'confirmed') {
+    throw createHttpError('绑定已确认，不能修改角色资料', {
+      statusCode: 409,
+      errorCode: 'semi_auto_profile_locked',
+    })
+  }
+  const profile = normalizeCustomerProfile(payload)
+  await withTransaction(async (client) => {
+    await client.query(
+      `
+        UPDATE semi_auto_tasks
+        SET customer_game_role_name = $2,
+            customer_game_role_id = $3,
+            customer_game_server_zone = $4,
+            updated_at = NOW()
+        WHERE id = $1
+      `,
+      [task.id, profile.roleName, profile.roleId, profile.serverZone],
+    )
+    await appendTaskEvent(client, task.id, {
+      eventType: 'customer_profile_saved',
+      actorType: 'customer',
+      detail: profile,
+    })
+  })
+  const updated = await loadTask(task.id)
+  return { task: mapTask(updated) }
+}
+
 function mapLoginUpdate(session: ConnectorLoginSession) {
   const statusMap: Record<ConnectorLoginSession['status'], LoginStatus> = {
     verification_pending: 'waiting_login',
@@ -705,8 +867,13 @@ async function updateLoginTask(
   options: { credentialSource?: 'qr' | 'sms'; method?: 'qr' | 'sms' } = {},
 ) {
   const mapped = mapLoginUpdate(session)
+  // 虎牙登录成功还不算授权完成，必须等客户确认绑定角色；微博登录即授权。
   const nextExecutionStatus: ExecutionStatus =
-    mapped.status === 'authenticated' ? 'waiting_operator' : task.execution_status
+    mapped.status === 'authenticated'
+      ? task.platform === 'weibo' || task.binding_status === 'confirmed'
+        ? 'waiting_operator'
+        : 'waiting_customer'
+      : task.execution_status
   const storedCredential =
     mapped.status === 'authenticated' && mapped.hasCredential
       ? task.platform === 'weibo'
@@ -779,27 +946,86 @@ function mapBindingUpdate(session: ConnectorBindingSession) {
   return {
     status: statusMap[session.status] || 'failed',
     qrImage: String(session.qrImage || ''),
+    qrExpiresAt: String(session.qrExpiresAt || ''),
+    qrUrl: String(session.qrUrl || ''),
     bindGameAccount: String(session.bindGameAccount || ''),
     bindGameRole: String(session.bindGameRole || ''),
+    bindGameRoleId: String(session.bindGameRoleId || ''),
     bindGameChannel: String(session.bindGameChannel || ''),
+    hasExistingBinding: session.hasExistingBinding === true,
+    rebindRequested: session.rebindRequested === true,
     message: String(session.message || ''),
   }
 }
 
+export type BindingRoleComparison = {
+  verdict: 'match' | 'mismatch' | 'unknown'
+  customerRoleName: string
+  customerRoleId: string
+  boundRoleName: string
+  boundRoleId: string
+  message: string
+}
+
+function normalizeRoleText(value: unknown): string {
+  return String(value ?? '')
+    .replace(/\s+/g, '')
+    .toLowerCase()
+}
+
+/**
+ * 客户填写角色与平台识别角色必须一致才允许确认绑定。
+ *
+ * 两侧都有角色 ID 时以 ID 为准（截图里的“两侧角色 ID 不一致”）；
+ * 任一侧缺 ID 时退回角色名比对；两边都取不到才判 unknown，转客服核对。
+ */
+export function compareBindingRole(
+  task: Pick<TaskRow, 'customer_game_id' | 'customer_game_role' | 'huya_uid'>,
+  binding: { bindGameRole?: string; bindGameRoleId?: string },
+): BindingRoleComparison {
+  const customerRoleName = String(task.customer_game_role || '').trim()
+  const customerRoleId = String(task.customer_game_id || '').trim()
+  const boundRoleName = String(binding.bindGameRole || '').trim()
+  const rawBoundRoleId = String(binding.bindGameRoleId || '').trim()
+  // 虎牙 gameRole.roleId 是 40 位加密串，客户填写的是数值游戏编号；
+  // 平台侧可比对的是登录账号的数值 UID（huyaUid），不能拿加密串直接比对。
+  const numericHuyaUid = /^\d+$/.test(String(task.huya_uid || '').trim())
+    ? String(task.huya_uid).trim()
+    : ''
+  const boundRoleId = /^\d+$/.test(rawBoundRoleId)
+    ? rawBoundRoleId
+    : numericHuyaUid || rawBoundRoleId
+  const base = { customerRoleName, customerRoleId, boundRoleName, boundRoleId }
+  if (customerRoleId && boundRoleId) {
+    return customerRoleId === boundRoleId
+      ? { ...base, verdict: 'match', message: '两侧角色 ID 一致，可确认绑定' }
+      : { ...base, verdict: 'mismatch', message: '两侧角色 ID 不一致，无法确认绑定' }
+  }
+  if (customerRoleName && boundRoleName) {
+    return normalizeRoleText(customerRoleName) === normalizeRoleText(boundRoleName)
+      ? { ...base, verdict: 'match', message: '两侧角色名称一致，可确认绑定' }
+      : { ...base, verdict: 'mismatch', message: '两侧角色名称不一致，无法确认绑定' }
+  }
+  return {
+    ...base,
+    verdict: 'unknown',
+    message: '未获取到可核对的两侧角色信息，请联系客服核对后再确认',
+  }
+}
+
 async function updateBindingTask(
   task: TaskRow,
   session: ConnectorBindingSession,
   actorType: TaskActorType,
 ) {
   const mapped = mapBindingUpdate(session)
+  const comparison = compareBindingRole(task, mapped)
   const executionStatus: ExecutionStatus =
     mapped.status === 'confirmed'
       ? 'waiting_operator'
-      : mapped.status === 'failed' || mapped.status === 'expired'
-        ? 'failed'
-        : task.execution_status === 'completed' || task.execution_status === 'cancelled'
-          ? task.execution_status
-          : 'waiting_customer'
+      : task.execution_status === 'completed' || task.execution_status === 'cancelled'
+        ? task.execution_status
+        : 'waiting_customer'
   await withTransaction(async (client) => {
     await client.query(
       `
@@ -807,6 +1033,7 @@ async function updateBindingTask(
         SET binding_status = $2,
             bind_game_account = CASE WHEN $3 <> '' THEN $3 ELSE bind_game_account END,
             bind_game_role = CASE WHEN $4 <> '' THEN $4 ELSE bind_game_role END,
+            bind_game_role_id = CASE WHEN $8 <> '' THEN $8 ELSE bind_game_role_id END,
             bind_game_channel = CASE WHEN $5 <> '' THEN $5 ELSE bind_game_channel END,
             bound_at = CASE WHEN $2 IN ('role_ready', 'confirmed') THEN COALESCE(bound_at, NOW()) ELSE bound_at END,
             execution_status = $6,
@@ -822,6 +1049,7 @@ async function updateBindingTask(
         mapped.bindGameChannel,
         executionStatus,
         mapped.message,
+        mapped.bindGameRoleId,
       ],
     )
     await appendTaskEvent(client, task.id, {
@@ -834,7 +1062,9 @@ async function updateBindingTask(
       detail: {
         gameAccount: mapped.bindGameAccount,
         gameRole: mapped.bindGameRole,
+        gameRoleId: mapped.bindGameRoleId,
         gameChannel: mapped.bindGameChannel,
+        verdict: comparison.verdict,
         message: mapped.message,
       },
     })
@@ -842,10 +1072,16 @@ async function updateBindingTask(
   return {
     status: mapped.status,
     qrImage: mapped.qrImage,
+    qrExpiresAt: mapped.qrExpiresAt,
+    qrUrl: mapped.qrUrl,
     bindGameAccount: mapped.bindGameAccount,
     bindGameRole: mapped.bindGameRole,
+    bindGameRoleId: mapped.bindGameRoleId,
     bindGameChannel: mapped.bindGameChannel,
+    hasExistingBinding: mapped.hasExistingBinding,
+    rebindRequested: mapped.rebindRequested,
     message: mapped.message,
+    comparison,
   }
 }
 
@@ -854,6 +1090,7 @@ export async function startPublicLogin(orderNoInput: unknown, taskIdInput: unkno
   const taskId = normalizeId(taskIdInput)
   await ensureSemiAutoTasksForOrder(orderNo)
   const task = await loadTaskForOrder(orderNo, taskId)
+  assertCustomerProfileReady(task)
   if (task.execution_status === 'completed' || task.execution_status === 'cancelled') {
     throw createHttpError('当前订单已结束，不能重新登录', {
       statusCode: 409,
@@ -907,6 +1144,13 @@ export async function startPublicLogin(orderNoInput: unknown, taskIdInput: unkno
         UPDATE semi_auto_tasks
         SET connector_session_id = $2,
             login_status = 'qr_pending',
+            binding_status = 'not_started',
+            bind_game_account = '',
+            bind_game_role = '',
+            bind_game_role_id = '',
+            bind_game_channel = '',
+            binding_started_at = NULL,
+            bound_at = NULL,
             execution_status = 'waiting_customer',
             auth_started_at = COALESCE(auth_started_at, NOW()),
             last_error = '',
@@ -1027,6 +1271,13 @@ export async function confirmPublicBinding(orderNoInput: unknown, taskIdInput: u
     })
   }
   const session = await getBindingForTask(task, task.connector_session_id)
+  const comparison = compareBindingRole(task, session)
+  if (comparison.verdict === 'mismatch') {
+    throw createHttpError(comparison.message, {
+      statusCode: 409,
+      errorCode: 'semi_auto_binding_role_mismatch',
+    })
+  }
   const binding = await updateBindingTask(task, session, 'customer')
   const updated = await loadTask(task.id)
   return { task: mapTask(updated), binding }
@@ -1041,6 +1292,7 @@ export async function sendPublicHuyaSmsCode(
   const taskId = normalizeId(taskIdInput)
   const task = await loadTaskForOrder(orderNo, taskId)
   assertHuyaTask(task)
+  assertCustomerProfileReady(task)
   if (task.execution_status === 'completed' || task.execution_status === 'cancelled') {
     throw createHttpError('当前订单已结束，不能重新登录', {
       statusCode: 409,
@@ -1190,6 +1442,7 @@ export async function loginPublicHuyaSms(
   const taskId = normalizeId(taskIdInput)
   const task = await loadTaskForOrder(orderNo, taskId)
   assertHuyaTask(task)
+  assertCustomerProfileReady(task)
   if (task.execution_status === 'completed' || task.execution_status === 'cancelled') {
     throw createHttpError('当前订单已结束，不能重新登录', {
       statusCode: 409,

apps/backend/src/services/semi-auto/weibo-native/weibo-native-connector.ts

@@ -1076,8 +1076,10 @@ export class WeiboNativeConnector {
       status: 'confirmed',
       qrImage: '',
       qrExpiresAt: '',
+      qrUrl: '',
       bindGameAccount: account?.nickname || '',
       bindGameRole: account?.uid || '',
+      bindGameRoleId: account?.uid || '',
       bindGameChannel: '微博',
       hasExistingBinding: true,
       rebindRequested: false,