From f6343e58c115b4e89e7e3230858103c1a326025b Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Tue, 6 Oct 2026 17:47:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(claim):=20=E5=90=8E=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E5=AF=B9=E6=89=AB=E7=A0=81=20UID=20=E5=90=8E=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E9=A1=B5=E8=B7=9F=E4=B8=8A=EF=BC=8C=E7=BB=91=E5=AE=9A=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=BB=8D=E8=AE=B0=E4=BD=8F=E6=89=AB=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../claim/kuaishou-cloud-claim-service.ts     | 69 ++++++++++++++++---
 .../pages/claim/ClaimAffiliateDashSteps.tsx   |  4 +-
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts b/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts
index 0477f4c2..737f1155 100644
--- a/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts
+++ b/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts
@@ -647,28 +647,62 @@ async function refreshAffiliateDashBindState(task: TaskRow): Promise<TaskRow | n
       orderNo: flow.orderNo,
       bindUuid: flow.bindUuid,
     })
-    const boundAccount = result.bound ? result.gameAccount || flow.boundAccount : ''
+    const scannedAccount = String(result.gameAccount || '').trim()
+    const upstreamExpected = String(result.expectedGameAccount || '').trim()
+    // 后台把期望 UID 改成扫码账号并解除阻断后，领取页跟上这个 UID，买家不用再改一次。
+    const confirmedAccount =
+      result.bound &&
+      scannedAccount &&
+      upstreamExpected &&
+      normalizeUid(upstreamExpected) === normalizeUid(scannedAccount)
+        ? scannedAccount
+        : ''
+    const nextExpected = confirmedAccount || expectedGameAccount
+    // 绑定失败也要留下扫到的 UID。买家改成这个号时继续用原提货链接，不能把号放回公共库存。
+    const boundAccount = result.bound
+      ? scannedAccount || flow.boundAccount
+      : result.mismatch
+        ? scannedAccount || flow.boundAccount
+        : ''
     const localMismatch = Boolean(
       boundAccount &&
-      expectedGameAccount &&
-      normalizeUid(boundAccount) !== normalizeUid(expectedGameAccount),
+      nextExpected &&
+      normalizeUid(boundAccount) !== normalizeUid(nextExpected),
     )
     const now = nowIso()
+    const claimIdentity = readClaimIdentity(taskContext.claimIdentity)
+    const nextClaimIdentity = confirmedAccount
+      ? {
+          ...claimIdentity,
+          expectedUid: confirmedAccount,
+          submittedAt:
+            normalizeUid(claimIdentity.expectedUid) === normalizeUid(confirmedAccount) &&
+            claimIdentity.submittedAt
+              ? claimIdentity.submittedAt
+              : now,
+          source:
+            normalizeUid(claimIdentity.expectedUid) === normalizeUid(confirmedAccount)
+              ? claimIdentity.source || 'claim_page'
+              : 'rock_expected_uid_corrected',
+        }
+      : claimIdentity
     const nextFlow = {
       ...flow,
       bindUuid: result.bindUuid || flow.bindUuid,
       bindUrl: result.bindUrl || flow.bindUrl,
       qrUrl: result.qrUrl || flow.qrUrl,
-      gameAccount: expectedGameAccount || flow.gameAccount,
-      expectedGameAccount: expectedGameAccount || flow.expectedGameAccount,
+      gameAccount: nextExpected || flow.gameAccount,
+      expectedGameAccount: nextExpected || flow.expectedGameAccount,
       bound: result.bound,
       boundAccount,
-      roleName: result.bound
-        ? String(result.roleName || flow.roleName || '').trim()
-        : flow.roleName,
-      gameChannel: result.bound
-        ? String(result.gameChannel || flow.gameChannel || '').trim()
-        : flow.gameChannel,
+      roleName:
+        result.bound || result.mismatch
+          ? String(result.roleName || flow.roleName || '').trim()
+          : flow.roleName,
+      gameChannel:
+        result.bound || result.mismatch
+          ? String(result.gameChannel || flow.gameChannel || '').trim()
+          : flow.gameChannel,
       bindMismatch: Boolean(result.mismatch) || localMismatch,
       lastBindSyncedAt: now,
     }
@@ -677,6 +711,7 @@ async function refreshAffiliateDashBindState(task: TaskRow): Promise<TaskRow | n
       (await updateTask(task.id, {
         context_json: JSON.stringify({
           ...taskContext,
+          claimIdentity: nextClaimIdentity,
           affiliateDash: nextFlow,
         }),
         updated_at: now,
@@ -687,6 +722,18 @@ async function refreshAffiliateDashBindState(task: TaskRow): Promise<TaskRow | n
   }
 }
 
+function readClaimIdentity(value: unknown) {
+  const source =
+    value && typeof value === 'object' && !Array.isArray(value)
+      ? (value as { expectedUid?: unknown; submittedAt?: unknown; source?: unknown })
+      : {}
+  return {
+    expectedUid: String(source.expectedUid || ''),
+    submittedAt: source.submittedAt ? String(source.submittedAt) : '',
+    source: String(source.source || ''),
+  }
+}
+
 function normalizeUid(value: unknown) {
   return String(value || '')
     .trim()
diff --git a/apps/frontend/src/pages/claim/ClaimAffiliateDashSteps.tsx b/apps/frontend/src/pages/claim/ClaimAffiliateDashSteps.tsx
index d193f159..aab405c6 100644
--- a/apps/frontend/src/pages/claim/ClaimAffiliateDashSteps.tsx
+++ b/apps/frontend/src/pages/claim/ClaimAffiliateDashSteps.tsx
@@ -69,7 +69,9 @@ export function AffiliateDashClaimPanel({
               ? '账号已在平台授权，确认无误后提交发货（无需再次扫码）'
               : '账号绑定成功，确认无误后提交发货'
             : rockTokenLocked
-              ? '提货链接已绑定失败，不能更换新的提货号，请联系客服处理'
+              ? boundAccount
+                ? `已扫到账号 ${boundAccount}，请把 UID 改成这个号。仍使用当前提货链接，不能换成别的号`
+                : '提货链接已绑定失败，不能更换新的提货号，请联系客服处理'
               : bindMismatch
                 ? '绑定账号与填写 UID 不一致，请核对 UID 后用正确账号重新绑定'
                 : bound