From 4867861b8b08377e660a87f0c574edaf9ccccce9 Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Tue, 18 Aug 2026 18:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E6=8E=A5=E5=8D=95=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E4=BA=8B=E5=8A=A1=E4=B8=80=E8=87=B4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/repositories/worker-platform/types.ts       |  2 ++
 .../src/repositories/worker-platform/worker-repo.ts | 13 +++++++++++++
 .../src/services/worker-platform/worker-service.ts  |  5 +----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/backend/src/repositories/worker-platform/types.ts b/apps/backend/src/repositories/worker-platform/types.ts
index 5df4d2a5..1e9a9d5a 100644
--- a/apps/backend/src/repositories/worker-platform/types.ts
+++ b/apps/backend/src/repositories/worker-platform/types.ts
@@ -359,6 +359,8 @@ export type CreateWorkerInput = {
   workerType?: string
   inviterId?: number | null
   inviteCode: string
+  /** 注册场景下与账号、钱包在同一事务内消费验证码。 */
+  smsCodeId?: number
   now: string
 }
 
diff --git a/apps/backend/src/repositories/worker-platform/worker-repo.ts b/apps/backend/src/repositories/worker-platform/worker-repo.ts
index 9ed8d1d4..2396a2c8 100644
--- a/apps/backend/src/repositories/worker-platform/worker-repo.ts
+++ b/apps/backend/src/repositories/worker-platform/worker-repo.ts
@@ -351,6 +351,19 @@ export async function createWorkerUser(input: CreateWorkerInput): Promise<Worker
     )
     const workerId = Number(result.rows[0]?.id || 0)
     await ensureWorkerWalletWithClient(client, workerId, input.now)
+    if (input.smsCodeId) {
+      const consumed = await client.query(
+        `
+          UPDATE worker_sms_codes
+          SET consumed_at = $2
+          WHERE id = $1 AND consumed_at IS NULL
+        `,
+        [input.smsCodeId, input.now],
+      )
+      if (consumed.rowCount !== 1) {
+        throw new Error('worker_sms_code_consume_conflict')
+      }
+    }
     return getWorkerUserByIdWithClient(client, workerId)
   })
 }
diff --git a/apps/backend/src/services/worker-platform/worker-service.ts b/apps/backend/src/services/worker-platform/worker-service.ts
index 861fbbd4..37154f38 100644
--- a/apps/backend/src/services/worker-platform/worker-service.ts
+++ b/apps/backend/src/services/worker-platform/worker-service.ts
@@ -10,7 +10,6 @@ import {
   countWorkerWithdrawRequestsOnDay,
   countWorkOrderPendingSharingSubmissions,
   countWorkerSmsCodesOnDay,
-  consumeWorkerSmsCode,
   createWorkerSmsCode,
   createWorkOrderEvent,
   createWorkerFinanceRequest,
@@ -331,6 +330,7 @@ export async function registerWorker(payload: JsonObject = {}) {
     status: 'pending_review',
     inviterId: inviter ? Number(inviter.id) : null,
     inviteCode: await generateInviteCode(now),
+    smsCodeId: latest!.id,
     now,
   })
 
@@ -341,9 +341,6 @@ export async function registerWorker(payload: JsonObject = {}) {
     })
   }
 
-  // 账号创建成功后再消费验证码，避免邀请码、昵称或数据库异常导致验证码提前失效。
-  await consumeWorkerSmsCode(latest!.id, nowIso())
-
   return {
     worker: mapWorkerUser(created),
     reviewRequired: true,