feat: 支持待分配/待抢单修改付款金额并增加价格历史
This commit is contained in:
@@ -9,6 +9,7 @@ export * from './worker-ranking-repo.js'
|
||||
export * from './work-order-repo.js'
|
||||
export * from './work-order-query-repo.js'
|
||||
export * from './work-order-management-repo.js'
|
||||
export * from './work-order-payment-history-repo.js'
|
||||
export * from './work-order-grab-repo.js'
|
||||
export * from './work-order-cancel-repo.js'
|
||||
export * from './work-order-issue-repo.js'
|
||||
|
||||
@@ -399,6 +399,12 @@ export type WorkOrderRow = {
|
||||
last_assigned_worker_id: number | null
|
||||
/** 来源订单实付金额(分);取消部分时用于按比例计算退款。 */
|
||||
source_order_amount_fen: number
|
||||
/** 最近一次修改用户付款金额前的金额(分);NULL 表示首次修改前金额未知。 */
|
||||
user_payment_amount_previous_fen?: number | null
|
||||
/** 最近一次修改用户付款金额的时间。 */
|
||||
user_payment_amount_updated_at?: string | null
|
||||
/** 最近一次修改用户付款金额的操作人展示名/用户名快照。 */
|
||||
user_payment_amount_updated_by?: string | null
|
||||
material_json: string | Record<string, unknown>
|
||||
requirement_json: string | Record<string, unknown>
|
||||
acceptance_json: string | Record<string, unknown>
|
||||
|
||||
@@ -2,6 +2,7 @@ import { query, withTransaction } from '../../db/client.js'
|
||||
import { resolveSourceOrderAmountFen, toJsonString, toPositiveInteger } from './shared.js'
|
||||
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 {
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
normalizeWorkOrderGiftCooldownHours,
|
||||
@@ -306,39 +307,83 @@ export async function updateWorkOrderBasic(
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台修正「用户付款金额」:同时更新 083 派生列与 material_json 来源快照。
|
||||
* 后台修正「用户付款金额」:同时更新 083 派生列、material_json 来源快照、
|
||||
* 最近一次修改痕迹,并同步来源订单 total_amount。
|
||||
*
|
||||
* 只允许待完善(pending_material)阶段;WHERE 里再守一次状态与接单人,
|
||||
* 避免读完到写入之间状态已推进或被打手接走。
|
||||
* 状态与接单人在 WHERE 里再守一次,避免读完到写入之间状态已推进或被打手接走。
|
||||
* 同一来源订单的其它工单不联动(按产品确认:只改当前工单)。
|
||||
*/
|
||||
export async function updateWorkOrderPaymentAmount(input: {
|
||||
workOrderId: number | string
|
||||
amountFen: number
|
||||
materialJson: unknown
|
||||
previousAmountFen: number | null
|
||||
reason: string
|
||||
updatedBy: string
|
||||
allowedStatuses: string[]
|
||||
now: string
|
||||
}): Promise<WorkOrderRow | null> {
|
||||
const result = await query<{ id: number }>(
|
||||
`
|
||||
UPDATE work_orders
|
||||
SET source_order_amount_fen = $1,
|
||||
material_json = $2::jsonb,
|
||||
updated_at = $3
|
||||
WHERE id = $4
|
||||
AND assigned_worker_id IS NULL
|
||||
AND status = ANY($5::text[])
|
||||
RETURNING id
|
||||
`,
|
||||
[
|
||||
input.amountFen,
|
||||
toJsonString(input.materialJson),
|
||||
input.now,
|
||||
Number(input.workOrderId),
|
||||
input.allowedStatuses,
|
||||
],
|
||||
)
|
||||
if (!result.rows[0]) return null
|
||||
return getWorkOrderById(result.rows[0].id)
|
||||
const updatedId = await withTransaction(async (client) => {
|
||||
const result = await client.query<{ id: number; order_id: number | null }>(
|
||||
`
|
||||
UPDATE work_orders
|
||||
SET source_order_amount_fen = $1::bigint,
|
||||
material_json = $2::jsonb,
|
||||
user_payment_amount_previous_fen = $3::bigint,
|
||||
user_payment_amount_updated_at = $4::timestamptz,
|
||||
user_payment_amount_updated_by = $5::text,
|
||||
updated_at = $4::timestamptz
|
||||
WHERE id = $6
|
||||
AND assigned_worker_id IS NULL
|
||||
AND status = ANY($7::text[])
|
||||
AND (
|
||||
sharing_enabled = FALSE
|
||||
OR COALESCE((
|
||||
SELECT SUM(wos.quantity)
|
||||
FROM work_order_shares wos
|
||||
WHERE wos.work_order_id = work_orders.id
|
||||
AND wos.status != 'cancelled'
|
||||
), 0) < sharing_total_quantity
|
||||
)
|
||||
RETURNING id, order_id
|
||||
`,
|
||||
[
|
||||
input.amountFen,
|
||||
toJsonString(input.materialJson),
|
||||
input.previousAmountFen,
|
||||
input.now,
|
||||
input.updatedBy,
|
||||
Number(input.workOrderId),
|
||||
input.allowedStatuses,
|
||||
],
|
||||
)
|
||||
const row = result.rows[0]
|
||||
if (!row) return null
|
||||
|
||||
if (row.order_id) {
|
||||
const orderUpdate = await client.query(
|
||||
'UPDATE orders SET total_amount = $1::bigint, updated_at = $2::timestamptz WHERE id = $3',
|
||||
[input.amountFen, input.now, Number(row.order_id)],
|
||||
)
|
||||
if ((orderUpdate.rowCount || 0) === 0) {
|
||||
throw new Error('work_order_payment_amount_order_missing')
|
||||
}
|
||||
}
|
||||
|
||||
await insertWorkOrderPaymentAmountHistoryWithClient(client, {
|
||||
workOrderId: row.id,
|
||||
previousAmountFen: input.previousAmountFen,
|
||||
amountFen: input.amountFen,
|
||||
reason: input.reason,
|
||||
changedBy: input.updatedBy,
|
||||
changedAt: input.now,
|
||||
})
|
||||
|
||||
return Number(row.id)
|
||||
})
|
||||
|
||||
if (!updatedId) return null
|
||||
return getWorkOrderById(updatedId)
|
||||
}
|
||||
|
||||
export async function updateWorkOrderAdminNote(
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
import type { PoolClient } from 'pg'
|
||||
|
||||
import { query } from '../../db/client.js'
|
||||
|
||||
export type WorkOrderPaymentAmountHistoryRow = {
|
||||
id: number | string
|
||||
work_order_id: number | string
|
||||
previous_amount_fen: number | string | null
|
||||
amount_fen: number | string
|
||||
reason: string
|
||||
changed_by: string
|
||||
changed_at: string
|
||||
}
|
||||
|
||||
/** 按时间倒序读取单个工单的全部付款金额修改记录。 */
|
||||
export async function listWorkOrderPaymentAmountHistory(
|
||||
workOrderId: number | string,
|
||||
): Promise<WorkOrderPaymentAmountHistoryRow[]> {
|
||||
const result = await query<WorkOrderPaymentAmountHistoryRow>(
|
||||
`
|
||||
SELECT id, work_order_id, previous_amount_fen, amount_fen, reason, changed_by, changed_at
|
||||
FROM work_order_payment_amount_history
|
||||
WHERE work_order_id = $1
|
||||
ORDER BY changed_at DESC, id DESC
|
||||
`,
|
||||
[Number(workOrderId)],
|
||||
)
|
||||
return result.rows
|
||||
}
|
||||
|
||||
/** 列表页批量判断哪些工单存在价格历史,避免逐行查询。 */
|
||||
export async function listWorkOrderIdsWithPaymentAmountHistory(
|
||||
workOrderIds: number[],
|
||||
): Promise<Set<number>> {
|
||||
if (workOrderIds.length === 0) return new Set()
|
||||
const result = await query<{ work_order_id: number | string }>(
|
||||
`
|
||||
SELECT DISTINCT work_order_id
|
||||
FROM work_order_payment_amount_history
|
||||
WHERE work_order_id = ANY($1::bigint[])
|
||||
`,
|
||||
[workOrderIds],
|
||||
)
|
||||
return new Set(result.rows.map((row) => Number(row.work_order_id)))
|
||||
}
|
||||
|
||||
/** 与工单金额修改在同一事务内写入,保证金额和历史同时成功或同时回滚。 */
|
||||
export async function insertWorkOrderPaymentAmountHistoryWithClient(
|
||||
client: PoolClient,
|
||||
input: {
|
||||
workOrderId: number | string
|
||||
previousAmountFen: number | null
|
||||
amountFen: number
|
||||
reason: string
|
||||
changedBy: string
|
||||
changedAt: string
|
||||
},
|
||||
): Promise<void> {
|
||||
await client.query(
|
||||
`
|
||||
INSERT INTO work_order_payment_amount_history (
|
||||
work_order_id, previous_amount_fen, amount_fen, reason, changed_by, changed_at
|
||||
) VALUES ($1, $2, $3, $4, $5, $6)
|
||||
`,
|
||||
[
|
||||
Number(input.workOrderId),
|
||||
input.previousAmountFen,
|
||||
input.amountFen,
|
||||
input.reason,
|
||||
input.changedBy,
|
||||
input.changedAt,
|
||||
],
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user