fix(worker-platform): 拼单取消后可重入，大厅置顶始终优先

2026-10-25 13:08:19 +08:00
parent 7fdef88ba6
commit 81edf530db
7 changed files with 315 additions and 48 deletions
@@ -120,7 +120,10 @@ test('大厅容量先确定全局候选集合，再应用页面筛选条件', ()
  })

  assert.match(query.whereClause, /candidate\.status = 'open'/)
-  assert.match(query.whereClause, /ORDER BY candidate\.hall_queued_at ASC NULLS LAST/)
+  assert.match(
+    query.whereClause,
+    /ORDER BY candidate\.pinned_at DESC NULLS LAST, candidate\.hall_queued_at ASC NULLS LAST/,
+  )
  assert.match(query.whereClause, /LIMIT \$4/)
  const candidateSql = query.whereClause.slice(query.whereClause.indexOf('candidate.status'))
  assert.doesNotMatch(candidateSql, /candidate\.category_id|candidate.*测试商品/)
@@ -1464,7 +1464,7 @@ export function buildWorkOrderWhere({
  }
 }

-/** 大厅容量先选出全局队首，分类、关键词和 VIP 延迟只能在该集合内继续筛选。 */
+/** 大厅容量先选出全局队首（置顶单优先占位），分类、关键词和 VIP 延迟只能在该集合内继续筛选。 */
 function buildHallCandidateIdsSql(limitPlaceholder: string, categoryLimitsPlaceholder: string) {
  return `
    SELECT ranked.id
@@ -1473,14 +1473,15 @@ function buildHallCandidateIdsSql(limitPlaceholder: string, categoryLimitsPlaceh
        candidate.id,
        candidate.category_id,
        candidate.hall_queued_at,
+        candidate.pinned_at,
        COALESCE(candidate_wc.parent_id, candidate.category_id) AS primary_category_id,
        ROW_NUMBER() OVER (
          PARTITION BY COALESCE(candidate_wc.parent_id, candidate.category_id)
-          ORDER BY candidate.hall_queued_at ASC NULLS LAST, candidate.id ASC
+          ORDER BY candidate.pinned_at DESC NULLS LAST, candidate.hall_queued_at ASC NULLS LAST, candidate.id ASC
        ) AS primary_category_rank,
        ROW_NUMBER() OVER (
          PARTITION BY candidate.category_id
-          ORDER BY candidate.hall_queued_at ASC NULLS LAST, candidate.id ASC
+          ORDER BY candidate.pinned_at DESC NULLS LAST, candidate.hall_queued_at ASC NULLS LAST, candidate.id ASC
        ) AS sub_category_rank
      FROM work_orders candidate
      LEFT JOIN work_categories candidate_wc ON candidate_wc.id = candidate.category_id
@@ -1509,7 +1510,8 @@ function buildHallCandidateIdsSql(limitPlaceholder: string, categoryLimitsPlaceh
      OR ranked.category_id = ranked.primary_category_id
      OR ranked.sub_category_rank <= NULLIF(${categoryLimitsPlaceholder}::jsonb ->> ranked.category_id::text, '')::int
    )
-    ORDER BY ranked.hall_queued_at ASC NULLS LAST, ranked.id ASC
+    -- 置顶单必须占住最终候选集的席位，不能被后面的新单挤出 limit。
+    ORDER BY ranked.pinned_at DESC NULLS LAST, ranked.hall_queued_at ASC NULLS LAST, ranked.id ASC
    LIMIT ${limitPlaceholder}
  `
 }
@@ -111,6 +111,24 @@ export function resolveWorkOrderShareJoinQuantity(input: {
  return input.takeRemaining ? Math.max(0, input.remaining) : input.quantity
 }

+/**
+ * 同一打手再次参与同一拼单工单时的处理方式。
+ * 份额表有 UNIQUE(work_order_id, worker_id)，取消的份额会保留用于追溯，
+ * 所以重新拼单必须复用该行并重置为一条全新份额，不能直接插入。
+ */
+export function resolveWorkOrderShareJoinMode(input: {
+  existingShareStatus?: string | null
+  takeRemaining?: boolean
+}): 'create' | 'append' | 'rejoin' | 'reject' {
+  const status = String(input.existingShareStatus || '')
+  if (!status) return 'create'
+  // 取消即结束该次参与，允许打手把同一行重新启用为份额。
+  if (status === 'cancelled') return 'rejoin'
+  // 立即抢单承接剩余份数时才允许在未提交的份额上追加。
+  if (status === 'joined' && input.takeRemaining === true) return 'append'
+  return 'reject'
+}
+
 /**
 * 计算打手当前累计拼单份额实际需要冻结的押金。
 * 等级与个人叠加后的免押额度针对该打手在本工单的累计份额生效；已经冻结的金额不自动回退。
@@ -155,6 +173,8 @@ export async function joinWorkOrderShare(input: {
    | 'sharing_disabled'
    | 'work_order_owner_conflict'
    | 'sharing_quantity_full'
+    | 'worker_share_exists'
+    | 'worker_share_locked'
    | 'worker_active_order_limit'
    | 'worker_deposit_insufficient'
    | null
@@ -213,6 +233,7 @@ export async function joinWorkOrderShare(input: {
      return { share: null, failureReason: 'sharing_quantity_full' }
    }

+    // 取消的份额也一并查出：UNIQUE(work_order_id, worker_id) 下只能复用该行重新加入。
    const existingShareResult = await client.query<WorkOrderShareRow>(
      `SELECT *
       FROM work_order_shares
@@ -221,10 +242,19 @@ export async function joinWorkOrderShare(input: {
      [input.workOrderId, input.workerId],
    )
    const existingShare = existingShareResult.rows[0] || null
-    if (existingShare && (!input.takeRemaining || existingShare.status !== 'joined')) {
-      return { share: null, failureReason: 'sharing_quantity_full' }
+    const joinMode = resolveWorkOrderShareJoinMode({
+      existingShareStatus: existingShare?.status ?? null,
+      takeRemaining: input.takeRemaining === true,
+    })
+    if (joinMode === 'reject') {
+      return {
+        share: null,
+        failureReason:
+          existingShare?.status === 'joined' ? 'worker_share_exists' : 'worker_share_locked',
+      }
    }
-    if (!existingShare) {
+    const revivingCancelledShare = joinMode === 'rejoin'
+    if (joinMode === 'create' || revivingCancelledShare) {
      const activeOrderCount = await countWorkerActiveOrdersWithClient(client, input.workerId)
      if (activeOrderCount >= input.maxActiveOrders) {
        return { share: null, failureReason: 'worker_active_order_limit' }
@@ -232,7 +262,12 @@ export async function joinWorkOrderShare(input: {
    }

    const unitReward = toPositiveInteger(workOrder.sharing_unit_reward, 0)
-    const nextQuantity = Number(existingShare?.quantity || 0) + requestedQuantity
+    // 取消的份额已释放份数与押金，重新加入时按一条全新份额计算。
+    const currentQuantity = revivingCancelledShare ? 0 : Number(existingShare?.quantity || 0)
+    const currentFrozenDeposit = revivingCancelledShare
+      ? 0
+      : Number(existingShare?.share_deposit || 0)
+    const nextQuantity = currentQuantity + requestedQuantity
    const shareReward = nextQuantity * unitReward
    const nextShareDeposit = resolveWorkOrderShareDepositAmount({
      requiredDepositAmount: Number(workOrder.required_deposit_amount || 0),
@@ -241,12 +276,9 @@ export async function joinWorkOrderShare(input: {
      ...(input.depositFreeAmount === undefined
        ? {}
        : { depositFreeAmount: input.depositFreeAmount }),
-      currentFrozenDeposit: Number(existingShare?.share_deposit || 0),
+      currentFrozenDeposit,
    })
-    const depositToFreeze = Math.max(
-      0,
-      nextShareDeposit - Number(existingShare?.share_deposit || 0),
-    )
+    const depositToFreeze = Math.max(0, nextShareDeposit - currentFrozenDeposit)

    const wallet = await getWorkerWalletWithClient(client, input.workerId)
    const available = Number(wallet?.available_amount || 0)
@@ -254,39 +286,66 @@ export async function joinWorkOrderShare(input: {
      return { share: null, failureReason: 'worker_deposit_insufficient' }
    }

-    const shareResult = existingShare
-      ? await client.query<{ id: number }>(
-          `
-            UPDATE work_order_shares
-            SET
-              quantity = $1,
-              unit_reward = $2,
-              share_reward = $3,
-              share_deposit = $4,
-              updated_at = $5
-            WHERE id = $6
-            RETURNING id
-          `,
-          [nextQuantity, unitReward, shareReward, nextShareDeposit, input.now, existingShare.id],
-        )
-      : await client.query<{ id: number }>(
-          `
+    let shareId = 0
+    if (!existingShare) {
+      const inserted = await client.query<{ id: number }>(
+        `
        INSERT INTO work_order_shares (
          work_order_id, worker_id, quantity, unit_reward, share_reward,
          share_deposit, status, acceptance_json, created_at, updated_at
        ) VALUES ($1, $2, $3, $4, $5, $6, 'joined', '{}'::jsonb, $7, $7)
        RETURNING id
      `,
-          [
-            input.workOrderId,
-            input.workerId,
-            requestedQuantity,
-            unitReward,
-            shareReward,
-            nextShareDeposit,
-            input.now,
-          ],
-        )
+        [
+          input.workOrderId,
+          input.workerId,
+          requestedQuantity,
+          unitReward,
+          shareReward,
+          nextShareDeposit,
+          input.now,
+        ],
+      )
+      shareId = Number(inserted.rows[0]?.id || 0)
+    } else if (revivingCancelledShare) {
+      const revived = await client.query<{ id: number }>(
+        `
+          UPDATE work_order_shares
+          SET
+            status = 'joined',
+            quantity = $1,
+            unit_reward = $2,
+            share_reward = $3,
+            share_deposit = $4,
+            acceptance_json = '{}'::jsonb,
+            draft_acceptance_json = '{}'::jsonb,
+            submitted_at = NULL,
+            accepted_at = NULL,
+            created_at = $5,
+            updated_at = $5
+          WHERE id = $6
+          RETURNING id
+        `,
+        [nextQuantity, unitReward, shareReward, nextShareDeposit, input.now, existingShare.id],
+      )
+      shareId = Number(revived.rows[0]?.id || 0)
+    } else {
+      const appended = await client.query<{ id: number }>(
+        `
+          UPDATE work_order_shares
+          SET
+            quantity = $1,
+            unit_reward = $2,
+            share_reward = $3,
+            share_deposit = $4,
+            updated_at = $5
+          WHERE id = $6
+          RETURNING id
+        `,
+        [nextQuantity, unitReward, shareReward, nextShareDeposit, input.now, existingShare.id],
+      )
+      shareId = Number(appended.rows[0]?.id || 0)
+    }

    if (depositToFreeze > 0) {
      const nextAvailable = available - depositToFreeze
@@ -330,13 +389,14 @@ export async function joinWorkOrderShare(input: {
        workerId: input.workerId,
        quantity: requestedQuantity,
        takeRemaining: input.takeRemaining === true,
+        rejoined: revivingCancelledShare,
      }),
      now: input.now,
    })

    const share = await client.query<WorkOrderShareRow>(
      `${WORK_ORDER_SHARE_SELECT} WHERE wos.id = $1 LIMIT 1`,
-      [Number(shareResult.rows[0]?.id || 0)],
+      [shareId],
    )
    return { share: share.rows[0] || null, failureReason: null }
  })