Merge branch 'dev1023' into dev
解决 9 个冲突文件,并修复合并后遗留问题: - 大厅候选集:采用 FIFO 窗口 + 全部置顶单 UNION(列表与抢单/拼单复核同源) - 拼单份额:采用多次参与模型(每次参与 INSERT 新份额、requestId 幂等), 取消后可重新参与;移除 HEAD 已废弃的单行 rejoin 逻辑与对应测试 - 工单迁移与成本中心 103–108 编号撞车:合并重写为 109_work_order_share_participation / 110_work_order_hall_and_shop_indexes; 临时库全量执行与重跑幂等验证通过(10 列、唯一键已删、7 个索引) - 实时补丁:保留个性化字段、置顶重排、分页总数同步;补回 orderTimelineVisible 类型 - 打手大厅:保留 memo 组件化,移植「再拼一次」多份额按钮逻辑 - 全项目表格统一 PercentTable:WorkerOrderShareTable 改造 验证:backend typecheck/lint/check:sql/test(833 pass)、 frontend typecheck/lint/test(172 pass)/build 全绿。
This commit is contained in:
@@ -892,6 +892,41 @@ export function cancelAdminWorkOrderShare(
|
||||
}>(`/api/v1/admin/worker-platform/orders/${workOrderId}/shares/${shareId}/cancel`, payload)
|
||||
}
|
||||
|
||||
/** 按份数撤销某个打手的部分份额:减少的份数回到大厅,押金保持原冻结额。 */
|
||||
export function reduceAdminWorkOrderShareQuantity(
|
||||
workOrderId: number,
|
||||
shareId: number,
|
||||
payload: { reduceQuantity: number; note?: string },
|
||||
) {
|
||||
return apiPost<{ order: WorkOrder; share: WorkOrderShare }>(
|
||||
`/api/v1/admin/worker-platform/orders/${workOrderId}/shares/${shareId}/reduce-quantity`,
|
||||
payload,
|
||||
)
|
||||
}
|
||||
|
||||
/** 按份额标记问题单:只影响该份额持有人,母单状态不变。备注选填。 */
|
||||
export function markAdminWorkOrderShareProblem(workOrderId: number, shareId: number, note = '') {
|
||||
return apiPost<{ order: WorkOrder; share: WorkOrderShare }>(
|
||||
`/api/v1/admin/worker-platform/orders/${workOrderId}/shares/${shareId}/problem`,
|
||||
{ note },
|
||||
)
|
||||
}
|
||||
|
||||
/** 处置份额级问题单:方式与母单处置一致,但只作用于该份额。 */
|
||||
export function disposeAdminWorkOrderShareProblem(
|
||||
workOrderId: number,
|
||||
shareId: number,
|
||||
payload: {
|
||||
action: 'return_to_worker' | 'reopen' | 'cancel_release' | 'cancel_deduct'
|
||||
note: string
|
||||
},
|
||||
) {
|
||||
return apiPost<{ order: WorkOrder; share: WorkOrderShare; depositAmount: number }>(
|
||||
`/api/v1/admin/worker-platform/orders/${workOrderId}/shares/${shareId}/problem/dispose`,
|
||||
payload,
|
||||
)
|
||||
}
|
||||
|
||||
export function cancelAdminWorkOrderSharing(
|
||||
workOrderId: number,
|
||||
payload: {
|
||||
|
||||
Reference in New Issue
Block a user