feat(worker): 我的订单新增待提交打手资料筛选
- 仅筛 3 天(72h)好友赠送单,口径与提交资料接口一致 - 加法式页签,仍保留在代练中;问题单纳入 - 概览与实时 workerStatuses 同步,提交/重置资料后自动移出/移入 - 显式单号检索忽略该展示筛选
This commit is contained in:
@@ -6,7 +6,9 @@ import {
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
normalizeWorkOrderGiftCooldownHours,
|
||||
normalizeWorkOrderGiftCooldownMinutes,
|
||||
resolveWorkOrderGiftCooldownTotalMinutes,
|
||||
resolveWorkOrderGiftPhase,
|
||||
THREE_DAY_GIFT_COOLDOWN_MINUTES,
|
||||
WORK_ORDER_ACCEPTANCE_MODE,
|
||||
WORK_ORDER_GIFT_PHASE,
|
||||
} from './work-order-acceptance-mode.js'
|
||||
@@ -67,3 +69,32 @@ test('好友赠送按分钟冷却支持最长三十天并忽略负数', () => {
|
||||
assert.equal(normalizeWorkOrderGiftCooldownMinutes(43_201), 43_200)
|
||||
assert.equal(normalizeWorkOrderGiftCooldownMinutes(-1), 0)
|
||||
})
|
||||
|
||||
test('赠送总冷却分钟数:小时+分钟,0/0 按默认 3 天兜底', () => {
|
||||
assert.equal(THREE_DAY_GIFT_COOLDOWN_MINUTES, 4320)
|
||||
assert.equal(
|
||||
resolveWorkOrderGiftCooldownTotalMinutes({
|
||||
gift_cooldown_hours: 72,
|
||||
gift_cooldown_minutes: 0,
|
||||
}),
|
||||
4320,
|
||||
)
|
||||
// 按分钟配置:小时为 0、分钟为 4320 仍是同一档 3 天
|
||||
assert.equal(
|
||||
resolveWorkOrderGiftCooldownTotalMinutes({
|
||||
gift_cooldown_hours: 0,
|
||||
gift_cooldown_minutes: 4320,
|
||||
}),
|
||||
4320,
|
||||
)
|
||||
// 历史数据两者都为 0:按默认 72 小时(3 天)
|
||||
assert.equal(resolveWorkOrderGiftCooldownTotalMinutes({}), 4320)
|
||||
assert.equal(resolveWorkOrderGiftCooldownTotalMinutes({ gift_cooldown_hours: 24 }), 1440)
|
||||
assert.equal(
|
||||
resolveWorkOrderGiftCooldownTotalMinutes({
|
||||
gift_cooldown_hours: 72,
|
||||
gift_cooldown_minutes: 30,
|
||||
}),
|
||||
4350,
|
||||
)
|
||||
})
|
||||
|
||||
@@ -48,6 +48,25 @@ export function normalizeWorkOrderGiftCooldownMinutes(value: unknown): number {
|
||||
return Math.min(MAX_GIFT_COOLDOWN_MINUTES, Math.max(0, Math.round(minutes)))
|
||||
}
|
||||
|
||||
/** 「3 天赠送」筛选口径:3 天 = 4320 分钟(好友赠送默认冷却)。 */
|
||||
export const THREE_DAY_GIFT_COOLDOWN_MINUTES = 3 * 24 * 60
|
||||
|
||||
/**
|
||||
* 工单实际生效的赠送总冷却分钟数。
|
||||
*
|
||||
* 冷却时长 = gift_cooldown_hours 小时 + gift_cooldown_minutes 分钟;
|
||||
* 两者都为 0 表示历史数据未配置,按默认 72 小时兜底(与建单/确认加好友逻辑一致)。
|
||||
*/
|
||||
export function resolveWorkOrderGiftCooldownTotalMinutes(source: {
|
||||
gift_cooldown_hours?: unknown
|
||||
gift_cooldown_minutes?: unknown
|
||||
}): number {
|
||||
const hours = Math.max(0, Math.round(Number(source.gift_cooldown_hours) || 0))
|
||||
const minutes = Math.max(0, Math.round(Number(source.gift_cooldown_minutes) || 0))
|
||||
if (hours === 0 && minutes === 0) return DEFAULT_GIFT_COOLDOWN_HOURS * 60
|
||||
return hours * 60 + minutes
|
||||
}
|
||||
|
||||
export type WorkOrderGiftSource = {
|
||||
acceptance_mode?: string | null
|
||||
gift_phase?: string | null
|
||||
|
||||
@@ -223,6 +223,25 @@ test('内部现货不再因上一手 last_assigned 进入打手可见集', async
|
||||
assert.equal(calls.length, 2, '列表和概览必须共用同一条历史可见条件')
|
||||
})
|
||||
|
||||
test('「待提交打手资料」只筛本人名下 3 天赠送的 material_required 单', () => {
|
||||
const query = buildWorkOrderWhere({ workerSharingId: 7, giftMaterialPending: true })
|
||||
|
||||
assert.match(query.whereClause, /wo\.acceptance_mode = 'friend_gift'/)
|
||||
assert.match(query.whereClause, /wo\.gift_phase = 'material_required'/)
|
||||
assert.match(query.whereClause, /wo\.status IN \('in_progress', 'problem'\)/)
|
||||
// 必须锁死当前接单人:可见集合里的超时历史单可能是别人正在做的单
|
||||
assert.match(query.whereClause, /wo\.assigned_worker_id = \$1::bigint/)
|
||||
assert.match(query.whereClause, /gift_cooldown_hours/)
|
||||
assert.match(query.whereClause, /gift_cooldown_minutes/)
|
||||
assert.match(query.whereClause, /\) = 4320/)
|
||||
// 复用 worker_visible 的打手参数,不额外占位
|
||||
assert.deepEqual(query.params, [7])
|
||||
|
||||
// 普通状态筛选不产生赠送资料条件
|
||||
const plain = buildWorkOrderWhere({ workerSharingId: 7, statuses: ['in_progress'] })
|
||||
assert.doesNotMatch(plain.whereClause, /gift_phase = 'material_required'/)
|
||||
})
|
||||
|
||||
test('后台接单人员筛选把寄售供货人的绑定工单纳入可见集合', () => {
|
||||
const query = buildWorkOrderWhere({
|
||||
workerSharingId: 1494,
|
||||
|
||||
@@ -548,6 +548,11 @@ export type ListInput = {
|
||||
excludeFilledSharing?: boolean
|
||||
/** VIP 免审核后仍在补图期限内的订单;与状态筛选取并集 */
|
||||
vipEvidencePending?: boolean
|
||||
/**
|
||||
* 打手端「待提交打手资料」筛选:3 天(72h)好友赠送单,且当前接单人就是该打手、
|
||||
* 仍停在 material_required 阶段。必须与 workerSharingId 一起使用,否则会跨打手。
|
||||
*/
|
||||
giftMaterialPending?: boolean
|
||||
/** 验收模式筛选:standard / friend_gift。 */
|
||||
acceptanceMode?: string
|
||||
/** 好友赠送阶段筛选:material_required / material_submitted / friend_countdown / gift_ready。 */
|
||||
|
||||
@@ -2,7 +2,9 @@ import { query } from '../../db/client.js'
|
||||
import type { ListInput, WorkOrderRow, WorkOrderStatistics } from './types.js'
|
||||
import type { PoolClient } from 'pg'
|
||||
import {
|
||||
DEFAULT_GIFT_COOLDOWN_HOURS,
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
THREE_DAY_GIFT_COOLDOWN_MINUTES,
|
||||
WORK_ORDER_ACCEPTANCE_MODE,
|
||||
WORK_ORDER_GIFT_PHASE,
|
||||
} from '../../domain/work-order-acceptance-mode.js'
|
||||
@@ -80,6 +82,8 @@ type WorkerOrderOverviewRow = {
|
||||
settlement_amount: number
|
||||
vip_evidence_pending_count: number
|
||||
vip_evidence_pending_settlement_amount: number
|
||||
gift_material_pending_count: number
|
||||
gift_material_pending_settlement_amount: number
|
||||
}
|
||||
|
||||
type WorkOrderStatisticsRow = {
|
||||
@@ -398,6 +402,7 @@ export async function listWorkOrders({
|
||||
visibleAfterIso = '',
|
||||
excludeFilledSharing = false,
|
||||
vipEvidencePending = false,
|
||||
giftMaterialPending = false,
|
||||
acceptanceMode = '',
|
||||
giftPhase = '',
|
||||
useOperationalStatus = false,
|
||||
@@ -424,6 +429,7 @@ export async function listWorkOrders({
|
||||
visibleAfterIso,
|
||||
excludeFilledSharing,
|
||||
vipEvidencePending,
|
||||
giftMaterialPending,
|
||||
acceptanceMode,
|
||||
giftPhase,
|
||||
// 无状态筛选时运营状态不影响列表入选,不应为此聚合整张拼单表。
|
||||
@@ -657,9 +663,27 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
settlementAmount: number
|
||||
vipEvidencePendingCount: number
|
||||
vipEvidencePendingSettlementAmount: number
|
||||
giftMaterialPendingCount: number
|
||||
giftMaterialPendingSettlementAmount: number
|
||||
}>
|
||||
> {
|
||||
const normalizedWorkerId = Number(workerId)
|
||||
// 「待提交打手资料」概览口径:与列表筛选、提交资料接口完全一致,
|
||||
// 只统计当前打手名下仍停在 material_required 的 3 天好友赠送单。
|
||||
const giftMaterialPendingFilter = `
|
||||
status IN ('in_progress', 'problem')
|
||||
AND is_assigned_to_me
|
||||
AND acceptance_mode = 'friend_gift'
|
||||
AND gift_phase = 'material_required'
|
||||
AND (
|
||||
CASE
|
||||
WHEN COALESCE(gift_cooldown_hours, 0) = 0
|
||||
AND COALESCE(gift_cooldown_minutes, 0) = 0
|
||||
THEN ${DEFAULT_GIFT_COOLDOWN_HOURS * 60}
|
||||
ELSE COALESCE(gift_cooldown_hours, 0) * 60 + COALESCE(gift_cooldown_minutes, 0)
|
||||
END
|
||||
) = ${THREE_DAY_GIFT_COOLDOWN_MINUTES}
|
||||
`
|
||||
const result = await query<WorkerOrderOverviewRow>(
|
||||
`
|
||||
WITH visible_orders AS (
|
||||
@@ -687,6 +711,10 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
wo.status AS wo_status,
|
||||
wo.reward_amount,
|
||||
wo.acceptance_json,
|
||||
wo.acceptance_mode,
|
||||
wo.gift_phase,
|
||||
wo.gift_cooldown_hours,
|
||||
wo.gift_cooldown_minutes,
|
||||
wo.assigned_worker_id = $1 AS is_assigned_to_me,
|
||||
EXISTS (
|
||||
SELECT 1 FROM work_order_events we
|
||||
@@ -739,14 +767,21 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
WHEN wos.status = 'accepted' THEN 'accepted'
|
||||
END AS status,
|
||||
SUM(wos.share_reward)::int AS amount,
|
||||
(ARRAY_AGG(wos.acceptance_json ORDER BY wos.id DESC))[1] AS acceptance_json
|
||||
(ARRAY_AGG(wos.acceptance_json ORDER BY wos.id DESC))[1] AS acceptance_json,
|
||||
f.acceptance_mode AS acceptance_mode,
|
||||
f.gift_phase AS gift_phase,
|
||||
f.gift_cooldown_hours AS gift_cooldown_hours,
|
||||
f.gift_cooldown_minutes AS gift_cooldown_minutes,
|
||||
f.is_assigned_to_me AS is_assigned_to_me
|
||||
FROM work_order_shares wos
|
||||
INNER JOIN order_flags f ON f.id = wos.work_order_id
|
||||
WHERE wos.worker_id = $1
|
||||
AND wos.status IN ('joined', 'submitted', 'accepted')
|
||||
AND f.wo_status NOT IN ('accepted', 'cancelled', 'problem')
|
||||
GROUP BY wos.work_order_id, wos.status, f.has_pending_handling,
|
||||
(wos.problem_marked_at IS NOT NULL)
|
||||
(wos.problem_marked_at IS NOT NULL),
|
||||
f.acceptance_mode, f.gift_phase, f.gift_cooldown_hours, f.gift_cooldown_minutes,
|
||||
f.is_assigned_to_me
|
||||
),
|
||||
order_status_rows AS (
|
||||
SELECT
|
||||
@@ -754,6 +789,11 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
status,
|
||||
amount,
|
||||
acceptance_json,
|
||||
acceptance_mode,
|
||||
gift_phase,
|
||||
gift_cooldown_hours,
|
||||
gift_cooldown_minutes,
|
||||
is_assigned_to_me,
|
||||
TRUE AS is_worker_share
|
||||
FROM share_status_rows
|
||||
|
||||
@@ -778,6 +818,11 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
ELSE 0
|
||||
END AS amount,
|
||||
f.acceptance_json,
|
||||
f.acceptance_mode,
|
||||
f.gift_phase,
|
||||
f.gift_cooldown_hours,
|
||||
f.gift_cooldown_minutes,
|
||||
f.is_assigned_to_me,
|
||||
f.is_worker_share
|
||||
FROM order_flags f
|
||||
WHERE
|
||||
@@ -813,7 +858,13 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
AND NULLIF(acceptance_json->>'evidenceDueAt', '')::timestamptz > NOW()
|
||||
),
|
||||
0
|
||||
)::int AS vip_evidence_pending_settlement_amount
|
||||
)::int AS vip_evidence_pending_settlement_amount,
|
||||
COUNT(*) FILTER (WHERE ${giftMaterialPendingFilter})::int
|
||||
AS gift_material_pending_count,
|
||||
COALESCE(
|
||||
SUM(amount) FILTER (WHERE ${giftMaterialPendingFilter}),
|
||||
0
|
||||
)::int AS gift_material_pending_settlement_amount
|
||||
FROM order_status_rows
|
||||
GROUP BY status
|
||||
|
||||
@@ -847,7 +898,13 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
AND NULLIF(acceptance_json->>'evidenceDueAt', '')::timestamptz > NOW()
|
||||
),
|
||||
0
|
||||
)::int AS vip_evidence_pending_settlement_amount
|
||||
)::int AS vip_evidence_pending_settlement_amount,
|
||||
COUNT(*) FILTER (WHERE ${giftMaterialPendingFilter})::int
|
||||
AS gift_material_pending_count,
|
||||
COALESCE(
|
||||
SUM(amount) FILTER (WHERE ${giftMaterialPendingFilter}),
|
||||
0
|
||||
)::int AS gift_material_pending_settlement_amount
|
||||
FROM order_status_rows
|
||||
`,
|
||||
[normalizedWorkerId],
|
||||
@@ -858,6 +915,8 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
||||
settlementAmount: Number(row.settlement_amount || 0),
|
||||
vipEvidencePendingCount: Number(row.vip_evidence_pending_count || 0),
|
||||
vipEvidencePendingSettlementAmount: Number(row.vip_evidence_pending_settlement_amount || 0),
|
||||
giftMaterialPendingCount: Number(row.gift_material_pending_count || 0),
|
||||
giftMaterialPendingSettlementAmount: Number(row.gift_material_pending_settlement_amount || 0),
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -1221,6 +1280,7 @@ export function buildWorkOrderWhere({
|
||||
visibleAfterIso = '',
|
||||
excludeFilledSharing = false,
|
||||
vipEvidencePending = false,
|
||||
giftMaterialPending = false,
|
||||
acceptanceMode = '',
|
||||
giftPhase = '',
|
||||
useOperationalStatus = false,
|
||||
@@ -1428,6 +1488,27 @@ export function buildWorkOrderWhere({
|
||||
}
|
||||
}
|
||||
}
|
||||
if (giftMaterialPending) {
|
||||
// 与「提交本人资料」接口同口径:只有当前接单人、仍停在 material_required 的赠送单
|
||||
// 才需要他补资料。3 天口径按实际生效的总冷却分钟数判断,0/0 为历史默认 72 小时。
|
||||
const workerScope = workerSharingId
|
||||
? `AND wo.assigned_worker_id = ${workerSharePlaceholder}::bigint`
|
||||
: ''
|
||||
filters.push(`(
|
||||
wo.acceptance_mode = '${WORK_ORDER_ACCEPTANCE_MODE.FRIEND_GIFT}'
|
||||
AND wo.gift_phase = '${WORK_ORDER_GIFT_PHASE.MATERIAL_REQUIRED}'
|
||||
AND wo.status IN ('in_progress', 'problem')
|
||||
AND (
|
||||
CASE
|
||||
WHEN COALESCE(wo.gift_cooldown_hours, 0) = 0
|
||||
AND COALESCE(wo.gift_cooldown_minutes, 0) = 0
|
||||
THEN ${DEFAULT_GIFT_COOLDOWN_HOURS * 60}
|
||||
ELSE COALESCE(wo.gift_cooldown_hours, 0) * 60 + COALESCE(wo.gift_cooldown_minutes, 0)
|
||||
END
|
||||
) = ${THREE_DAY_GIFT_COOLDOWN_MINUTES}
|
||||
${workerScope}
|
||||
)`)
|
||||
}
|
||||
if (workOrderId) {
|
||||
params.push(workOrderId)
|
||||
filters.push(`wo.id = $${params.length}`)
|
||||
|
||||
@@ -31,6 +31,7 @@ import { mapAdminTaskListItem } from '../admin/admin-task-read-helpers.js'
|
||||
import {
|
||||
isWorkOrderSharingFilled,
|
||||
isWorkerOrderVipEvidencePending,
|
||||
isWorkerThreeDayGiftMaterialPending,
|
||||
mapFinanceRequest,
|
||||
mapWorkOrderAdmin,
|
||||
mapWorkOrderForHall,
|
||||
@@ -504,6 +505,7 @@ async function publishWorkOrderSnapshots(input: {
|
||||
hasPendingHandling,
|
||||
hasTimeoutForMe: Boolean(timeoutEvent),
|
||||
vipEvidencePending,
|
||||
giftMaterialPending: isAssignedWorker && isWorkerThreeDayGiftMaterialPending(workOrder),
|
||||
}),
|
||||
problemMarked:
|
||||
!isTimedOutForMe &&
|
||||
|
||||
@@ -84,6 +84,7 @@ export {
|
||||
|
||||
export {
|
||||
isWorkerOrderVipEvidencePending,
|
||||
isWorkerThreeDayGiftMaterialPending,
|
||||
mapWorkCategory,
|
||||
mapWorkOrderAdmin,
|
||||
mapWorkOrderForHall,
|
||||
|
||||
@@ -89,12 +89,15 @@ test('后台:普通关键词(商品名/昵称)仍按原样下推全部筛
|
||||
})
|
||||
|
||||
test('打手端:显式单号检索忽略状态页签,但可见范围必须保留', () => {
|
||||
const explicit = resolveWorkerMyOrderStatusFilter('WO26101213031939', ['in_progress'], true)
|
||||
const explicit = resolveWorkerMyOrderStatusFilter('WO26101213031939', ['in_progress'], true, true)
|
||||
assert.deepEqual(explicit.statuses, [])
|
||||
assert.equal(explicit.vipEvidencePending, false)
|
||||
// 「待提交打手资料」同样是展示型筛选,按单号查时必须放掉
|
||||
assert.equal(explicit.giftMaterialPending, false)
|
||||
|
||||
// 普通关键词保持原状态筛选(否则「代练中」页签会突然显示别的状态)
|
||||
const fuzzy = resolveWorkerMyOrderStatusFilter('暗潮', ['in_progress'], true)
|
||||
const fuzzy = resolveWorkerMyOrderStatusFilter('暗潮', ['in_progress'], true, true)
|
||||
assert.deepEqual(fuzzy.statuses, ['in_progress'])
|
||||
assert.equal(fuzzy.vipEvidencePending, true)
|
||||
assert.equal(fuzzy.giftMaterialPending, true)
|
||||
})
|
||||
|
||||
@@ -4,6 +4,7 @@ import test from 'node:test'
|
||||
import type { WorkOrderRow, WorkOrderShareRow } from '../../repositories/worker-platform/types.js'
|
||||
import {
|
||||
isWorkerOrderVipEvidencePending,
|
||||
isWorkerThreeDayGiftMaterialPending,
|
||||
mapWorkOrderAdmin,
|
||||
mapWorkOrderMaterialWithConsignmentWorker,
|
||||
pickWorkerRepresentativeShare,
|
||||
@@ -222,6 +223,56 @@ test('VIP 免审核待补图:只有已验收 + vip_auto + 待补图 + 未到
|
||||
)
|
||||
})
|
||||
|
||||
test('待提交打手资料只认 3 天好友赠送 + material_required + 在办状态', () => {
|
||||
const base = {
|
||||
acceptance_mode: 'friend_gift',
|
||||
gift_phase: 'material_required',
|
||||
gift_cooldown_hours: 72,
|
||||
gift_cooldown_minutes: 0,
|
||||
status: 'in_progress',
|
||||
}
|
||||
assert.equal(isWorkerThreeDayGiftMaterialPending(base), true)
|
||||
assert.equal(isWorkerThreeDayGiftMaterialPending({ ...base, status: 'problem' }), true)
|
||||
// 按分钟配置的 3 天
|
||||
assert.equal(
|
||||
isWorkerThreeDayGiftMaterialPending({
|
||||
...base,
|
||||
gift_cooldown_hours: 0,
|
||||
gift_cooldown_minutes: 4320,
|
||||
}),
|
||||
true,
|
||||
)
|
||||
// 非 3 天、已交资料、已终态、标准验收都不算
|
||||
assert.equal(isWorkerThreeDayGiftMaterialPending({ ...base, gift_cooldown_hours: 24 }), false)
|
||||
assert.equal(
|
||||
isWorkerThreeDayGiftMaterialPending({ ...base, gift_phase: 'material_submitted' }),
|
||||
false,
|
||||
)
|
||||
assert.equal(isWorkerThreeDayGiftMaterialPending({ ...base, status: 'accepted' }), false)
|
||||
assert.equal(isWorkerThreeDayGiftMaterialPending({ ...base, acceptance_mode: 'standard' }), false)
|
||||
})
|
||||
|
||||
test('待提交打手资料是加性页签:代练中/问题单仍保留', () => {
|
||||
assert.deepEqual(
|
||||
resolveWorkerOrderStatusTabs({
|
||||
workOrderStatus: 'in_progress',
|
||||
isAssignedWorker: true,
|
||||
shares: [],
|
||||
giftMaterialPending: true,
|
||||
}).sort(),
|
||||
['awaiting_gift_material', 'in_progress'],
|
||||
)
|
||||
assert.deepEqual(
|
||||
resolveWorkerOrderStatusTabs({
|
||||
workOrderStatus: 'problem',
|
||||
isAssignedWorker: true,
|
||||
shares: [],
|
||||
giftMaterialPending: true,
|
||||
}).sort(),
|
||||
['awaiting_gift_material', 'problem'],
|
||||
)
|
||||
})
|
||||
|
||||
test('份额级问题单:被标记的份额只归问题单,同单其他份额仍按原状态归类', () => {
|
||||
const tabs = resolveWorkerOrderStatusTabs({
|
||||
workOrderStatus: 'in_progress',
|
||||
|
||||
@@ -5,7 +5,9 @@ import {
|
||||
normalizeWorkOrderAcceptanceMode,
|
||||
normalizeWorkOrderGiftCooldownHours,
|
||||
normalizeWorkOrderGiftCooldownMinutes,
|
||||
resolveWorkOrderGiftCooldownTotalMinutes,
|
||||
resolveWorkOrderGiftPhase,
|
||||
THREE_DAY_GIFT_COOLDOWN_MINUTES,
|
||||
WORK_ORDER_ACCEPTANCE_MODE,
|
||||
WORK_ORDER_GIFT_PHASE,
|
||||
} from '../../domain/work-order-acceptance-mode.js'
|
||||
@@ -862,6 +864,28 @@ export type WorkerOrderStatusTab =
|
||||
| 'accepted'
|
||||
| 'cancelled'
|
||||
| 'vip_evidence_pending'
|
||||
| 'awaiting_gift_material'
|
||||
|
||||
/**
|
||||
* 3 天(72h)好友赠送单是否仍在等待接单打手提交本人资料。
|
||||
*
|
||||
* 与 `buildWorkOrderWhere` 的 giftMaterialPending 筛选、提交资料接口完全同口径:
|
||||
* 只判工单自身字段;是否属于当前打手由调用方用 assigned_worker_id 再判。
|
||||
*/
|
||||
export function isWorkerThreeDayGiftMaterialPending(workOrder: {
|
||||
acceptance_mode?: unknown
|
||||
gift_phase?: unknown
|
||||
gift_cooldown_hours?: unknown
|
||||
gift_cooldown_minutes?: unknown
|
||||
status?: unknown
|
||||
}): boolean {
|
||||
if (!isFriendGiftAcceptanceMode(workOrder.acceptance_mode)) return false
|
||||
if (String(workOrder.gift_phase || '').trim() !== WORK_ORDER_GIFT_PHASE.MATERIAL_REQUIRED) {
|
||||
return false
|
||||
}
|
||||
if (!['in_progress', 'problem'].includes(String(workOrder.status || ''))) return false
|
||||
return resolveWorkOrderGiftCooldownTotalMinutes(workOrder) === THREE_DAY_GIFT_COOLDOWN_MINUTES
|
||||
}
|
||||
|
||||
/** 母单进入终态后,列表只按母单状态归类(任一命中分支会被 wo.status NOT IN (...) 关掉)。 */
|
||||
const TERMINAL_WORK_ORDER_STATUSES = new Set(['accepted', 'cancelled', 'problem'])
|
||||
@@ -943,10 +967,13 @@ export function resolveWorkerOrderStatusTabs(input: {
|
||||
hasTimeoutForMe?: boolean
|
||||
/** 命中「VIP 免审核待补图」筛选(列表里它是独立筛选,不参与 status 参数)。 */
|
||||
vipEvidencePending?: boolean
|
||||
/** 命中「待提交打手资料」筛选(3 天赠送单加性页签,不参与 status 参数)。 */
|
||||
giftMaterialPending?: boolean
|
||||
}): WorkerOrderStatusTab[] {
|
||||
const tabs = new Set<WorkerOrderStatusTab>()
|
||||
const workOrderStatus = String(input.workOrderStatus || '')
|
||||
if (input.vipEvidencePending) tabs.add('vip_evidence_pending')
|
||||
if (input.giftMaterialPending) tabs.add('awaiting_gift_material')
|
||||
|
||||
if (TERMINAL_WORK_ORDER_STATUSES.has(workOrderStatus)) {
|
||||
tabs.add(workOrderStatus as WorkerOrderStatusTab)
|
||||
|
||||
@@ -72,18 +72,26 @@ import {
|
||||
* 前端的状态页签(默认停在「代练中」)不该把它挡掉——打手按工单号查自己的单,
|
||||
* 却因为单据已流转到「待验收 / 已验收 / 问题单」而搜不到,线上同样出现过。
|
||||
*
|
||||
* 注意:这里**只**放掉状态与 VIP 待补图这类展示筛选,
|
||||
* 「待补图」「待提交打手资料」这类展示型筛选同样要在单号检索时放掉,
|
||||
* 否则按单号搜一张刚接单的赠送单会因为筛选条件不匹配而空结果。
|
||||
*
|
||||
* 注意:这里**只**放掉状态与展示筛选,
|
||||
* 可见范围 workerSharingId 必须保留,否则打手能搜到别人的单。
|
||||
*/
|
||||
export function resolveWorkerMyOrderStatusFilter(
|
||||
keyword: string,
|
||||
statuses: string[],
|
||||
vipEvidencePending: boolean,
|
||||
): { statuses: string[]; vipEvidencePending: boolean } {
|
||||
giftMaterialPending = false,
|
||||
): {
|
||||
statuses: string[]
|
||||
vipEvidencePending: boolean
|
||||
giftMaterialPending: boolean
|
||||
} {
|
||||
if (isExplicitOrderNoLookupKeyword(keyword)) {
|
||||
return { statuses: [], vipEvidencePending: false }
|
||||
return { statuses: [], vipEvidencePending: false, giftMaterialPending: false }
|
||||
}
|
||||
return { statuses, vipEvidencePending }
|
||||
return { statuses, vipEvidencePending, giftMaterialPending }
|
||||
}
|
||||
|
||||
export async function listWorkerMyOrders(query: JsonObject = {}, session: WorkerSession) {
|
||||
@@ -92,6 +100,7 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
|
||||
const page = normalizePage(query.page)
|
||||
const pageSize = normalizePageSize(query.pageSize)
|
||||
const vipEvidencePending = normalizeBoolean(query.vipEvidencePending, false)
|
||||
const giftMaterialPending = normalizeBoolean(query.giftMaterialPending, false)
|
||||
const permissions = resolveWorkerPermissions(worker)
|
||||
const statuses = normalizeStatuses(query.status)
|
||||
const keyword = normalizeLookupKeyword(query.keyword)
|
||||
@@ -99,6 +108,7 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
|
||||
keyword,
|
||||
statuses,
|
||||
vipEvidencePending,
|
||||
giftMaterialPending,
|
||||
)
|
||||
const cacheKey = buildMyOrderCacheKey(worker.id, 'list', [
|
||||
page,
|
||||
@@ -106,6 +116,7 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
|
||||
effectiveStatusFilter.statuses,
|
||||
keyword,
|
||||
effectiveStatusFilter.vipEvidencePending,
|
||||
effectiveStatusFilter.giftMaterialPending,
|
||||
])
|
||||
return myOrderListCache.getOrSet(cacheKey, async () => {
|
||||
const { items, total } = await listWorkOrders({
|
||||
@@ -115,6 +126,7 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
|
||||
keyword,
|
||||
workerSharingId: worker.id,
|
||||
vipEvidencePending: effectiveStatusFilter.vipEvidencePending,
|
||||
giftMaterialPending: effectiveStatusFilter.giftMaterialPending,
|
||||
sort: 'worker_claimed_at_desc',
|
||||
})
|
||||
const workOrderIds = items.map((item) => Number(item.id))
|
||||
@@ -245,15 +257,24 @@ export async function listWorkerMyOrders(query: JsonObject = {}, session: Worker
|
||||
})
|
||||
}
|
||||
|
||||
/** 打手订单标签概览:订单数与预计或已结算金额。 */
|
||||
export async function getWorkerMyOrderOverview(session: WorkerSession) {
|
||||
requireActiveWorkerSession(session)
|
||||
const worker = await getRequiredWorker(session.workerId)
|
||||
await settleOverdueWorkOrders({ workerId: worker.id, limit: 50 })
|
||||
const rows = await myOrderOverviewCache.getOrSet(
|
||||
buildMyOrderCacheKey(worker.id, 'overview', 0),
|
||||
() => getWorkerOrderOverview(worker.id),
|
||||
)
|
||||
type WorkerOrderOverviewRowLike = {
|
||||
status: string
|
||||
orderCount: number
|
||||
settlementAmount: number
|
||||
vipEvidencePendingCount: number
|
||||
vipEvidencePendingSettlementAmount: number
|
||||
giftMaterialPendingCount: number
|
||||
giftMaterialPendingSettlementAmount: number
|
||||
}
|
||||
|
||||
/**
|
||||
* 把概览 SQL 行合并成前端页签用的 items。
|
||||
*
|
||||
* 「待补图」「待提交打手资料」都是**加性筛选**:同一张单仍留在原状态页签里,
|
||||
* 这两个伪页签只做展示;「全部订单」必须用 SQL 按 distinct 工单算好的 all 行,
|
||||
* 不能再把各页签相加(多份额工单会出现在多个页签里)。
|
||||
*/
|
||||
export function buildWorkerMyOrderOverviewItems(rows: WorkerOrderOverviewRowLike[]) {
|
||||
const statusRows = rows.filter((row) => row.status !== 'all')
|
||||
const items = statusRows.map((row) => ({
|
||||
status: row.status,
|
||||
@@ -267,6 +288,13 @@ export async function getWorkerMyOrderOverview(session: WorkerSession) {
|
||||
}),
|
||||
{ orderCount: 0, settlementAmount: 0 },
|
||||
)
|
||||
const giftMaterialPending = statusRows.reduce(
|
||||
(summary, row) => ({
|
||||
orderCount: summary.orderCount + row.giftMaterialPendingCount,
|
||||
settlementAmount: summary.settlementAmount + row.giftMaterialPendingSettlementAmount,
|
||||
}),
|
||||
{ orderCount: 0, settlementAmount: 0 },
|
||||
)
|
||||
// 混合状态的多份额工单会同时出现在多个页签,不能再用各页签相加当「全部订单」,
|
||||
// 否则同一工单会被重复计数;优先使用 SQL 里按 distinct 工单算好的 all 行。
|
||||
const allRow = rows.find((row) => row.status === 'all')
|
||||
@@ -282,12 +310,25 @@ export async function getWorkerMyOrderOverview(session: WorkerSession) {
|
||||
return {
|
||||
items: [
|
||||
...items,
|
||||
{ status: 'awaiting_gift_material', ...giftMaterialPending },
|
||||
{ status: 'vip_evidence_pending', ...vipEvidencePending },
|
||||
{ status: 'all', ...all },
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
/** 打手订单标签概览:订单数与预计或已结算金额。 */
|
||||
export async function getWorkerMyOrderOverview(session: WorkerSession) {
|
||||
requireActiveWorkerSession(session)
|
||||
const worker = await getRequiredWorker(session.workerId)
|
||||
await settleOverdueWorkOrders({ workerId: worker.id, limit: 50 })
|
||||
const rows = await myOrderOverviewCache.getOrSet(
|
||||
buildMyOrderCacheKey(worker.id, 'overview', 0),
|
||||
() => getWorkerOrderOverview(worker.id),
|
||||
)
|
||||
return buildWorkerMyOrderOverviewItems(rows)
|
||||
}
|
||||
|
||||
export async function getWorkerMyOrderEvents(workOrderId: number | string, session: WorkerSession) {
|
||||
requireActiveWorkerSession(session)
|
||||
if (runtimeConfig.worker.orderTimelineVisible !== true) {
|
||||
|
||||
@@ -84,6 +84,7 @@ import {
|
||||
assertConsignmentRevocableWorkOrderStatus,
|
||||
resolveRevocableConsignmentInventoryId,
|
||||
} from './consignment-fulfillment-service.js'
|
||||
import { buildWorkerMyOrderOverviewItems } from './worker-my-order-service.js'
|
||||
|
||||
test('后台权限白名单覆盖全部迁移登记的权限,避免保存角色权限时被静默清除', () => {
|
||||
const migrationsDir = fileURLToPath(new URL('../../db/migrations', import.meta.url))
|
||||
@@ -3229,6 +3230,64 @@ test('打手端「我的订单」概览必须有覆盖索引 + 短缓存(数
|
||||
)
|
||||
})
|
||||
|
||||
test('打手端概览把「待提交打手资料」合成独立页签,不改变原有状态与全部订单', () => {
|
||||
const result = buildWorkerMyOrderOverviewItems([
|
||||
{
|
||||
status: 'in_progress',
|
||||
orderCount: 5,
|
||||
settlementAmount: 5000,
|
||||
vipEvidencePendingCount: 0,
|
||||
vipEvidencePendingSettlementAmount: 0,
|
||||
giftMaterialPendingCount: 2,
|
||||
giftMaterialPendingSettlementAmount: 2000,
|
||||
},
|
||||
{
|
||||
status: 'problem',
|
||||
orderCount: 1,
|
||||
settlementAmount: 1000,
|
||||
vipEvidencePendingCount: 0,
|
||||
vipEvidencePendingSettlementAmount: 0,
|
||||
giftMaterialPendingCount: 1,
|
||||
giftMaterialPendingSettlementAmount: 1000,
|
||||
},
|
||||
{
|
||||
status: 'accepted',
|
||||
orderCount: 3,
|
||||
settlementAmount: 3000,
|
||||
vipEvidencePendingCount: 1,
|
||||
vipEvidencePendingSettlementAmount: 1000,
|
||||
giftMaterialPendingCount: 0,
|
||||
giftMaterialPendingSettlementAmount: 0,
|
||||
},
|
||||
// all 行由 SQL 按 distinct 工单给出,不能等于各页签相加
|
||||
{
|
||||
status: 'all',
|
||||
orderCount: 9,
|
||||
settlementAmount: 9000,
|
||||
vipEvidencePendingCount: 1,
|
||||
vipEvidencePendingSettlementAmount: 1000,
|
||||
giftMaterialPendingCount: 3,
|
||||
giftMaterialPendingSettlementAmount: 3000,
|
||||
},
|
||||
])
|
||||
const byStatus = new Map(result.items.map((item) => [item.status, item]))
|
||||
|
||||
assert.deepEqual(byStatus.get('awaiting_gift_material'), {
|
||||
status: 'awaiting_gift_material',
|
||||
orderCount: 3,
|
||||
settlementAmount: 3000,
|
||||
})
|
||||
// 加性筛选:原状态页签数量不变
|
||||
assert.equal(byStatus.get('in_progress')?.orderCount, 5)
|
||||
assert.equal(byStatus.get('problem')?.orderCount, 1)
|
||||
// 全部订单仍用 SQL 的 distinct 行,不把伪页签重复相加
|
||||
assert.deepEqual(byStatus.get('all'), {
|
||||
status: 'all',
|
||||
orderCount: 9,
|
||||
settlementAmount: 9000,
|
||||
})
|
||||
})
|
||||
|
||||
test('「我的订单」缓存必须事件驱动失效(长 TTL 的安全前提)', async () => {
|
||||
const { readFile } = await import('node:fs/promises')
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ import {
|
||||
|
||||
const STATUS_OPTIONS = [
|
||||
{ value: 'in_progress', label: '代练中' },
|
||||
{ value: 'awaiting_gift_material', label: '待提交打手资料' },
|
||||
{ value: 'pending_acceptance', label: '待验收' },
|
||||
{ value: 'problem', label: '问题单' },
|
||||
{ value: 'open', label: '已超时' },
|
||||
|
||||
@@ -8,6 +8,10 @@ export function buildWorkerOrderQuery(
|
||||
keyword,
|
||||
page,
|
||||
pageSize,
|
||||
...(status === 'vip_evidence_pending' ? { vipEvidencePending: true } : { status }),
|
||||
...(status === 'vip_evidence_pending'
|
||||
? { vipEvidencePending: true }
|
||||
: status === 'awaiting_gift_material'
|
||||
? { giftMaterialPending: true }
|
||||
: { status }),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,15 @@ test('打手订单页待补图筛选使用独立标记', () => {
|
||||
})
|
||||
})
|
||||
|
||||
test('打手订单页待提交打手资料筛选使用独立标记', () => {
|
||||
assert.deepEqual(buildWorkerOrderQuery('awaiting_gift_material', '', 1, 20), {
|
||||
giftMaterialPending: true,
|
||||
keyword: '',
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
})
|
||||
})
|
||||
|
||||
test('打手订单页选择全部订单时不附加状态筛选值', () => {
|
||||
assert.deepEqual(buildWorkerOrderQuery('', '', 1, 20), {
|
||||
status: '',
|
||||
|
||||
@@ -361,6 +361,32 @@ test('VIP 待补图页签也靠 workerStatuses 判定,不会被当成状态不
|
||||
assert.equal(verdict.operation, 'upsert')
|
||||
})
|
||||
|
||||
test('待提交打手资料页签也靠 workerStatuses 判定:提交资料后被移出页签', () => {
|
||||
const keep = resolveWorkerMyOrderRealtimeVerdict({
|
||||
item: buildRow({
|
||||
status: 'in_progress',
|
||||
workerStatuses: ['in_progress', 'awaiting_gift_material'],
|
||||
}),
|
||||
statusFilter: 'awaiting_gift_material',
|
||||
keyword: '',
|
||||
operation: 'upsert',
|
||||
page: 1,
|
||||
explicitOrderNo: false,
|
||||
})
|
||||
assert.equal(keep.operation, 'upsert')
|
||||
|
||||
// 资料提交后 gift_phase 变为 material_submitted,快照不再包含该页签
|
||||
const leave = resolveWorkerMyOrderRealtimeVerdict({
|
||||
item: buildRow({ status: 'in_progress', workerStatuses: ['in_progress'] }),
|
||||
statusFilter: 'awaiting_gift_material',
|
||||
keyword: '',
|
||||
operation: 'upsert',
|
||||
page: 1,
|
||||
explicitOrderNo: false,
|
||||
})
|
||||
assert.equal(leave.operation, 'remove')
|
||||
})
|
||||
|
||||
test('没有 workerStatuses 的旧快照仍按单个 status 比对(保持既有行为)', () => {
|
||||
const mismatch = resolveWorkerMyOrderRealtimeVerdict({
|
||||
item: buildRow({ status: 'accepted' }),
|
||||
|
||||
Reference in New Issue
Block a user