收口接单大厅模板价格同步与本地开发容器
This commit is contained in:
@@ -437,6 +437,8 @@ export type WorkOrderRow = {
|
||||
sharing_enabled: boolean
|
||||
sharing_total_quantity: number
|
||||
sharing_unit_reward: number
|
||||
/** 最近一次物化大厅价格使用的接单模板成本版本。 */
|
||||
hall_price_version_id?: number | null
|
||||
published_at: string | null
|
||||
hall_queued_at: string | null
|
||||
pinned_at: string | null
|
||||
|
||||
@@ -8,6 +8,7 @@ import { getWorkOrderByIdWithClient } from './work-order-query-repo.js'
|
||||
import { getOutstandingDepositAmountWithClient } from './work-order-deposit-repo.js'
|
||||
import { CLEAR_DELIVERY_RESIDUE_SQL, RESET_GIFT_FLOW_SQL } from './work-order-gift-repo.js'
|
||||
import type { WorkOrderRow } from './types.js'
|
||||
import { assertWorkOrderHallPriceReadyWithClient } from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
|
||||
export async function cancelWorkerWorkOrder(input: {
|
||||
workOrderId: number
|
||||
@@ -42,6 +43,14 @@ export async function cancelWorkerWorkOrder(input: {
|
||||
Number(wallet?.frozen_deposit_amount || 0),
|
||||
)
|
||||
|
||||
// 寄卖现货先回库并恢复匹配前报酬,再物化大厅模板价。
|
||||
await releaseConsignmentInventoryBindingForWorkOrderWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
reason: '打手撤单',
|
||||
})
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
})
|
||||
await client.query(
|
||||
`
|
||||
UPDATE work_orders
|
||||
@@ -81,12 +90,6 @@ export async function cancelWorkerWorkOrder(input: {
|
||||
)
|
||||
}
|
||||
|
||||
// 打手撤单:被本工单占用的寄卖现货放回在库池(否则现货永久停留在 consumed)。
|
||||
await releaseConsignmentInventoryBindingForWorkOrderWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
reason: '打手撤单',
|
||||
})
|
||||
|
||||
await createWorkOrderEventWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
actorType: 'worker',
|
||||
@@ -151,6 +154,15 @@ export async function unassignWorkOrder(input: {
|
||||
Number(wallet?.frozen_deposit_amount || 0),
|
||||
)
|
||||
|
||||
// 退回大厅前先释放寄卖绑定并恢复原合同价,再按当前模板价重新物化。
|
||||
await releaseConsignmentInventoryBindingForWorkOrderWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
reason: '后台退回大厅',
|
||||
})
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
actorName: input.actorName || '',
|
||||
})
|
||||
await client.query(
|
||||
`
|
||||
UPDATE work_orders
|
||||
@@ -324,12 +336,6 @@ export async function returnAssignedWorkOrderToHall(input: {
|
||||
)
|
||||
}
|
||||
|
||||
// 退回大厅:寄卖现货回到在库池;若该单原本走内部现货履约,运营可重新指派。
|
||||
await releaseConsignmentInventoryBindingForWorkOrderWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
reason: '后台退回大厅',
|
||||
})
|
||||
|
||||
await createWorkOrderEventWithClient(client, {
|
||||
workOrderId: input.workOrderId,
|
||||
actorType: 'admin',
|
||||
|
||||
@@ -14,6 +14,7 @@ import { getWorkOrderByIdWithClient } from './work-order-query-repo.js'
|
||||
import { getOutstandingDepositAmountWithClient } from './work-order-deposit-repo.js'
|
||||
import { CLEAR_DELIVERY_RESIDUE_SQL, RESET_GIFT_FLOW_SQL } from './work-order-gift-repo.js'
|
||||
import type { ProblemWorkOrderResolutionAction, WorkOrderRow, WorkOrderShareRow } from './types.js'
|
||||
import { assertWorkOrderHallPriceReadyWithClient } from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
|
||||
/**
|
||||
* 统计工单的活跃拼单份额(除已取消外都算活跃)。
|
||||
@@ -211,6 +212,12 @@ export async function resolveProblemWorkOrder(input: {
|
||||
: `问题单处置退回大厅(${effectiveAction})`,
|
||||
})
|
||||
}
|
||||
if (targetStatus === 'open') {
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
actorName: input.actorName || '',
|
||||
})
|
||||
}
|
||||
|
||||
await client.query(
|
||||
`
|
||||
|
||||
@@ -3,6 +3,10 @@ import { resolveSourceOrderAmountFen, toJsonString, toPositiveInteger } from './
|
||||
import { getWorkOrderById, getWorkOrderByIdWithClient } from './work-order-query-repo.js'
|
||||
import { createWorkOrderEventWithClient } from './work-order-event-repo.js'
|
||||
import { insertWorkOrderPaymentAmountHistoryWithClient } from './work-order-payment-history-repo.js'
|
||||
import {
|
||||
assertWorkOrderHallPriceReadyWithClient,
|
||||
materializeWorkOrderHallPriceWithClient,
|
||||
} from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
import {
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
normalizeWorkOrderGiftCooldownHours,
|
||||
@@ -187,6 +191,26 @@ export async function updateWorkOrder(
|
||||
const statement = buildWorkOrderUpdateStatement(workOrderId, patch, options)
|
||||
// 空 patch 不产生写操作;返回当前值,保持原有调用语义。
|
||||
if (!statement) return getWorkOrderById(workOrderId)
|
||||
if (patch.status === 'open') {
|
||||
return withTransaction(async (client) => {
|
||||
const currentResult = await client.query<WorkOrderRow>(
|
||||
`SELECT * FROM work_orders WHERE id = $1 FOR UPDATE`,
|
||||
[Number(workOrderId)],
|
||||
)
|
||||
const current = currentResult.rows[0] || null
|
||||
if (!current) return null
|
||||
if (options.expectedStatus && current.status !== options.expectedStatus) return null
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, Number(current.id), {
|
||||
now: String(patch.updated_at || current.updated_at),
|
||||
})
|
||||
const result = await client.query<{ id: number }>(statement.text, statement.values)
|
||||
if (!result.rows[0]) return null
|
||||
await materializeWorkOrderHallPriceWithClient(client, Number(current.id), {
|
||||
now: String(patch.updated_at || current.updated_at),
|
||||
})
|
||||
return getWorkOrderByIdWithClient(client, workOrderId)
|
||||
})
|
||||
}
|
||||
const result = await query<{ id: number }>(statement.text, statement.values)
|
||||
if (!result.rows[0]) return null
|
||||
return getWorkOrderById(workOrderId)
|
||||
@@ -246,6 +270,10 @@ export async function publishUnassignedWorkOrder(input: {
|
||||
if (!current || current.status !== 'unassigned' || current.assigned_worker_id) {
|
||||
return { order: null, failureReason: 'work_order_not_publishable' }
|
||||
}
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, Number(current.id), {
|
||||
now: input.now,
|
||||
actorName: input.actorName || '',
|
||||
})
|
||||
|
||||
const updatedResult = await client.query<{ id: number }>(
|
||||
`
|
||||
|
||||
@@ -24,6 +24,7 @@ import {
|
||||
} from './work-order-deposit-repo.js'
|
||||
import { maybeUpgradeWorkerLevel } from './worker-ranking-repo.js'
|
||||
import type { WorkOrderRow, WorkOrderShareRow } from './types.js'
|
||||
import { assertWorkOrderHallPriceReadyWithClient } from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
import {
|
||||
forfeitConsignmentPublishDepositByInventoryWithClient,
|
||||
releaseConsignmentPublishDepositBySubmissionWithClient,
|
||||
@@ -1344,6 +1345,10 @@ export async function cancelWorkOrderSharing(input: {
|
||||
[input.now, cancelledShareIds],
|
||||
)
|
||||
if (input.action === 'return_to_hall') {
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, input.workOrderId, {
|
||||
now: input.now,
|
||||
actorName: input.actorName || '',
|
||||
})
|
||||
await client.query(
|
||||
`UPDATE work_orders
|
||||
SET status = 'open',
|
||||
|
||||
@@ -21,6 +21,7 @@ import {
|
||||
isWorkOrderWithinHallCapacityWithClient,
|
||||
} from './work-order-repo.js'
|
||||
import type { WorkOrderRow, WorkOrderShareRow } from './types.js'
|
||||
import { assertWorkOrderHallPriceReadyWithClient } from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
|
||||
export async function listWorkOrderShares(
|
||||
workOrderId: number | string,
|
||||
@@ -789,6 +790,9 @@ export async function recomputeWorkOrderSharingStatusWithClient(
|
||||
if (String(workOrder.status || '') === nextStatus) {
|
||||
return workOrder
|
||||
}
|
||||
if (nextStatus === 'open') {
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, workOrderId, { now })
|
||||
}
|
||||
|
||||
const hallQueueAssignments = options.preserveHallQueue
|
||||
? ''
|
||||
|
||||
@@ -1,18 +1,13 @@
|
||||
import type { PoolClient } from 'pg'
|
||||
|
||||
import { query, withTransaction } from '../../db/client.js'
|
||||
import { query } from '../../db/client.js'
|
||||
import { toPositiveInteger } from './shared.js'
|
||||
import {
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
normalizeWorkOrderGiftCooldownHours,
|
||||
normalizeWorkOrderGiftCooldownMinutes,
|
||||
} from '../../domain/work-order-acceptance-mode.js'
|
||||
import type {
|
||||
ProductRuleListInput,
|
||||
WorkOrderRow,
|
||||
WorkOrderShareRow,
|
||||
WorkProductRuleRow,
|
||||
} from './types.js'
|
||||
import type { ProductRuleListInput, WorkOrderRow, WorkProductRuleRow } from './types.js'
|
||||
import { WORK_ORDER_SELECT } from './work-order-repo.js'
|
||||
|
||||
const WORK_PRODUCT_RULE_SELECT = `
|
||||
@@ -137,181 +132,33 @@ export async function getWorkProductRuleById(
|
||||
return result.rows[0] || null
|
||||
}
|
||||
|
||||
/** 查询仍在接单大厅、且明确来源于指定模板的工单。 */
|
||||
export async function listOpenWorkOrdersByProductRuleId(
|
||||
/** 查询尚未形成不可变履约合同、需要跟随模板价格更新的工单。 */
|
||||
export async function listWorkOrdersForPriceSyncByProductRuleId(
|
||||
ruleId: number | string,
|
||||
client?: Pick<PoolClient, 'query'>,
|
||||
): Promise<WorkOrderRow[]> {
|
||||
const result = await query<WorkOrderRow>(
|
||||
`${WORK_ORDER_SELECT}
|
||||
const sql = `${WORK_ORDER_SELECT}
|
||||
WHERE wo.product_rule_id = $1
|
||||
AND wo.status = 'open'
|
||||
ORDER BY wo.id ASC`,
|
||||
[Number(ruleId)],
|
||||
)
|
||||
AND wo.status IN ('pending_material', 'unassigned', 'open')
|
||||
ORDER BY wo.id ASC`
|
||||
const result = client
|
||||
? await client.query<WorkOrderRow>(sql, [Number(ruleId)])
|
||||
: await query<WorkOrderRow>(sql, [Number(ruleId)])
|
||||
return result.rows
|
||||
}
|
||||
|
||||
export type SyncOpenWorkOrderPriceResult = {
|
||||
updated: boolean
|
||||
reason: 'updated' | 'price_unchanged' | 'not_open' | 'assigned' | 'sharing_filled'
|
||||
workOrderId: number
|
||||
sharingPartial: boolean
|
||||
workerIds: number[]
|
||||
}
|
||||
|
||||
/** 拼单改价时保留已加入份额的报酬,只按新价计算剩余份额。 */
|
||||
export function resolveOpenSharingSyncReward(input: {
|
||||
totalQuantity: number
|
||||
joinedQuantity: number
|
||||
lockedShareReward: number
|
||||
nextUnitReward: number
|
||||
}) {
|
||||
const totalQuantity = toPositiveInteger(input.totalQuantity, 1)
|
||||
const joinedQuantity = Math.min(totalQuantity, Math.max(0, Number(input.joinedQuantity || 0)))
|
||||
return (
|
||||
Math.max(0, Number(input.lockedShareReward || 0)) +
|
||||
(totalQuantity - joinedQuantity) * toPositiveInteger(input.nextUnitReward, 0)
|
||||
export async function lockWorkProductRuleForPriceUpdate(
|
||||
client: Pick<PoolClient, 'query'>,
|
||||
ruleKey: string,
|
||||
): Promise<WorkProductRuleRow | null> {
|
||||
const result = await client.query<WorkProductRuleRow>(
|
||||
`${WORK_PRODUCT_RULE_SELECT}
|
||||
WHERE wpr.rule_key = $1
|
||||
LIMIT 1
|
||||
FOR UPDATE OF wpr`,
|
||||
[String(ruleKey || '').trim()],
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步大厅工单的模板价格。
|
||||
* 已加入的拼单份额报酬是合同快照,只更新尚未加入的剩余份额价格。
|
||||
*/
|
||||
export async function syncOpenWorkOrderPriceFromRule(input: {
|
||||
workOrderId: number
|
||||
productRuleId: number
|
||||
rewardAmount: number
|
||||
sharingUnitReward?: number
|
||||
actorName: string
|
||||
now: string
|
||||
}): Promise<SyncOpenWorkOrderPriceResult> {
|
||||
return withTransaction(async (client) => {
|
||||
const orderResult = await client.query<WorkOrderRow>(
|
||||
`SELECT *
|
||||
FROM work_orders
|
||||
WHERE id = $1 AND product_rule_id = $2
|
||||
FOR UPDATE`,
|
||||
[input.workOrderId, input.productRuleId],
|
||||
)
|
||||
const workOrder = orderResult.rows[0] || null
|
||||
if (!workOrder || workOrder.status !== 'open') {
|
||||
return {
|
||||
updated: false,
|
||||
reason: 'not_open',
|
||||
workOrderId: input.workOrderId,
|
||||
sharingPartial: false,
|
||||
workerIds: [],
|
||||
}
|
||||
}
|
||||
if (workOrder.assigned_worker_id) {
|
||||
return {
|
||||
updated: false,
|
||||
reason: 'assigned',
|
||||
workOrderId: input.workOrderId,
|
||||
sharingPartial: false,
|
||||
workerIds: [],
|
||||
}
|
||||
}
|
||||
|
||||
const sharesResult = await client.query<WorkOrderShareRow>(
|
||||
`SELECT *
|
||||
FROM work_order_shares
|
||||
WHERE work_order_id = $1
|
||||
FOR UPDATE`,
|
||||
[workOrder.id],
|
||||
)
|
||||
const activeShares = sharesResult.rows.filter((share) => share.status !== 'cancelled')
|
||||
const joinedQuantity = activeShares.reduce(
|
||||
(sum, share) => sum + Math.max(0, Number(share.quantity || 0)),
|
||||
0,
|
||||
)
|
||||
const workerIds = [
|
||||
...new Set(
|
||||
activeShares.map((share) => Number(share.worker_id)).filter((workerId) => workerId > 0),
|
||||
),
|
||||
]
|
||||
const sharingPartial = workOrder.sharing_enabled === true && joinedQuantity > 0
|
||||
let nextRewardAmount = toPositiveInteger(input.rewardAmount, 0)
|
||||
let nextSharingUnitReward = Number(workOrder.sharing_unit_reward || 0)
|
||||
|
||||
if (workOrder.sharing_enabled === true) {
|
||||
const totalQuantity = toPositiveInteger(workOrder.sharing_total_quantity, 1)
|
||||
if (joinedQuantity >= totalQuantity) {
|
||||
return {
|
||||
updated: false,
|
||||
reason: 'sharing_filled',
|
||||
workOrderId: Number(workOrder.id),
|
||||
sharingPartial,
|
||||
workerIds,
|
||||
}
|
||||
}
|
||||
nextSharingUnitReward = toPositiveInteger(input.sharingUnitReward, 0)
|
||||
const lockedShareReward = activeShares.reduce(
|
||||
(sum, share) => sum + Math.max(0, Number(share.share_reward || 0)),
|
||||
0,
|
||||
)
|
||||
nextRewardAmount = resolveOpenSharingSyncReward({
|
||||
totalQuantity,
|
||||
joinedQuantity,
|
||||
lockedShareReward,
|
||||
nextUnitReward: nextSharingUnitReward,
|
||||
})
|
||||
}
|
||||
|
||||
const unchanged =
|
||||
Number(workOrder.reward_amount || 0) === nextRewardAmount &&
|
||||
(!workOrder.sharing_enabled ||
|
||||
Number(workOrder.sharing_unit_reward || 0) === nextSharingUnitReward)
|
||||
if (unchanged) {
|
||||
return {
|
||||
updated: false,
|
||||
reason: 'price_unchanged',
|
||||
workOrderId: Number(workOrder.id),
|
||||
sharingPartial,
|
||||
workerIds,
|
||||
}
|
||||
}
|
||||
|
||||
await client.query(
|
||||
`UPDATE work_orders
|
||||
SET reward_amount = $1,
|
||||
sharing_unit_reward = $2,
|
||||
updated_at = $3
|
||||
WHERE id = $4`,
|
||||
[nextRewardAmount, nextSharingUnitReward, input.now, workOrder.id],
|
||||
)
|
||||
await client.query(
|
||||
`INSERT INTO work_order_events (
|
||||
work_order_id, actor_type, actor_id, event_type, from_status, to_status, payload_json, created_at
|
||||
) VALUES ($1, 'admin', $2, 'price_synced_from_rule', $3, $3, $4::jsonb, $5)`,
|
||||
[
|
||||
workOrder.id,
|
||||
input.actorName,
|
||||
workOrder.status,
|
||||
JSON.stringify({
|
||||
productRuleId: input.productRuleId,
|
||||
previousRewardAmount: Number(workOrder.reward_amount || 0),
|
||||
rewardAmount: nextRewardAmount,
|
||||
previousSharingUnitReward: Number(workOrder.sharing_unit_reward || 0),
|
||||
sharingUnitReward: nextSharingUnitReward,
|
||||
joinedQuantity,
|
||||
lockedShareReward: activeShares.reduce(
|
||||
(sum, share) => sum + Math.max(0, Number(share.share_reward || 0)),
|
||||
0,
|
||||
),
|
||||
}),
|
||||
input.now,
|
||||
],
|
||||
)
|
||||
return {
|
||||
updated: true,
|
||||
reason: 'updated',
|
||||
workOrderId: Number(workOrder.id),
|
||||
sharingPartial,
|
||||
workerIds,
|
||||
}
|
||||
})
|
||||
return result.rows[0] || null
|
||||
}
|
||||
|
||||
export async function detachWorkProductRuleCostVersions(
|
||||
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
getWorkOrderByIdWithClient,
|
||||
} from './work-order-repo.js'
|
||||
import type { WorkerCancelRequestRow, WorkOrderRow, WorkOrderShareRow } from './types.js'
|
||||
import { assertWorkOrderHallPriceReadyWithClient } from '../../services/worker-platform/work-order-hall-pricing-service.js'
|
||||
|
||||
const WORKER_CANCEL_REQUEST_SELECT = `
|
||||
SELECT
|
||||
@@ -671,6 +672,10 @@ export async function reviewWorkerCancelRequest(input: {
|
||||
now: input.now,
|
||||
reason: '打手退单申请通过',
|
||||
})
|
||||
await assertWorkOrderHallPriceReadyWithClient(client, workOrder.id, {
|
||||
now: input.now,
|
||||
actorName: input.actorName || '',
|
||||
})
|
||||
await client.query(
|
||||
`UPDATE work_orders
|
||||
SET status = 'open', assigned_worker_id = NULL, assigned_at = NULL, deadline_at = NULL,
|
||||
|
||||
Reference in New Issue
Block a user