feat:拼单明细管理加一个撤份额的功能,指定数量

This commit is contained in:
2026-10-25 13:44:34 +08:00
parent a7a8634a96
commit 9c620d39cb
16 changed files with 627 additions and 3 deletions
@@ -365,6 +365,10 @@ export type WorkOrderShareRow = {
timeout_policy?: string
/** 取消来源:timeout/worker_request/admin/problem/settlement */
cancelled_reason?: string
/** 后台撤单/撤份额时填写的原因(自由文本,选填),仅用于列表展示 */
cancel_note?: string
/** 被撤掉的份数(撤份额累计 / 单人撤单为整份份数;0 = 未撤过) */
cancel_quantity?: number
/** 份额级问题单:备注 / 标记时间(NULL = 正常)/ 操作人;不影响母单状态 */
problem_note?: string
problem_marked_at?: string | null
@@ -817,13 +817,15 @@ export async function cancelWorkOrderShare(input: {
`UPDATE work_order_shares
SET status = 'cancelled',
cancelled_reason = 'admin',
cancel_note = $2,
cancel_quantity = COALESCE(quantity, 0),
acceptance_json = '{}'::jsonb,
draft_acceptance_json = '{}'::jsonb,
submitted_at = NULL,
accepted_at = NULL,
updated_at = $1
WHERE id = $2`,
[input.now, input.shareId],
WHERE id = $3`,
[input.now, String(input.reason || '').trim(), input.shareId],
)
// 母单状态保持不变:这里只取消这一份份额,不再按剩余份额重推母单状态。
// (旧实现会 recompute:待验收的母单撤掉一份后 allocated < total → 变回 open,
@@ -1,6 +1,7 @@
import type { PoolClient } from 'pg'
import { query, withTransaction } from '../../db/client.js'
import { resolveShareReduceTargetQuantity } from '../../domain/work-order-share-quantity.js'
import {
ensureWorkerWalletWithClient,
getWorkerWalletWithClient,
@@ -11,6 +12,7 @@ import { createWorkOrderEventWithClient } from './work-order-event-repo.js'
import {
countWorkerActiveOrdersWithClient,
getWorkOrderById,
getWorkOrderByIdWithClient,
isWorkOrderWithinHallCapacityWithClient,
} from './work-order-repo.js'
import type { WorkOrderRow, WorkOrderShareRow } from './types.js'
@@ -414,6 +416,123 @@ export async function joinWorkOrderShare(input: {
})
}
/**
* 后台按份数撤销某个打手的部分份额。
*
* 只改这一行的数量与份额报酬:
* - 大厅余量 = 总份数 − Σ 有效份额数量,所以减少的份数会自动回到大厅;
* - 母单状态不动(与「单人撤单」同口径);
* - 押金按要求保持原冻结额,不做退还;
* - 验收资料(验收图/视频/备注)留在原份额上,不清空。
*/
export async function reduceWorkOrderShareQuantity(input: {
workOrderId: number
shareId: number
reduceQuantity: number
note?: string
actorName?: string
now: string
}): Promise<{
order: WorkOrderRow | null
share: WorkOrderShareRow | null
failureReason:
| 'work_order_not_reducible'
| 'share_not_found'
| 'share_status_not_reducible'
| 'share_quantity_invalid'
| null
}> {
return withTransaction(async (client) => {
const orderResult = await client.query<WorkOrderRow>(
`SELECT * FROM work_orders WHERE id = $1 FOR UPDATE`,
[input.workOrderId],
)
const workOrder = orderResult.rows[0] || null
if (
!workOrder ||
!['open', 'in_progress', 'pending_acceptance'].includes(String(workOrder.status || ''))
) {
return { order: workOrder, share: null, failureReason: 'work_order_not_reducible' as const }
}
const shareResult = await client.query<WorkOrderShareRow>(
`SELECT * FROM work_order_shares WHERE id = $1 AND work_order_id = $2 FOR UPDATE`,
[input.shareId, input.workOrderId],
)
const share = shareResult.rows[0] || null
if (!share) {
return { order: workOrder, share: null, failureReason: 'share_not_found' as const }
}
if (!['joined', 'submitted'].includes(String(share.status || ''))) {
return { order: workOrder, share, failureReason: 'share_status_not_reducible' as const }
}
const target = resolveShareReduceTargetQuantity({
currentQuantity: Number(share.quantity || 0),
reduceQuantity: input.reduceQuantity,
})
if (target.failureReason || target.nextQuantity <= 0) {
return { order: workOrder, share, failureReason: 'share_quantity_invalid' as const }
}
const unitReward = toPositiveInteger(share.unit_reward, 0)
const nextRewardAmount = target.nextQuantity * unitReward
// 原因只做展示:本次没填就保留上一次填的,避免后续撤份额把已有说明覆盖成空
const nextCancelNote = String(input.note || '').trim() || String(share.cancel_note || '')
// 撤销份数累计:同一份额多次撤份额时,列表显示总共撤了多少份
const nextCancelQuantity =
Math.max(0, Number(share.cancel_quantity || 0)) + input.reduceQuantity
await client.query(
`UPDATE work_order_shares
SET quantity = $1, share_reward = $2, cancel_note = $3,
cancel_quantity = $4, updated_at = $5
WHERE id = $6`,
[
target.nextQuantity,
nextRewardAmount,
nextCancelNote,
nextCancelQuantity,
input.now,
input.shareId,
],
)
await createWorkOrderEventWithClient(client, {
workOrderId: input.workOrderId,
actorType: 'admin',
actorId: input.actorName || '',
eventType: 'sharing_share_quantity_reduced',
fromStatus: workOrder.status,
toStatus: workOrder.status,
payloadJson: JSON.stringify({
shareId: input.shareId,
workerId: Number(share.worker_id || 0),
fromQuantity: Number(share.quantity || 0),
toQuantity: target.nextQuantity,
reduceQuantity: input.reduceQuantity,
rewardBefore: Number(share.share_reward || 0),
rewardAfter: nextRewardAmount,
// 押金口径:本次保持原冻结额,不退不补
shareDeposit: Number(share.share_deposit || 0),
note: String(input.note || '').trim(),
}),
now: input.now,
})
const updatedShare = await client.query<WorkOrderShareRow>(
`${WORK_ORDER_SHARE_SELECT} WHERE wos.id = $1 LIMIT 1`,
[input.shareId],
)
// 必须回读聚合口径的母单(active_share_quantity 等),否则前端拿到的拼单进度会归零
const updatedOrder = await getWorkOrderByIdWithClient(client, input.workOrderId)
return {
order: updatedOrder || workOrder,
share: updatedShare.rows[0] || null,
failureReason: null,
}
})
}
export async function submitWorkOrderShareAcceptance(input: {
workOrderId: number
workerId: number