完善接单平台通知配置
This commit is contained in:
@@ -3,6 +3,7 @@ export const APP_CONFIG_KEYS = {
|
|||||||
scheduledJobs: 'scheduled_jobs',
|
scheduledJobs: 'scheduled_jobs',
|
||||||
fulfillmentRouting: 'fulfillment_routing',
|
fulfillmentRouting: 'fulfillment_routing',
|
||||||
workerFinance: 'worker_finance',
|
workerFinance: 'worker_finance',
|
||||||
|
workerPlatformNotifications: 'worker_platform_notifications',
|
||||||
cloudtentaclesSources: 'cloudtentacles_sources',
|
cloudtentaclesSources: 'cloudtentacles_sources',
|
||||||
cloudtentaclesSession: 'cloudtentacles_session',
|
cloudtentaclesSession: 'cloudtentacles_session',
|
||||||
cloudtentaclesOverrideRules: 'cloudtentacles_override_rules',
|
cloudtentaclesOverrideRules: 'cloudtentacles_override_rules',
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
-- 后台待办通知:业务状态驱动,多个后台账号共享处理状态。
|
||||||
|
CREATE TABLE IF NOT EXISTS admin_notifications (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
notification_type TEXT NOT NULL,
|
||||||
|
priority TEXT NOT NULL DEFAULT 'normal',
|
||||||
|
entity_type TEXT NOT NULL,
|
||||||
|
entity_id BIGINT NOT NULL,
|
||||||
|
dedupe_key TEXT NOT NULL UNIQUE,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
body TEXT NOT NULL DEFAULT '',
|
||||||
|
action_path TEXT NOT NULL DEFAULT '',
|
||||||
|
payload_json JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
reminder_count INTEGER NOT NULL DEFAULT 0,
|
||||||
|
last_reminded_at TIMESTAMPTZ,
|
||||||
|
status TEXT NOT NULL DEFAULT 'pending',
|
||||||
|
resolved_at TIMESTAMPTZ,
|
||||||
|
resolution_reason TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL,
|
||||||
|
updated_at TIMESTAMPTZ NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_admin_notifications_pending
|
||||||
|
ON admin_notifications (status, priority, updated_at DESC);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_admin_notifications_entity
|
||||||
|
ON admin_notifications (entity_type, entity_id);
|
||||||
|
|
||||||
|
COMMENT ON TABLE admin_notifications IS '后台共享业务待办通知,不使用个人已读状态';
|
||||||
|
COMMENT ON COLUMN admin_notifications.dedupe_key IS '同一业务待办的唯一标识';
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- 隐藏待办用于保留业务催办状态,不展示在后台铃铛中。
|
||||||
|
ALTER TABLE admin_notifications
|
||||||
|
ADD COLUMN IF NOT EXISTS visible BOOLEAN NOT NULL DEFAULT TRUE;
|
||||||
|
|
||||||
|
-- 每条待办保存创建或更新当时的声音开关,配置调整不影响历史待办。
|
||||||
|
ALTER TABLE admin_notifications
|
||||||
|
ADD COLUMN IF NOT EXISTS sound_enabled BOOLEAN NOT NULL DEFAULT TRUE;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_admin_notifications_visible_pending
|
||||||
|
ON admin_notifications (visible, status, priority, updated_at DESC);
|
||||||
|
|
||||||
|
COMMENT ON COLUMN admin_notifications.visible IS '是否展示在后台待办铃铛中';
|
||||||
|
COMMENT ON COLUMN admin_notifications.sound_enabled IS '该次待办更新是否允许浏览器声音播报';
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
import { query } from '../db/client.js'
|
||||||
|
|
||||||
|
export type AdminNotificationRow = {
|
||||||
|
id: number
|
||||||
|
notification_type: string
|
||||||
|
priority: string
|
||||||
|
entity_type: string
|
||||||
|
entity_id: number
|
||||||
|
dedupe_key: string
|
||||||
|
title: string
|
||||||
|
body: string
|
||||||
|
action_path: string
|
||||||
|
payload_json: string | Record<string, unknown>
|
||||||
|
visible: boolean
|
||||||
|
sound_enabled: boolean
|
||||||
|
reminder_count: number
|
||||||
|
last_reminded_at: string | null
|
||||||
|
status: string
|
||||||
|
resolved_at: string | null
|
||||||
|
resolution_reason: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createAdminNotification(input: {
|
||||||
|
notificationType: string
|
||||||
|
priority: string
|
||||||
|
entityType: string
|
||||||
|
entityId: number
|
||||||
|
dedupeKey: string
|
||||||
|
title: string
|
||||||
|
body: string
|
||||||
|
actionPath: string
|
||||||
|
payloadJson?: string
|
||||||
|
visible?: boolean
|
||||||
|
soundEnabled?: boolean
|
||||||
|
now: string
|
||||||
|
}): Promise<AdminNotificationRow | null> {
|
||||||
|
const result = await query<AdminNotificationRow>(
|
||||||
|
`
|
||||||
|
INSERT INTO admin_notifications (
|
||||||
|
notification_type, priority, entity_type, entity_id, dedupe_key,
|
||||||
|
title, body, action_path, payload_json, visible, sound_enabled, created_at, updated_at
|
||||||
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::jsonb, $10, $11, $12, $12)
|
||||||
|
ON CONFLICT (dedupe_key) DO NOTHING
|
||||||
|
RETURNING *
|
||||||
|
`,
|
||||||
|
[
|
||||||
|
input.notificationType,
|
||||||
|
input.priority,
|
||||||
|
input.entityType,
|
||||||
|
input.entityId,
|
||||||
|
input.dedupeKey,
|
||||||
|
input.title,
|
||||||
|
input.body,
|
||||||
|
input.actionPath,
|
||||||
|
input.payloadJson || '{}',
|
||||||
|
input.visible !== false,
|
||||||
|
input.soundEnabled !== false,
|
||||||
|
input.now,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
return result.rows[0] || null
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getPendingAdminNotificationByDedupeKey(
|
||||||
|
dedupeKey: string,
|
||||||
|
): Promise<AdminNotificationRow | null> {
|
||||||
|
const result = await query<AdminNotificationRow>(
|
||||||
|
`SELECT * FROM admin_notifications WHERE dedupe_key = $1 AND status = 'pending' LIMIT 1`,
|
||||||
|
[dedupeKey],
|
||||||
|
)
|
||||||
|
return result.rows[0] || null
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function bumpAdminNotificationReminder(input: {
|
||||||
|
dedupeKey: string
|
||||||
|
notificationType: string
|
||||||
|
title: string
|
||||||
|
visible: boolean
|
||||||
|
soundEnabled: boolean
|
||||||
|
now: string
|
||||||
|
}): Promise<AdminNotificationRow | null> {
|
||||||
|
const result = await query<AdminNotificationRow>(
|
||||||
|
`
|
||||||
|
UPDATE admin_notifications
|
||||||
|
SET
|
||||||
|
notification_type = $1,
|
||||||
|
title = $2,
|
||||||
|
priority = 'high',
|
||||||
|
visible = visible OR $3,
|
||||||
|
sound_enabled = $4,
|
||||||
|
reminder_count = reminder_count + 1,
|
||||||
|
last_reminded_at = $5,
|
||||||
|
updated_at = $5
|
||||||
|
WHERE dedupe_key = $6
|
||||||
|
AND status = 'pending'
|
||||||
|
AND reminder_count < 3
|
||||||
|
AND (
|
||||||
|
last_reminded_at IS NULL
|
||||||
|
OR last_reminded_at <= $5::timestamptz - INTERVAL '30 minutes'
|
||||||
|
)
|
||||||
|
RETURNING *
|
||||||
|
`,
|
||||||
|
[
|
||||||
|
input.notificationType,
|
||||||
|
input.title,
|
||||||
|
input.visible,
|
||||||
|
input.soundEnabled,
|
||||||
|
input.now,
|
||||||
|
input.dedupeKey,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
return result.rows[0] || null
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function resolveAdminNotificationsByEntity(input: {
|
||||||
|
entityType: string
|
||||||
|
entityId: number
|
||||||
|
reason: string
|
||||||
|
now: string
|
||||||
|
}): Promise<void> {
|
||||||
|
await query(
|
||||||
|
`
|
||||||
|
UPDATE admin_notifications
|
||||||
|
SET status = 'resolved', resolved_at = $1, resolution_reason = $2, updated_at = $1
|
||||||
|
WHERE entity_type = $3 AND entity_id = $4 AND status = 'pending'
|
||||||
|
`,
|
||||||
|
[input.now, input.reason, input.entityType, input.entityId],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listPendingAdminNotifications(
|
||||||
|
limit: number,
|
||||||
|
): Promise<AdminNotificationRow[]> {
|
||||||
|
const result = await query<AdminNotificationRow>(
|
||||||
|
`
|
||||||
|
SELECT *
|
||||||
|
FROM admin_notifications
|
||||||
|
WHERE status = 'pending' AND visible = TRUE
|
||||||
|
ORDER BY
|
||||||
|
CASE priority WHEN 'urgent' THEN 3 WHEN 'high' THEN 2 ELSE 1 END DESC,
|
||||||
|
updated_at DESC,
|
||||||
|
id DESC
|
||||||
|
LIMIT $1
|
||||||
|
`,
|
||||||
|
[limit],
|
||||||
|
)
|
||||||
|
return result.rows
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function countPendingAdminNotifications(): Promise<number> {
|
||||||
|
const result = await query<{ total: number }>(
|
||||||
|
`SELECT COUNT(*)::int AS total FROM admin_notifications WHERE status = 'pending' AND visible = TRUE`,
|
||||||
|
)
|
||||||
|
return Number(result.rows[0]?.total || 0)
|
||||||
|
}
|
||||||
@@ -221,6 +221,8 @@ export type ListInput = {
|
|||||||
status?: string
|
status?: string
|
||||||
/** 支持多个状态同时筛选(空数组表示全部状态) */
|
/** 支持多个状态同时筛选(空数组表示全部状态) */
|
||||||
statuses?: string[]
|
statuses?: string[]
|
||||||
|
/** 后台待办跳转时按工单主键精确定位 */
|
||||||
|
workOrderId?: number
|
||||||
keyword?: string
|
keyword?: string
|
||||||
workerId?: number
|
workerId?: number
|
||||||
categoryId?: number
|
categoryId?: number
|
||||||
@@ -248,6 +250,8 @@ export type WalletLedgerListInput = {
|
|||||||
export type FinanceRequestListInput = {
|
export type FinanceRequestListInput = {
|
||||||
page?: number
|
page?: number
|
||||||
pageSize?: number
|
pageSize?: number
|
||||||
|
/** 后台待办跳转时按资金申请主键精确定位 */
|
||||||
|
requestId?: number
|
||||||
workerId?: number
|
workerId?: number
|
||||||
status?: string
|
status?: string
|
||||||
requestType?: string
|
requestType?: string
|
||||||
|
|||||||
@@ -767,6 +767,7 @@ export async function listWorkOrders({
|
|||||||
pageSize = 20,
|
pageSize = 20,
|
||||||
statuses = [],
|
statuses = [],
|
||||||
status = '',
|
status = '',
|
||||||
|
workOrderId = 0,
|
||||||
keyword = '',
|
keyword = '',
|
||||||
workerId = 0,
|
workerId = 0,
|
||||||
categoryId = 0,
|
categoryId = 0,
|
||||||
@@ -779,6 +780,7 @@ export async function listWorkOrders({
|
|||||||
const effectiveStatuses = statuses.length > 0 ? statuses : status.trim() ? [status.trim()] : []
|
const effectiveStatuses = statuses.length > 0 ? statuses : status.trim() ? [status.trim()] : []
|
||||||
const { whereClause, params } = buildWorkOrderWhere({
|
const { whereClause, params } = buildWorkOrderWhere({
|
||||||
statuses: effectiveStatuses,
|
statuses: effectiveStatuses,
|
||||||
|
workOrderId,
|
||||||
keyword,
|
keyword,
|
||||||
workerId,
|
workerId,
|
||||||
categoryId,
|
categoryId,
|
||||||
@@ -2665,6 +2667,7 @@ async function getWorkOrderByIdWithClient(
|
|||||||
|
|
||||||
function buildWorkOrderWhere({
|
function buildWorkOrderWhere({
|
||||||
statuses = [],
|
statuses = [],
|
||||||
|
workOrderId = 0,
|
||||||
keyword = '',
|
keyword = '',
|
||||||
workerId = 0,
|
workerId = 0,
|
||||||
categoryId = 0,
|
categoryId = 0,
|
||||||
@@ -2694,6 +2697,10 @@ function buildWorkOrderWhere({
|
|||||||
params.push(normalizedStatuses)
|
params.push(normalizedStatuses)
|
||||||
filters.push(`wo.status = ANY($${params.length}::text[])`)
|
filters.push(`wo.status = ANY($${params.length}::text[])`)
|
||||||
}
|
}
|
||||||
|
if (workOrderId) {
|
||||||
|
params.push(workOrderId)
|
||||||
|
filters.push(`wo.id = $${params.length}`)
|
||||||
|
}
|
||||||
if (keyword) {
|
if (keyword) {
|
||||||
params.push(`%${keyword}%`)
|
params.push(`%${keyword}%`)
|
||||||
filters.push(
|
filters.push(
|
||||||
|
|||||||
@@ -562,12 +562,14 @@ export async function countWorkerWithdrawRequestsOnDay(
|
|||||||
export async function listWorkerFinanceRequests({
|
export async function listWorkerFinanceRequests({
|
||||||
page = 1,
|
page = 1,
|
||||||
pageSize = 20,
|
pageSize = 20,
|
||||||
|
requestId = 0,
|
||||||
workerId = 0,
|
workerId = 0,
|
||||||
status = '',
|
status = '',
|
||||||
requestType = '',
|
requestType = '',
|
||||||
keyword = '',
|
keyword = '',
|
||||||
}: FinanceRequestListInput = {}): Promise<{ items: WorkerFinanceRequestRow[]; total: number }> {
|
}: FinanceRequestListInput = {}): Promise<{ items: WorkerFinanceRequestRow[]; total: number }> {
|
||||||
const { whereClause, params } = buildWorkerFinanceRequestWhere({
|
const { whereClause, params } = buildWorkerFinanceRequestWhere({
|
||||||
|
requestId,
|
||||||
workerId,
|
workerId,
|
||||||
status,
|
status,
|
||||||
requestType,
|
requestType,
|
||||||
@@ -1018,6 +1020,7 @@ function buildWorkerWalletLedgerWhere({ workerId = 0, ledgerType = '' }: WalletL
|
|||||||
}
|
}
|
||||||
|
|
||||||
function buildWorkerFinanceRequestWhere({
|
function buildWorkerFinanceRequestWhere({
|
||||||
|
requestId = 0,
|
||||||
workerId = 0,
|
workerId = 0,
|
||||||
status = '',
|
status = '',
|
||||||
requestType = '',
|
requestType = '',
|
||||||
@@ -1025,6 +1028,10 @@ function buildWorkerFinanceRequestWhere({
|
|||||||
}: FinanceRequestListInput) {
|
}: FinanceRequestListInput) {
|
||||||
const filters: string[] = []
|
const filters: string[] = []
|
||||||
const params: unknown[] = []
|
const params: unknown[] = []
|
||||||
|
if (requestId) {
|
||||||
|
params.push(requestId)
|
||||||
|
filters.push(`wfr.id = $${params.length}`)
|
||||||
|
}
|
||||||
if (workerId) {
|
if (workerId) {
|
||||||
params.push(workerId)
|
params.push(workerId)
|
||||||
filters.push(`wfr.worker_id = $${params.length}`)
|
filters.push(`wfr.worker_id = $${params.length}`)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import devMockRouter from './admin/dev-mock.js'
|
|||||||
import filesRouter from './admin/files.js'
|
import filesRouter from './admin/files.js'
|
||||||
import kuaishouIndustryRouter from './admin/kuaishou-industry.js'
|
import kuaishouIndustryRouter from './admin/kuaishou-industry.js'
|
||||||
import ordersRouter from './admin/orders.js'
|
import ordersRouter from './admin/orders.js'
|
||||||
|
import notificationsRouter from './admin/notifications.js'
|
||||||
import platformConfigRouter from './admin/platform-config.js'
|
import platformConfigRouter from './admin/platform-config.js'
|
||||||
import { requireAdminSession } from './admin/session.js'
|
import { requireAdminSession } from './admin/session.js'
|
||||||
import tasksRouter from './admin/tasks.js'
|
import tasksRouter from './admin/tasks.js'
|
||||||
@@ -26,6 +27,7 @@ router.use(auditLogsRouter)
|
|||||||
router.use(platformConfigRouter)
|
router.use(platformConfigRouter)
|
||||||
router.use(kuaishouIndustryRouter)
|
router.use(kuaishouIndustryRouter)
|
||||||
router.use(ordersRouter)
|
router.use(ordersRouter)
|
||||||
|
router.use(notificationsRouter)
|
||||||
router.use(tasksRouter)
|
router.use(tasksRouter)
|
||||||
router.use(cloudtentaclesRecordsRouter)
|
router.use(cloudtentaclesRecordsRouter)
|
||||||
router.use(workerPlatformRouter)
|
router.use(workerPlatformRouter)
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { Router } from 'express'
|
||||||
|
|
||||||
|
import { listAdminPendingNotifications } from '../../services/admin/admin-notification-service.js'
|
||||||
|
import { createJsonHandler, requireAdminRoles } from './session.js'
|
||||||
|
|
||||||
|
const router = Router()
|
||||||
|
|
||||||
|
router.get(
|
||||||
|
'/notifications',
|
||||||
|
requireAdminRoles(['admin', 'operator', 'support']),
|
||||||
|
createJsonHandler((req) => listAdminPendingNotifications(Number(req.query.limit || 20)), {
|
||||||
|
successMessage: 'ok',
|
||||||
|
errorMessage: '读取后台待办失败',
|
||||||
|
scope: '[admin/notifications]',
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
export default router
|
||||||
@@ -14,6 +14,7 @@ import {
|
|||||||
deleteAdminWorkOrder,
|
deleteAdminWorkOrder,
|
||||||
deleteAdminWorkerLevel,
|
deleteAdminWorkerLevel,
|
||||||
getAdminWorkerFinanceConfig,
|
getAdminWorkerFinanceConfig,
|
||||||
|
getAdminWorkerPlatformNotificationConfig,
|
||||||
getAdminWorkerPlatformSummary,
|
getAdminWorkerPlatformSummary,
|
||||||
getAdminWorkOrderEvents,
|
getAdminWorkOrderEvents,
|
||||||
getAdminWorkOrderSharing,
|
getAdminWorkOrderSharing,
|
||||||
@@ -31,6 +32,7 @@ import {
|
|||||||
resolveAdminProblemWorkOrder,
|
resolveAdminProblemWorkOrder,
|
||||||
reviewAdminWorkerUser,
|
reviewAdminWorkerUser,
|
||||||
saveAdminWorkerFinanceConfig,
|
saveAdminWorkerFinanceConfig,
|
||||||
|
saveAdminWorkerPlatformNotificationConfig,
|
||||||
saveAdminWorkerWithdrawalAccount,
|
saveAdminWorkerWithdrawalAccount,
|
||||||
saveAdminWorkCategory,
|
saveAdminWorkCategory,
|
||||||
saveAdminWorkProductRule,
|
saveAdminWorkProductRule,
|
||||||
@@ -289,6 +291,32 @@ router.post(
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
router.get(
|
||||||
|
'/worker-platform/notification-config',
|
||||||
|
requireAdminRoles(['admin', 'operator']),
|
||||||
|
createJsonHandler(() => getAdminWorkerPlatformNotificationConfig(), {
|
||||||
|
successMessage: 'ok',
|
||||||
|
errorMessage: '读取通知配置失败',
|
||||||
|
scope: '[admin/worker-platform/notification-config]',
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
router.post(
|
||||||
|
'/worker-platform/notification-config',
|
||||||
|
requireAdminRoles(['admin']),
|
||||||
|
createJsonHandler((req) => saveAdminWorkerPlatformNotificationConfig(req.body || {}), {
|
||||||
|
successMessage: '通知配置已保存',
|
||||||
|
errorMessage: '保存通知配置失败',
|
||||||
|
scope: '[admin/worker-platform/notification-config]',
|
||||||
|
audit: (_req, data) => ({
|
||||||
|
action: 'worker_platform_notification_config_saved',
|
||||||
|
targetType: 'worker_platform_notification_config',
|
||||||
|
targetId: 'worker_platform_notifications',
|
||||||
|
data: data && typeof data === 'object' ? (data as Record<string, unknown>) : {},
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
'/worker-platform/finance-requests',
|
'/worker-platform/finance-requests',
|
||||||
requireAdminRoles(['admin', 'operator', 'support']),
|
requireAdminRoles(['admin', 'operator', 'support']),
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import {
|
|||||||
sendWorkerSmsCode,
|
sendWorkerSmsCode,
|
||||||
saveWorkerOrderAcceptanceDraft,
|
saveWorkerOrderAcceptanceDraft,
|
||||||
saveWorkerOrderNote,
|
saveWorkerOrderNote,
|
||||||
|
remindWorkerOrderAcceptance,
|
||||||
supplementWorkerAcceptedOrderEvidence,
|
supplementWorkerAcceptedOrderEvidence,
|
||||||
submitWorkerOrderAcceptance,
|
submitWorkerOrderAcceptance,
|
||||||
} from '../services/worker-platform/index.js'
|
} from '../services/worker-platform/index.js'
|
||||||
@@ -329,6 +330,23 @@ router.post(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
router.post(
|
||||||
|
'/orders/:workOrderId/remind-acceptance',
|
||||||
|
requireActiveWorker,
|
||||||
|
createRouteHandler(
|
||||||
|
(req) =>
|
||||||
|
remindWorkerOrderAcceptance(
|
||||||
|
String(req.params.workOrderId || ''),
|
||||||
|
getRequiredWorkerSession(req),
|
||||||
|
),
|
||||||
|
{
|
||||||
|
successMessage: '已催促管理员验收',
|
||||||
|
errorMessage: '催验收失败',
|
||||||
|
scope: '[worker/orders/:workOrderId/remind-acceptance]',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
'/orders/:workOrderId/acceptance-draft',
|
'/orders/:workOrderId/acceptance-draft',
|
||||||
requireActiveWorker,
|
requireActiveWorker,
|
||||||
|
|||||||
@@ -0,0 +1,211 @@
|
|||||||
|
import {
|
||||||
|
bumpAdminNotificationReminder,
|
||||||
|
countPendingAdminNotifications,
|
||||||
|
createAdminNotification,
|
||||||
|
getPendingAdminNotificationByDedupeKey,
|
||||||
|
listPendingAdminNotifications,
|
||||||
|
resolveAdminNotificationsByEntity,
|
||||||
|
type AdminNotificationRow,
|
||||||
|
} from '../../repositories/admin-notification-repo.js'
|
||||||
|
import { notifyInternalSafely } from '../notification/domain-notifications.js'
|
||||||
|
import {
|
||||||
|
getWorkerPlatformNotificationConfig,
|
||||||
|
type WorkerPlatformNotificationEventKey,
|
||||||
|
} from '../worker-platform/worker-platform-notification-config-service.js'
|
||||||
|
|
||||||
|
const ADMIN_WORKER_PLATFORM_PATH = '/admin/worker-platform'
|
||||||
|
|
||||||
|
export async function createWorkerWithdrawAdminNotification(input: {
|
||||||
|
requestId: number
|
||||||
|
workerName: string
|
||||||
|
amountFen: number
|
||||||
|
channel: string
|
||||||
|
}) {
|
||||||
|
return createConfiguredWorkerPlatformNotification('withdraw_requested', {
|
||||||
|
notificationType: 'worker_withdraw_requested',
|
||||||
|
priority: 'high',
|
||||||
|
entityType: 'worker_finance_request',
|
||||||
|
entityId: input.requestId,
|
||||||
|
dedupeKey: `worker_withdraw_request:${input.requestId}`,
|
||||||
|
title: '有新的提现申请',
|
||||||
|
body: `打手:${input.workerName || '-'};金额:${formatAmount(input.amountFen)};渠道:${formatChannel(input.channel)}`,
|
||||||
|
actionPath: `${ADMIN_WORKER_PLATFORM_PATH}?tab=finance`,
|
||||||
|
now: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createWorkerRechargeAdminNotification(input: {
|
||||||
|
requestId: number
|
||||||
|
workerName: string
|
||||||
|
amountFen: number
|
||||||
|
}) {
|
||||||
|
return createConfiguredWorkerPlatformNotification('recharge_requested', {
|
||||||
|
notificationType: 'worker_recharge_requested',
|
||||||
|
priority: 'normal',
|
||||||
|
entityType: 'worker_finance_request',
|
||||||
|
entityId: input.requestId,
|
||||||
|
dedupeKey: `worker_recharge_request:${input.requestId}`,
|
||||||
|
title: '有新的充值申请',
|
||||||
|
body: `打手:${input.workerName || '-'};金额:${formatAmount(input.amountFen)}`,
|
||||||
|
actionPath: `${ADMIN_WORKER_PLATFORM_PATH}?tab=finance`,
|
||||||
|
now: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createWorkOrderMaterialAdminNotification(input: {
|
||||||
|
workOrderId: number
|
||||||
|
workOrderNo: string
|
||||||
|
productName: string
|
||||||
|
}) {
|
||||||
|
return createConfiguredWorkerPlatformNotification('material_required', {
|
||||||
|
notificationType: 'work_order_material_required',
|
||||||
|
priority: 'normal',
|
||||||
|
entityType: 'work_order',
|
||||||
|
entityId: input.workOrderId,
|
||||||
|
dedupeKey: `work_order_material:${input.workOrderId}`,
|
||||||
|
title: '有工单待补资料',
|
||||||
|
body: `订单:${input.workOrderNo || input.workOrderId};商品:${input.productName || '-'}`,
|
||||||
|
actionPath: `${ADMIN_WORKER_PLATFORM_PATH}?tab=orders`,
|
||||||
|
now: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createWorkerAcceptanceAdminNotification(input: {
|
||||||
|
workOrderId: number
|
||||||
|
workOrderNo: string
|
||||||
|
productName: string
|
||||||
|
workerName: string
|
||||||
|
imageCount: number
|
||||||
|
}) {
|
||||||
|
return createConfiguredWorkerPlatformNotification('acceptance_submitted', {
|
||||||
|
notificationType: 'worker_acceptance_submitted',
|
||||||
|
priority: 'normal',
|
||||||
|
entityType: 'work_order',
|
||||||
|
entityId: input.workOrderId,
|
||||||
|
dedupeKey: acceptanceNotificationKey(input.workOrderId),
|
||||||
|
title: '有订单待验收',
|
||||||
|
body: [
|
||||||
|
`订单:${input.workOrderNo || input.workOrderId}`,
|
||||||
|
`商品:${input.productName || '-'}`,
|
||||||
|
`打手:${input.workerName || '-'}`,
|
||||||
|
`验收图片:${input.imageCount} 张`,
|
||||||
|
].join(';'),
|
||||||
|
actionPath: `${ADMIN_WORKER_PLATFORM_PATH}?tab=orders`,
|
||||||
|
now: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function remindWorkerAcceptanceAdminNotification(workOrderId: number) {
|
||||||
|
const now = new Date().toISOString()
|
||||||
|
const eventConfig = getWorkerPlatformNotificationConfig().events.acceptance_reminded
|
||||||
|
const notification = await bumpAdminNotificationReminder({
|
||||||
|
dedupeKey: acceptanceNotificationKey(workOrderId),
|
||||||
|
notificationType: 'worker_acceptance_reminded',
|
||||||
|
title: '有打手催验收',
|
||||||
|
visible: eventConfig.todoEnabled,
|
||||||
|
soundEnabled: eventConfig.todoEnabled && eventConfig.soundEnabled,
|
||||||
|
now,
|
||||||
|
})
|
||||||
|
if (notification && eventConfig.externalPushEnabled) {
|
||||||
|
void notifyInternalSafely({
|
||||||
|
title: '打手催促验收',
|
||||||
|
body: `${notification.body};第 ${notification.reminder_count} 次催验收`,
|
||||||
|
category: 'worker_acceptance_reminded',
|
||||||
|
url: notification.action_path,
|
||||||
|
cooldownKey: `worker_acceptance_reminded:${workOrderId}:${notification.reminder_count}`,
|
||||||
|
cooldownMs: 30 * 60 * 1000,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return notification
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getWorkerAcceptanceReminder(workOrderId: number) {
|
||||||
|
return getPendingAdminNotificationByDedupeKey(acceptanceNotificationKey(workOrderId))
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function resolveAdminNotificationEntity(
|
||||||
|
entityType: string,
|
||||||
|
entityId: number,
|
||||||
|
reason: string,
|
||||||
|
) {
|
||||||
|
await resolveAdminNotificationsByEntity({
|
||||||
|
entityType,
|
||||||
|
entityId,
|
||||||
|
reason,
|
||||||
|
now: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listAdminPendingNotifications(limit = 20) {
|
||||||
|
const normalizedLimit = Math.min(50, Math.max(1, Math.floor(Number(limit) || 20)))
|
||||||
|
const [items, pendingCount] = await Promise.all([
|
||||||
|
listPendingAdminNotifications(normalizedLimit),
|
||||||
|
countPendingAdminNotifications(),
|
||||||
|
])
|
||||||
|
return {
|
||||||
|
pendingCount,
|
||||||
|
items: items.map(mapAdminNotification),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapAdminNotification(row: AdminNotificationRow) {
|
||||||
|
return {
|
||||||
|
notificationId: Number(row.id),
|
||||||
|
notificationType: row.notification_type,
|
||||||
|
priority: row.priority,
|
||||||
|
entityType: row.entity_type,
|
||||||
|
entityId: Number(row.entity_id),
|
||||||
|
title: row.title,
|
||||||
|
body: row.body,
|
||||||
|
actionPath: row.action_path,
|
||||||
|
reminderCount: Number(row.reminder_count || 0),
|
||||||
|
soundEnabled: row.sound_enabled !== false,
|
||||||
|
lastRemindedAt: row.last_reminded_at,
|
||||||
|
createdAt: row.created_at,
|
||||||
|
updatedAt: row.updated_at,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createConfiguredWorkerPlatformNotification(
|
||||||
|
eventKey: WorkerPlatformNotificationEventKey,
|
||||||
|
input: {
|
||||||
|
notificationType: string
|
||||||
|
priority: string
|
||||||
|
entityType: string
|
||||||
|
entityId: number
|
||||||
|
dedupeKey: string
|
||||||
|
title: string
|
||||||
|
body: string
|
||||||
|
actionPath: string
|
||||||
|
now: string
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
const eventConfig = getWorkerPlatformNotificationConfig().events[eventKey]
|
||||||
|
const notification = await createAdminNotification({
|
||||||
|
...input,
|
||||||
|
visible: eventConfig.todoEnabled,
|
||||||
|
soundEnabled: eventConfig.todoEnabled && eventConfig.soundEnabled,
|
||||||
|
})
|
||||||
|
if (notification && eventConfig.externalPushEnabled) {
|
||||||
|
void notifyInternalSafely({
|
||||||
|
title: notification.title,
|
||||||
|
body: notification.body,
|
||||||
|
category: notification.notification_type,
|
||||||
|
url: notification.action_path,
|
||||||
|
cooldownKey: notification.dedupe_key,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return notification
|
||||||
|
}
|
||||||
|
|
||||||
|
function acceptanceNotificationKey(workOrderId: number) {
|
||||||
|
return `work_order_acceptance:${workOrderId}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatAmount(amountFen: number) {
|
||||||
|
return `¥${(Math.max(0, Number(amountFen) || 0) / 100).toFixed(2)}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatChannel(channel: string) {
|
||||||
|
return channel === 'wechat' ? '微信' : channel === 'alipay' ? '支付宝' : channel || '-'
|
||||||
|
}
|
||||||
@@ -56,7 +56,15 @@ import { randomId } from '../../utils/random.js'
|
|||||||
import { nowIso } from '../../utils/time.js'
|
import { nowIso } from '../../utils/time.js'
|
||||||
import { normalizePage, normalizePageSize, safeParseJson } from '../admin/admin-query-utils.js'
|
import { normalizePage, normalizePageSize, safeParseJson } from '../admin/admin-query-utils.js'
|
||||||
import { getWorkerFinanceConfig, saveWorkerFinanceConfig } from './worker-finance-config-service.js'
|
import { getWorkerFinanceConfig, saveWorkerFinanceConfig } from './worker-finance-config-service.js'
|
||||||
|
import {
|
||||||
|
getWorkerPlatformNotificationConfig,
|
||||||
|
saveWorkerPlatformNotificationConfig,
|
||||||
|
} from './worker-platform-notification-config-service.js'
|
||||||
import { refreshUploadedFileUrls } from '../file-storage/file-storage-service.js'
|
import { refreshUploadedFileUrls } from '../file-storage/file-storage-service.js'
|
||||||
|
import {
|
||||||
|
createWorkOrderMaterialAdminNotification,
|
||||||
|
resolveAdminNotificationEntity,
|
||||||
|
} from '../admin/admin-notification-service.js'
|
||||||
import {
|
import {
|
||||||
consumeIndustryVouchersBeforeWorkOrderAssign,
|
consumeIndustryVouchersBeforeWorkOrderAssign,
|
||||||
consumeIndustryVouchersBeforeWorkOrderPublish,
|
consumeIndustryVouchersBeforeWorkOrderPublish,
|
||||||
@@ -609,15 +617,25 @@ export async function saveAdminWorkerFinanceConfig(payload: JsonObject = {}) {
|
|||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getAdminWorkerPlatformNotificationConfig() {
|
||||||
|
return getWorkerPlatformNotificationConfig()
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function saveAdminWorkerPlatformNotificationConfig(payload: JsonObject = {}) {
|
||||||
|
return saveWorkerPlatformNotificationConfig(payload)
|
||||||
|
}
|
||||||
|
|
||||||
export async function listAdminWorkerFinanceRequests(query: JsonObject = {}) {
|
export async function listAdminWorkerFinanceRequests(query: JsonObject = {}) {
|
||||||
const page = normalizePage(query.page)
|
const page = normalizePage(query.page)
|
||||||
const pageSize = normalizePageSize(query.pageSize)
|
const pageSize = normalizePageSize(query.pageSize)
|
||||||
|
const requestId = normalizeOptionalId(query.requestId ?? query.request_id) || 0
|
||||||
const status = normalizeFinanceRequestStatus(query.status)
|
const status = normalizeFinanceRequestStatus(query.status)
|
||||||
const requestType = normalizeFinanceRequestType(query.requestType)
|
const requestType = normalizeFinanceRequestType(query.requestType)
|
||||||
const keyword = String(query.keyword || '').trim()
|
const keyword = String(query.keyword || '').trim()
|
||||||
const { items, total } = await listWorkerFinanceRequests({
|
const { items, total } = await listWorkerFinanceRequests({
|
||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
|
requestId,
|
||||||
status,
|
status,
|
||||||
requestType,
|
requestType,
|
||||||
keyword,
|
keyword,
|
||||||
@@ -670,6 +688,12 @@ export async function reviewAdminWorkerFinanceRequest(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await resolveAdminNotificationEntity(
|
||||||
|
'worker_finance_request',
|
||||||
|
Number(reviewed.request.id),
|
||||||
|
'finance_request_reviewed',
|
||||||
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
request: mapFinanceRequest(reviewed.request),
|
request: mapFinanceRequest(reviewed.request),
|
||||||
}
|
}
|
||||||
@@ -695,6 +719,7 @@ export async function getAdminWorkOrderEvents(workOrderId: number | string) {
|
|||||||
export async function listAdminWorkOrders(query: JsonObject = {}) {
|
export async function listAdminWorkOrders(query: JsonObject = {}) {
|
||||||
const page = normalizePage(query.page)
|
const page = normalizePage(query.page)
|
||||||
const pageSize = normalizePageSize(query.pageSize)
|
const pageSize = normalizePageSize(query.pageSize)
|
||||||
|
const workOrderId = normalizeOptionalId(query.workOrderId ?? query.work_order_id) || 0
|
||||||
const workerId = normalizeOptionalId(query.workerId ?? query.worker_id) || 0
|
const workerId = normalizeOptionalId(query.workerId ?? query.worker_id) || 0
|
||||||
const statuses = normalizeStatuses(query.status)
|
const statuses = normalizeStatuses(query.status)
|
||||||
const vipEvidencePending = normalizeBoolean(query.vipEvidencePending, false)
|
const vipEvidencePending = normalizeBoolean(query.vipEvidencePending, false)
|
||||||
@@ -702,6 +727,7 @@ export async function listAdminWorkOrders(query: JsonObject = {}) {
|
|||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
statuses,
|
statuses,
|
||||||
|
workOrderId,
|
||||||
keyword: String(query.keyword || '').trim(),
|
keyword: String(query.keyword || '').trim(),
|
||||||
workerSharingId: workerId,
|
workerSharingId: workerId,
|
||||||
vipEvidencePending,
|
vipEvidencePending,
|
||||||
@@ -954,6 +980,9 @@ export async function submitAdminWorkOrderMaterial(
|
|||||||
payloadJson: JSON.stringify({ fields: submittedFields, complete, rewardAmount }),
|
payloadJson: JSON.stringify({ fields: submittedFields, complete, rewardAmount }),
|
||||||
now,
|
now,
|
||||||
})
|
})
|
||||||
|
if (nextStatus !== WORK_ORDER_STATUS.PENDING_MATERIAL) {
|
||||||
|
await resolveAdminNotificationEntity('work_order', Number(workOrder.id), 'material_completed')
|
||||||
|
}
|
||||||
return { order: mapWorkOrderAdmin(updated || workOrder), complete }
|
return { order: mapWorkOrderAdmin(updated || workOrder), complete }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1319,6 +1348,9 @@ export async function markAdminWorkOrderProblem(
|
|||||||
payloadJson: JSON.stringify({ note }),
|
payloadJson: JSON.stringify({ note }),
|
||||||
now,
|
now,
|
||||||
})
|
})
|
||||||
|
if (workOrder.status === WORK_ORDER_STATUS.PENDING_ACCEPTANCE) {
|
||||||
|
await resolveAdminNotificationEntity('work_order', Number(workOrder.id), 'marked_problem')
|
||||||
|
}
|
||||||
return { order: mapWorkOrderAdmin(updated || workOrder) }
|
return { order: mapWorkOrderAdmin(updated || workOrder) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1388,6 +1420,7 @@ export async function acceptAdminWorkOrder(workOrderId: number | string, actorNa
|
|||||||
errorCode: 'work_order_accept_conflict',
|
errorCode: 'work_order_accept_conflict',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
await resolveAdminNotificationEntity('work_order', Number(workOrder.id), 'accepted')
|
||||||
return { order: mapWorkOrderAdmin(updated || workOrder) }
|
return { order: mapWorkOrderAdmin(updated || workOrder) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1633,6 +1666,13 @@ export async function syncWorkerOrdersForSourceOrder(
|
|||||||
}),
|
}),
|
||||||
now,
|
now,
|
||||||
})
|
})
|
||||||
|
if (workOrder.status === WORK_ORDER_STATUS.PENDING_MATERIAL) {
|
||||||
|
await createWorkOrderMaterialAdminNotification({
|
||||||
|
workOrderId: Number(workOrder.id),
|
||||||
|
workOrderNo: workOrder.work_order_no,
|
||||||
|
productName: workOrder.product_name,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+100
@@ -0,0 +1,100 @@
|
|||||||
|
import { APP_CONFIG_KEYS } from '../../config/app-config-keys.js'
|
||||||
|
import type { JsonObject } from '../../types/json.js'
|
||||||
|
import { readAppConfigEntry, saveAppConfigEntry } from '../config/app-config-store.js'
|
||||||
|
|
||||||
|
export const WORKER_PLATFORM_NOTIFICATION_EVENT_KEYS = [
|
||||||
|
'withdraw_requested',
|
||||||
|
'recharge_requested',
|
||||||
|
'acceptance_submitted',
|
||||||
|
'acceptance_reminded',
|
||||||
|
'material_required',
|
||||||
|
] as const
|
||||||
|
|
||||||
|
export type WorkerPlatformNotificationEventKey =
|
||||||
|
(typeof WORKER_PLATFORM_NOTIFICATION_EVENT_KEYS)[number]
|
||||||
|
|
||||||
|
export type WorkerPlatformNotificationEventConfig = {
|
||||||
|
todoEnabled: boolean
|
||||||
|
soundEnabled: boolean
|
||||||
|
externalPushEnabled: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export type WorkerPlatformNotificationConfig = {
|
||||||
|
events: Record<WorkerPlatformNotificationEventKey, WorkerPlatformNotificationEventConfig>
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getWorkerPlatformNotificationConfig(): WorkerPlatformNotificationConfig {
|
||||||
|
return readAppConfigEntry({
|
||||||
|
configKey: APP_CONFIG_KEYS.workerPlatformNotifications,
|
||||||
|
fallback: createDefaultWorkerPlatformNotificationConfig,
|
||||||
|
normalize: normalizeWorkerPlatformNotificationConfig,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function saveWorkerPlatformNotificationConfig(rawValue: unknown) {
|
||||||
|
return saveAppConfigEntry({
|
||||||
|
configKey: APP_CONFIG_KEYS.workerPlatformNotifications,
|
||||||
|
value: rawValue,
|
||||||
|
normalize: normalizeWorkerPlatformNotificationConfig,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createDefaultWorkerPlatformNotificationConfig(): WorkerPlatformNotificationConfig {
|
||||||
|
return {
|
||||||
|
events: {
|
||||||
|
withdraw_requested: createEnabledEventConfig(),
|
||||||
|
recharge_requested: createEnabledEventConfig(),
|
||||||
|
acceptance_submitted: createEnabledEventConfig(),
|
||||||
|
acceptance_reminded: createEnabledEventConfig(),
|
||||||
|
material_required: {
|
||||||
|
todoEnabled: false,
|
||||||
|
soundEnabled: false,
|
||||||
|
externalPushEnabled: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeWorkerPlatformNotificationConfig(
|
||||||
|
rawValue: unknown,
|
||||||
|
): WorkerPlatformNotificationConfig {
|
||||||
|
const source = isPlainObject(rawValue) ? rawValue : {}
|
||||||
|
const rawEvents = isPlainObject(source.events) ? source.events : {}
|
||||||
|
const defaults = createDefaultWorkerPlatformNotificationConfig()
|
||||||
|
|
||||||
|
return {
|
||||||
|
events: Object.fromEntries(
|
||||||
|
WORKER_PLATFORM_NOTIFICATION_EVENT_KEYS.map((key) => [
|
||||||
|
key,
|
||||||
|
normalizeEventConfig(rawEvents[key], defaults.events[key]),
|
||||||
|
]),
|
||||||
|
) as WorkerPlatformNotificationConfig['events'],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function createEnabledEventConfig(): WorkerPlatformNotificationEventConfig {
|
||||||
|
return { todoEnabled: true, soundEnabled: true, externalPushEnabled: true }
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeEventConfig(
|
||||||
|
value: unknown,
|
||||||
|
fallback: WorkerPlatformNotificationEventConfig,
|
||||||
|
): WorkerPlatformNotificationEventConfig {
|
||||||
|
const source = isPlainObject(value) ? value : {}
|
||||||
|
const todoEnabled =
|
||||||
|
typeof source.todoEnabled === 'boolean' ? source.todoEnabled : fallback.todoEnabled
|
||||||
|
return {
|
||||||
|
todoEnabled,
|
||||||
|
soundEnabled:
|
||||||
|
todoEnabled &&
|
||||||
|
(typeof source.soundEnabled === 'boolean' ? source.soundEnabled : fallback.soundEnabled),
|
||||||
|
externalPushEnabled:
|
||||||
|
typeof source.externalPushEnabled === 'boolean'
|
||||||
|
? source.externalPushEnabled
|
||||||
|
: fallback.externalPushEnabled,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isPlainObject(value: unknown): value is JsonObject {
|
||||||
|
return Object.prototype.toString.call(value) === '[object Object]'
|
||||||
|
}
|
||||||
@@ -68,6 +68,13 @@ import { normalizePage, normalizePageSize, safeParseJson } from '../admin/admin-
|
|||||||
import { getSmsProvider } from '../sms/index.js'
|
import { getSmsProvider } from '../sms/index.js'
|
||||||
import { getWorkerFinanceConfig } from './worker-finance-config-service.js'
|
import { getWorkerFinanceConfig } from './worker-finance-config-service.js'
|
||||||
import { refreshUploadedFileUrls } from '../file-storage/file-storage-service.js'
|
import { refreshUploadedFileUrls } from '../file-storage/file-storage-service.js'
|
||||||
|
import {
|
||||||
|
createWorkerAcceptanceAdminNotification,
|
||||||
|
createWorkerRechargeAdminNotification,
|
||||||
|
createWorkerWithdrawAdminNotification,
|
||||||
|
getWorkerAcceptanceReminder,
|
||||||
|
remindWorkerAcceptanceAdminNotification,
|
||||||
|
} from '../admin/admin-notification-service.js'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_CATEGORY_KEY,
|
DEFAULT_CATEGORY_KEY,
|
||||||
@@ -689,6 +696,11 @@ export async function createWorkerRechargeRequest(
|
|||||||
errorCode: 'worker_recharge_request_create_failed',
|
errorCode: 'worker_recharge_request_create_failed',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
await createWorkerRechargeAdminNotification({
|
||||||
|
requestId: Number(created.id),
|
||||||
|
workerName: worker.display_name || worker.username,
|
||||||
|
amountFen: Number(created.amount || amount),
|
||||||
|
})
|
||||||
return {
|
return {
|
||||||
request: mapFinanceRequest(created),
|
request: mapFinanceRequest(created),
|
||||||
}
|
}
|
||||||
@@ -779,6 +791,12 @@ export async function createWorkerWithdrawRequest(
|
|||||||
errorCode: 'worker_withdraw_request_create_failed',
|
errorCode: 'worker_withdraw_request_create_failed',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
await createWorkerWithdrawAdminNotification({
|
||||||
|
requestId: Number(created.id),
|
||||||
|
workerName: worker.display_name || worker.username,
|
||||||
|
amountFen: Number(created.amount || amount),
|
||||||
|
channel: created.account_channel,
|
||||||
|
})
|
||||||
return {
|
return {
|
||||||
request: mapFinanceRequest(created),
|
request: mapFinanceRequest(created),
|
||||||
availableForWithdraw,
|
availableForWithdraw,
|
||||||
@@ -1426,11 +1444,107 @@ export async function submitWorkerOrderAcceptance(
|
|||||||
order: mapWorkOrderForWorker(acceptedOrder, resolveWorkerPermissions(worker)),
|
order: mapWorkOrderForWorker(acceptedOrder, resolveWorkerPermissions(worker)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await createWorkerAcceptanceAdminNotification({
|
||||||
|
workOrderId: Number(workOrder.id),
|
||||||
|
workOrderNo: workOrder.work_order_no,
|
||||||
|
productName: workOrder.product_name,
|
||||||
|
workerName: worker.display_name || worker.username,
|
||||||
|
imageCount: imageUrls.length,
|
||||||
|
})
|
||||||
return {
|
return {
|
||||||
order: mapWorkOrderForWorker(updated || workOrder, resolveWorkerPermissions(worker)),
|
order: mapWorkOrderForWorker(updated || workOrder, resolveWorkerPermissions(worker)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 打手在提交验收后催促后台处理;频率和次数均由服务端控制。 */
|
||||||
|
export async function remindWorkerOrderAcceptance(
|
||||||
|
workOrderId: number | string,
|
||||||
|
session: WorkerSession,
|
||||||
|
) {
|
||||||
|
requireActiveWorkerSession(session)
|
||||||
|
const workOrder = await getRequiredWorkOrder(workOrderId)
|
||||||
|
if (
|
||||||
|
workOrder.sharing_enabled ||
|
||||||
|
Number(workOrder.assigned_worker_id || 0) !== Number(session.workerId)
|
||||||
|
) {
|
||||||
|
throw createHttpError('只能催促自己提交的整单验收', {
|
||||||
|
statusCode: 403,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_owner_required',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if (workOrder.status !== WORK_ORDER_STATUS.PENDING_ACCEPTANCE) {
|
||||||
|
throw createHttpError('当前订单无需催验收', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_status_invalid',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const submittedAt = Date.parse(String(workOrder.submitted_at || ''))
|
||||||
|
const now = Date.now()
|
||||||
|
const firstReminderAt = submittedAt + 10 * 60 * 1000
|
||||||
|
if (!Number.isFinite(submittedAt) || now < firstReminderAt) {
|
||||||
|
throw createHttpError('提交验收满 10 分钟后才可催验收', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_too_early',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
let notification = await getWorkerAcceptanceReminder(Number(workOrder.id))
|
||||||
|
if (!notification) {
|
||||||
|
const worker = await getRequiredWorker(session.workerId)
|
||||||
|
await createWorkerAcceptanceAdminNotification({
|
||||||
|
workOrderId: Number(workOrder.id),
|
||||||
|
workOrderNo: workOrder.work_order_no,
|
||||||
|
productName: workOrder.product_name,
|
||||||
|
workerName: worker.display_name || worker.username,
|
||||||
|
imageCount: normalizeStringArray(safeParseJson(workOrder.acceptance_json).imageUrls).length,
|
||||||
|
})
|
||||||
|
notification = await getWorkerAcceptanceReminder(Number(workOrder.id))
|
||||||
|
}
|
||||||
|
if (!notification) {
|
||||||
|
throw createHttpError('催验收待办创建失败,请稍后重试', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_notification_missing',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if (Number(notification.reminder_count || 0) >= 3) {
|
||||||
|
throw createHttpError('该订单最多催验收 3 次', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_limit_reached',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const lastRemindedAt = Date.parse(String(notification.last_reminded_at || ''))
|
||||||
|
const nextRemindAt = lastRemindedAt + 30 * 60 * 1000
|
||||||
|
if (Number.isFinite(lastRemindedAt) && now < nextRemindAt) {
|
||||||
|
throw createHttpError('每 30 分钟可催验收一次,请稍后再试', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_cooldown',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const reminded = await remindWorkerAcceptanceAdminNotification(Number(workOrder.id))
|
||||||
|
if (!reminded) {
|
||||||
|
throw createHttpError('订单状态已变化,请刷新后重试', {
|
||||||
|
statusCode: 409,
|
||||||
|
errorCode: 'work_order_acceptance_reminder_conflict',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const remindedAt = new Date(reminded.last_reminded_at || new Date().toISOString()).getTime()
|
||||||
|
await createWorkOrderEvent({
|
||||||
|
workOrderId: Number(workOrder.id),
|
||||||
|
actorType: 'worker',
|
||||||
|
actorId: String(session.workerId),
|
||||||
|
eventType: 'acceptance_reminded',
|
||||||
|
fromStatus: WORK_ORDER_STATUS.PENDING_ACCEPTANCE,
|
||||||
|
toStatus: WORK_ORDER_STATUS.PENDING_ACCEPTANCE,
|
||||||
|
payloadJson: JSON.stringify({ reminderCount: reminded.reminder_count }),
|
||||||
|
now: new Date(reminded.last_reminded_at || new Date().toISOString()).toISOString(),
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
reminderCount: Number(reminded.reminder_count || 0),
|
||||||
|
nextRemindAt: new Date(remindedAt + 30 * 60 * 1000).toISOString(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** VIP 自动验收订单在 24 小时内追加验收图片,不改变订单状态和结算结果。 */
|
/** VIP 自动验收订单在 24 小时内追加验收图片,不改变订单状态和结算结果。 */
|
||||||
export async function supplementWorkerAcceptedOrderEvidence(
|
export async function supplementWorkerAcceptedOrderEvidence(
|
||||||
workOrderId: number | string,
|
workOrderId: number | string,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
AuditOutlined,
|
AuditOutlined,
|
||||||
|
BellOutlined,
|
||||||
BugOutlined,
|
BugOutlined,
|
||||||
DashboardOutlined,
|
DashboardOutlined,
|
||||||
FileSearchOutlined,
|
FileSearchOutlined,
|
||||||
@@ -10,18 +11,36 @@ import {
|
|||||||
SafetyCertificateOutlined,
|
SafetyCertificateOutlined,
|
||||||
SettingOutlined,
|
SettingOutlined,
|
||||||
ShopOutlined,
|
ShopOutlined,
|
||||||
|
SoundOutlined,
|
||||||
TeamOutlined,
|
TeamOutlined,
|
||||||
TrophyOutlined,
|
TrophyOutlined,
|
||||||
UnorderedListOutlined,
|
UnorderedListOutlined,
|
||||||
UserOutlined,
|
UserOutlined,
|
||||||
} from '@ant-design/icons'
|
} from '@ant-design/icons'
|
||||||
import { App, Button, Dropdown, Layout, Menu, Space, Typography } from 'antd'
|
import {
|
||||||
|
App,
|
||||||
|
Badge,
|
||||||
|
Button,
|
||||||
|
Dropdown,
|
||||||
|
Layout,
|
||||||
|
List,
|
||||||
|
Menu,
|
||||||
|
Popover,
|
||||||
|
Space,
|
||||||
|
Tooltip,
|
||||||
|
Typography,
|
||||||
|
} from 'antd'
|
||||||
import type { MenuProps } from 'antd'
|
import type { MenuProps } from 'antd'
|
||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
import { useMemo, useState } from 'react'
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
||||||
import { Outlet, useLocation, useNavigate } from 'react-router'
|
import { Outlet, useLocation, useNavigate } from 'react-router'
|
||||||
|
|
||||||
import { fetchDevMockStatus, logoutAdmin } from '@/services/admin'
|
import {
|
||||||
|
fetchAdminNotifications,
|
||||||
|
fetchDevMockStatus,
|
||||||
|
logoutAdmin,
|
||||||
|
type AdminNotification,
|
||||||
|
} from '@/services/admin'
|
||||||
import {
|
import {
|
||||||
clearAdminSession,
|
clearAdminSession,
|
||||||
getAdminRole,
|
getAdminRole,
|
||||||
@@ -31,17 +50,25 @@ import {
|
|||||||
import { formatAdminDateTime } from '@/utils/admin-time'
|
import { formatAdminDateTime } from '@/utils/admin-time'
|
||||||
|
|
||||||
const SIDEBAR_COLLAPSED_KEY = 'react-admin-sidebar-collapsed'
|
const SIDEBAR_COLLAPSED_KEY = 'react-admin-sidebar-collapsed'
|
||||||
|
const NOTIFICATION_SOUND_KEY = 'admin-notification-sound-enabled'
|
||||||
|
const NOTIFICATION_SOUND_COOLDOWN_MS = 30_000
|
||||||
|
|
||||||
export default function AdminLayout() {
|
export default function AdminLayout() {
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
const { message } = App.useApp()
|
const { message } = App.useApp()
|
||||||
|
const queryClient = useQueryClient()
|
||||||
const [collapsed, setCollapsed] = useState(
|
const [collapsed, setCollapsed] = useState(
|
||||||
() => window.localStorage.getItem(SIDEBAR_COLLAPSED_KEY) === '1',
|
() => window.localStorage.getItem(SIDEBAR_COLLAPSED_KEY) === '1',
|
||||||
)
|
)
|
||||||
const role = getAdminRole()
|
const role = getAdminRole()
|
||||||
const username = getAdminUsername() || 'admin'
|
const username = getAdminUsername() || 'admin'
|
||||||
const expiresAt = getAdminTokenExpiresAt()
|
const expiresAt = getAdminTokenExpiresAt()
|
||||||
|
const [soundEnabled, setSoundEnabled] = useState(
|
||||||
|
() => window.localStorage.getItem(NOTIFICATION_SOUND_KEY) === '1',
|
||||||
|
)
|
||||||
|
const seenNotificationVersions = useRef<Map<number, string> | null>(null)
|
||||||
|
const lastSoundAt = useRef(0)
|
||||||
|
|
||||||
const devMockStatusQuery = useQuery({
|
const devMockStatusQuery = useQuery({
|
||||||
queryKey: ['admin-dev-mock-status'],
|
queryKey: ['admin-dev-mock-status'],
|
||||||
@@ -50,6 +77,43 @@ export default function AdminLayout() {
|
|||||||
retry: false,
|
retry: false,
|
||||||
})
|
})
|
||||||
const devMockEnabled = Boolean(devMockStatusQuery.data?.data?.enabled)
|
const devMockEnabled = Boolean(devMockStatusQuery.data?.data?.enabled)
|
||||||
|
const notificationsQuery = useQuery({
|
||||||
|
queryKey: ['admin-notifications'],
|
||||||
|
queryFn: fetchAdminNotifications,
|
||||||
|
refetchInterval: 10_000,
|
||||||
|
refetchIntervalInBackground: false,
|
||||||
|
refetchOnWindowFocus: true,
|
||||||
|
retry: false,
|
||||||
|
})
|
||||||
|
const notifications = notificationsQuery.data?.data.items || []
|
||||||
|
const pendingNotificationCount = Number(notificationsQuery.data?.data.pendingCount || 0)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const currentVersions = new Map(
|
||||||
|
notifications.map((notification) => [notification.notificationId, notification.updatedAt]),
|
||||||
|
)
|
||||||
|
if (seenNotificationVersions.current === null) {
|
||||||
|
seenNotificationVersions.current = currentVersions
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const changedNotifications = notifications.filter(
|
||||||
|
(notification) =>
|
||||||
|
seenNotificationVersions.current?.get(notification.notificationId) !==
|
||||||
|
notification.updatedAt,
|
||||||
|
)
|
||||||
|
seenNotificationVersions.current = currentVersions
|
||||||
|
if (changedNotifications.length === 0) return
|
||||||
|
|
||||||
|
void Promise.all([
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['admin-worker-platform-finance-requests'] }),
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['admin-worker-platform-orders'] }),
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['admin-worker-platform-summary'] }),
|
||||||
|
])
|
||||||
|
if (soundEnabled && Date.now() - lastSoundAt.current >= NOTIFICATION_SOUND_COOLDOWN_MS) {
|
||||||
|
lastSoundAt.current = Date.now()
|
||||||
|
announceNotification(selectNotificationToAnnounce(changedNotifications))
|
||||||
|
}
|
||||||
|
}, [notifications, queryClient, soundEnabled])
|
||||||
|
|
||||||
const menuItems = useMemo<MenuProps['items']>(() => {
|
const menuItems = useMemo<MenuProps['items']>(() => {
|
||||||
const operationItems: MenuProps['items'] = [
|
const operationItems: MenuProps['items'] = [
|
||||||
@@ -121,6 +185,64 @@ export default function AdminLayout() {
|
|||||||
window.localStorage.setItem(SIDEBAR_COLLAPSED_KEY, next ? '1' : '0')
|
window.localStorage.setItem(SIDEBAR_COLLAPSED_KEY, next ? '1' : '0')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toggleNotificationSound() {
|
||||||
|
const next = !soundEnabled
|
||||||
|
setSoundEnabled(next)
|
||||||
|
window.localStorage.setItem(NOTIFICATION_SOUND_KEY, next ? '1' : '0')
|
||||||
|
if (next) {
|
||||||
|
playNotificationSound('default')
|
||||||
|
message.success('通知声音已开启')
|
||||||
|
} else {
|
||||||
|
message.info('通知声音已关闭')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function openNotification(notification: AdminNotification) {
|
||||||
|
const actionPath = buildNotificationActionPath(notification)
|
||||||
|
if (actionPath) {
|
||||||
|
void navigate(actionPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const notificationContent = (
|
||||||
|
<div className="admin-notification-popover">
|
||||||
|
{notifications.length === 0 ? (
|
||||||
|
<Typography.Text type="secondary">暂无待处理事项</Typography.Text>
|
||||||
|
) : (
|
||||||
|
<List
|
||||||
|
size="small"
|
||||||
|
dataSource={notifications.slice(0, 8)}
|
||||||
|
renderItem={(notification) => (
|
||||||
|
<List.Item
|
||||||
|
className="admin-notification-item"
|
||||||
|
onClick={() => openNotification(notification)}
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<Space size={6} wrap>
|
||||||
|
<Typography.Text strong>{notification.title}</Typography.Text>
|
||||||
|
{notification.priority === 'high' || notification.priority === 'urgent' ? (
|
||||||
|
<span className="admin-notification-priority">紧急</span>
|
||||||
|
) : null}
|
||||||
|
{notification.reminderCount > 0 ? (
|
||||||
|
<Typography.Text type="secondary">
|
||||||
|
已催 {notification.reminderCount} 次
|
||||||
|
</Typography.Text>
|
||||||
|
) : null}
|
||||||
|
</Space>
|
||||||
|
<Typography.Paragraph type="secondary" ellipsis={{ rows: 2 }}>
|
||||||
|
{notification.body}
|
||||||
|
</Typography.Paragraph>
|
||||||
|
<Typography.Text type="secondary" className="admin-notification-time">
|
||||||
|
{formatAdminDateTime(notification.updatedAt)}
|
||||||
|
</Typography.Text>
|
||||||
|
</div>
|
||||||
|
</List.Item>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
|
||||||
const selectedKey = resolveSelectedKey(location.pathname)
|
const selectedKey = resolveSelectedKey(location.pathname)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -182,6 +304,24 @@ export default function AdminLayout() {
|
|||||||
<Layout className="admin-main-shell">
|
<Layout className="admin-main-shell">
|
||||||
<Layout.Header className="admin-topbar">
|
<Layout.Header className="admin-topbar">
|
||||||
<Space className="admin-user" size={12}>
|
<Space className="admin-user" size={12}>
|
||||||
|
<Tooltip title={soundEnabled ? '关闭通知声音' : '开启通知声音'}>
|
||||||
|
<Button
|
||||||
|
type="text"
|
||||||
|
aria-label={soundEnabled ? '关闭通知声音' : '开启通知声音'}
|
||||||
|
icon={<SoundOutlined className={soundEnabled ? '' : 'admin-sound-muted'} />}
|
||||||
|
onClick={toggleNotificationSound}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Popover
|
||||||
|
content={notificationContent}
|
||||||
|
title="待处理事项"
|
||||||
|
trigger="click"
|
||||||
|
placement="bottomRight"
|
||||||
|
>
|
||||||
|
<Badge count={pendingNotificationCount} size="small" overflowCount={99}>
|
||||||
|
<Button type="text" aria-label="待处理事项" icon={<BellOutlined />} />
|
||||||
|
</Badge>
|
||||||
|
</Popover>
|
||||||
<Dropdown
|
<Dropdown
|
||||||
menu={{
|
menu={{
|
||||||
items: [{ key: 'logout', label: '退出登录' }],
|
items: [{ key: 'logout', label: '退出登录' }],
|
||||||
@@ -203,6 +343,99 @@ export default function AdminLayout() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type NotificationAlertKind =
|
||||||
|
| 'withdraw'
|
||||||
|
| 'recharge'
|
||||||
|
| 'acceptance'
|
||||||
|
| 'material'
|
||||||
|
| 'reminder'
|
||||||
|
| 'default'
|
||||||
|
|
||||||
|
function selectNotificationToAnnounce(notifications: AdminNotification[]) {
|
||||||
|
return [...notifications].sort((left, right) => {
|
||||||
|
const priorityDiff = notificationAlertRank(right) - notificationAlertRank(left)
|
||||||
|
if (priorityDiff !== 0) return priorityDiff
|
||||||
|
return right.notificationId - left.notificationId
|
||||||
|
})[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
function notificationAlertRank(notification: AdminNotification) {
|
||||||
|
if (notification.notificationType === 'worker_acceptance_reminded') return 3
|
||||||
|
if (notification.notificationType === 'worker_withdraw_requested') return 2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
function announceNotification(notification?: AdminNotification) {
|
||||||
|
if (!notification?.soundEnabled) return
|
||||||
|
const { text, kind } = resolveNotificationAnnouncement(notification)
|
||||||
|
playNotificationSound(kind)
|
||||||
|
if (!('speechSynthesis' in window) || typeof SpeechSynthesisUtterance === 'undefined') return
|
||||||
|
|
||||||
|
try {
|
||||||
|
window.speechSynthesis.cancel()
|
||||||
|
const utterance = new SpeechSynthesisUtterance(text)
|
||||||
|
utterance.lang = 'zh-CN'
|
||||||
|
utterance.rate = 1.05
|
||||||
|
utterance.volume = 0.9
|
||||||
|
window.speechSynthesis.speak(utterance)
|
||||||
|
} catch {
|
||||||
|
// 语音播报不可用时,前面的区分音调仍会提示新待办。
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveNotificationAnnouncement(notification?: AdminNotification): {
|
||||||
|
text: string
|
||||||
|
kind: NotificationAlertKind
|
||||||
|
} {
|
||||||
|
if (notification?.notificationType === 'worker_acceptance_reminded') {
|
||||||
|
return { text: '你有新的催验收工单', kind: 'reminder' }
|
||||||
|
}
|
||||||
|
if (notification?.notificationType === 'worker_withdraw_requested') {
|
||||||
|
return { text: '你有新的提现申请', kind: 'withdraw' }
|
||||||
|
}
|
||||||
|
if (notification?.notificationType === 'worker_recharge_requested') {
|
||||||
|
return { text: '你有新的充值申请', kind: 'recharge' }
|
||||||
|
}
|
||||||
|
if (notification?.notificationType === 'worker_acceptance_submitted') {
|
||||||
|
return { text: '你有新的待验收工单', kind: 'acceptance' }
|
||||||
|
}
|
||||||
|
if (notification?.notificationType === 'work_order_material_required') {
|
||||||
|
return { text: '你有工单待补资料', kind: 'material' }
|
||||||
|
}
|
||||||
|
return { text: '你有新的待处理事项', kind: 'default' }
|
||||||
|
}
|
||||||
|
|
||||||
|
function playNotificationSound(kind: NotificationAlertKind) {
|
||||||
|
try {
|
||||||
|
const audio = new AudioContext()
|
||||||
|
const oscillator = audio.createOscillator()
|
||||||
|
const gain = audio.createGain()
|
||||||
|
oscillator.type = 'sine'
|
||||||
|
const notes: Record<NotificationAlertKind, number[]> = {
|
||||||
|
withdraw: [740, 988],
|
||||||
|
recharge: [587, 740],
|
||||||
|
acceptance: [660, 784],
|
||||||
|
material: [523, 659],
|
||||||
|
reminder: [880, 1047, 1319],
|
||||||
|
default: [880],
|
||||||
|
}
|
||||||
|
const duration = 0.12
|
||||||
|
const sequence = notes[kind]
|
||||||
|
sequence.forEach((frequency, index) => {
|
||||||
|
oscillator.frequency.setValueAtTime(frequency, audio.currentTime + index * duration)
|
||||||
|
})
|
||||||
|
gain.gain.setValueAtTime(0.08, audio.currentTime)
|
||||||
|
gain.gain.exponentialRampToValueAtTime(0.001, audio.currentTime + sequence.length * duration)
|
||||||
|
oscillator.connect(gain)
|
||||||
|
gain.connect(audio.destination)
|
||||||
|
oscillator.start()
|
||||||
|
oscillator.stop(audio.currentTime + sequence.length * duration)
|
||||||
|
oscillator.addEventListener('ended', () => void audio.close())
|
||||||
|
} catch {
|
||||||
|
// 部分浏览器禁止音频或不支持 Web Audio,不影响待办轮询。
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function resolveSelectedKey(pathname: string) {
|
function resolveSelectedKey(pathname: string) {
|
||||||
if (pathname.startsWith('/admin/orders')) return '/admin/orders'
|
if (pathname.startsWith('/admin/orders')) return '/admin/orders'
|
||||||
if (pathname.startsWith('/admin/tasks')) return '/admin/tasks'
|
if (pathname.startsWith('/admin/tasks')) return '/admin/tasks'
|
||||||
@@ -212,6 +445,24 @@ function resolveSelectedKey(pathname: string) {
|
|||||||
return pathname
|
return pathname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function buildNotificationActionPath(notification: AdminNotification) {
|
||||||
|
if (!notification.entityId) {
|
||||||
|
return notification.actionPath
|
||||||
|
}
|
||||||
|
const [pathname, query = ''] = notification.actionPath.split('?')
|
||||||
|
const searchParams = new URLSearchParams(query)
|
||||||
|
if (notification.entityType === 'work_order') {
|
||||||
|
searchParams.set('tab', 'orders')
|
||||||
|
searchParams.set('workOrderId', String(notification.entityId))
|
||||||
|
} else if (notification.entityType === 'worker_finance_request') {
|
||||||
|
searchParams.set('tab', 'finance')
|
||||||
|
searchParams.set('financeRequestId', String(notification.entityId))
|
||||||
|
} else {
|
||||||
|
return notification.actionPath
|
||||||
|
}
|
||||||
|
return `${pathname}?${searchParams.toString()}`
|
||||||
|
}
|
||||||
|
|
||||||
function roleLabel(role: string) {
|
function roleLabel(role: string) {
|
||||||
if (role === 'admin') return '管理员'
|
if (role === 'admin') return '管理员'
|
||||||
if (role === 'operator') return '普通运营'
|
if (role === 'operator') return '普通运营'
|
||||||
|
|||||||
@@ -1,18 +1,31 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery } from '@tanstack/react-query'
|
||||||
import { Card, Space, Tabs } from 'antd'
|
import { Card, Space, Tabs } from 'antd'
|
||||||
import { useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useSearchParams } from 'react-router'
|
||||||
|
|
||||||
import PageHeader from '@/components/admin/PageHeader'
|
import PageHeader from '@/components/admin/PageHeader'
|
||||||
import { fetchAdminWorkerPlatformSummary } from '@/services/admin'
|
import { fetchAdminWorkerPlatformSummary } from '@/services/admin'
|
||||||
|
import { getAdminRole } from '@/utils/admin-auth'
|
||||||
import CategoriesPanel from './panels/CategoriesPanel'
|
import CategoriesPanel from './panels/CategoriesPanel'
|
||||||
import FinancePanel from './panels/FinancePanel'
|
import FinancePanel from './panels/FinancePanel'
|
||||||
import LevelsPanel from './panels/LevelsPanel'
|
import LevelsPanel from './panels/LevelsPanel'
|
||||||
|
import NotificationsPanel from './panels/NotificationsPanel'
|
||||||
import ProductRulesPanel from './panels/ProductRulesPanel'
|
import ProductRulesPanel from './panels/ProductRulesPanel'
|
||||||
import WorkersPanel from './panels/WorkersPanel'
|
import WorkersPanel from './panels/WorkersPanel'
|
||||||
import WorkOrdersPanel from './panels/WorkOrdersPanel'
|
import WorkOrdersPanel from './panels/WorkOrdersPanel'
|
||||||
|
|
||||||
export default function AdminWorkerPlatformPage() {
|
export default function AdminWorkerPlatformPage() {
|
||||||
const [activeTab, setActiveTab] = useState(loadActiveTabPreference)
|
const [searchParams] = useSearchParams()
|
||||||
|
const [activeTab, setActiveTab] = useState(() => loadActiveTab(searchParams.get('tab')))
|
||||||
|
const isAdmin = getAdminRole() === 'admin'
|
||||||
|
const visibleActiveTab = !isAdmin && activeTab === 'notifications' ? 'orders' : activeTab
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const tab = searchParams.get('tab')
|
||||||
|
if (isWorkerPlatformTab(tab)) {
|
||||||
|
setActiveTab(tab)
|
||||||
|
}
|
||||||
|
}, [searchParams])
|
||||||
|
|
||||||
function changeTab(nextTab: string) {
|
function changeTab(nextTab: string) {
|
||||||
setActiveTab(nextTab)
|
setActiveTab(nextTab)
|
||||||
@@ -25,7 +38,7 @@ export default function AdminWorkerPlatformPage() {
|
|||||||
<SummaryCards />
|
<SummaryCards />
|
||||||
<Tabs
|
<Tabs
|
||||||
destroyOnHidden={false}
|
destroyOnHidden={false}
|
||||||
activeKey={activeTab}
|
activeKey={visibleActiveTab}
|
||||||
onChange={changeTab}
|
onChange={changeTab}
|
||||||
items={[
|
items={[
|
||||||
{ key: 'orders', label: '接单工单', children: <WorkOrdersPanel /> },
|
{ key: 'orders', label: '接单工单', children: <WorkOrdersPanel /> },
|
||||||
@@ -34,6 +47,9 @@ export default function AdminWorkerPlatformPage() {
|
|||||||
{ key: 'workers', label: '打手', children: <WorkersPanel /> },
|
{ key: 'workers', label: '打手', children: <WorkersPanel /> },
|
||||||
{ key: 'finance', label: '资金', children: <FinancePanel /> },
|
{ key: 'finance', label: '资金', children: <FinancePanel /> },
|
||||||
{ key: 'levels', label: '等级权限', children: <LevelsPanel /> },
|
{ key: 'levels', label: '等级权限', children: <LevelsPanel /> },
|
||||||
|
...(isAdmin
|
||||||
|
? [{ key: 'notifications', label: '通知配置', children: <NotificationsPanel /> }]
|
||||||
|
: []),
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
@@ -49,11 +65,28 @@ function loadActiveTabPreference(): string {
|
|||||||
saved === 'categories' ||
|
saved === 'categories' ||
|
||||||
saved === 'workers' ||
|
saved === 'workers' ||
|
||||||
saved === 'finance' ||
|
saved === 'finance' ||
|
||||||
saved === 'levels'
|
saved === 'levels' ||
|
||||||
|
saved === 'notifications'
|
||||||
? saved
|
? saved
|
||||||
: 'orders'
|
: 'orders'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function loadActiveTab(tab: string | null): string {
|
||||||
|
return isWorkerPlatformTab(tab) ? tab : loadActiveTabPreference()
|
||||||
|
}
|
||||||
|
|
||||||
|
function isWorkerPlatformTab(tab: string | null): tab is string {
|
||||||
|
return [
|
||||||
|
'orders',
|
||||||
|
'rules',
|
||||||
|
'categories',
|
||||||
|
'workers',
|
||||||
|
'finance',
|
||||||
|
'levels',
|
||||||
|
'notifications',
|
||||||
|
].includes(String(tab || ''))
|
||||||
|
}
|
||||||
|
|
||||||
function SummaryCards() {
|
function SummaryCards() {
|
||||||
const summaryQuery = useQuery({
|
const summaryQuery = useQuery({
|
||||||
queryKey: ['admin-worker-platform-summary'],
|
queryKey: ['admin-worker-platform-summary'],
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { ReloadOutlined } from '@ant-design/icons'
|
|||||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
import {
|
import {
|
||||||
App,
|
App,
|
||||||
|
Alert,
|
||||||
Button,
|
Button,
|
||||||
Card,
|
Card,
|
||||||
Descriptions,
|
Descriptions,
|
||||||
@@ -18,6 +19,7 @@ import {
|
|||||||
} from 'antd'
|
} from 'antd'
|
||||||
import type { TableColumnsType } from 'antd'
|
import type { TableColumnsType } from 'antd'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useSearchParams } from 'react-router'
|
||||||
|
|
||||||
import ImageUpload from '@/components/files/ImageUpload'
|
import ImageUpload from '@/components/files/ImageUpload'
|
||||||
import ImagePreviewList from '@/components/files/ImagePreviewList'
|
import ImagePreviewList from '@/components/files/ImagePreviewList'
|
||||||
@@ -59,9 +61,11 @@ type FinanceReviewAction = 'approved' | 'rejected' | 'cancelled'
|
|||||||
export default function FinancePanel() {
|
export default function FinancePanel() {
|
||||||
const { message } = App.useApp()
|
const { message } = App.useApp()
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
|
const [searchParams, setSearchParams] = useSearchParams()
|
||||||
const [configForm] = Form.useForm<FinanceConfigFormValues>()
|
const [configForm] = Form.useForm<FinanceConfigFormValues>()
|
||||||
const [reviewForm] = Form.useForm<{ reviewedNote?: string }>()
|
const [reviewForm] = Form.useForm<{ reviewedNote?: string }>()
|
||||||
const [requestStatus, setRequestStatus] = useState('')
|
const [requestStatus, setRequestStatus] = useState('')
|
||||||
|
const [targetRequestId, setTargetRequestId] = useState<number | undefined>()
|
||||||
const [requestType, setRequestType] = useState('')
|
const [requestType, setRequestType] = useState('')
|
||||||
const [keywordInput, setKeywordInput] = useState('')
|
const [keywordInput, setKeywordInput] = useState('')
|
||||||
const [keyword, setKeyword] = useState('')
|
const [keyword, setKeyword] = useState('')
|
||||||
@@ -79,11 +83,29 @@ export default function FinancePanel() {
|
|||||||
queryKey: ['admin-worker-platform-finance-config'],
|
queryKey: ['admin-worker-platform-finance-config'],
|
||||||
queryFn: () => fetchAdminWorkerFinanceConfig(),
|
queryFn: () => fetchAdminWorkerFinanceConfig(),
|
||||||
})
|
})
|
||||||
|
useEffect(() => {
|
||||||
|
const requestId = Number(searchParams.get('financeRequestId') || 0)
|
||||||
|
if (!Number.isInteger(requestId) || requestId <= 0) return
|
||||||
|
setTargetRequestId(requestId)
|
||||||
|
setRequestStatus('')
|
||||||
|
setRequestType('')
|
||||||
|
setKeyword('')
|
||||||
|
setKeywordInput('')
|
||||||
|
setPage(1)
|
||||||
|
setSearchParams(
|
||||||
|
(current) => {
|
||||||
|
current.delete('financeRequestId')
|
||||||
|
return current
|
||||||
|
},
|
||||||
|
{ replace: true },
|
||||||
|
)
|
||||||
|
}, [searchParams, setSearchParams])
|
||||||
const financeRequestsQuery = useQuery({
|
const financeRequestsQuery = useQuery({
|
||||||
queryKey: [
|
queryKey: [
|
||||||
'admin-worker-platform-finance-requests',
|
'admin-worker-platform-finance-requests',
|
||||||
requestStatus,
|
requestStatus,
|
||||||
requestType,
|
requestType,
|
||||||
|
targetRequestId,
|
||||||
keyword,
|
keyword,
|
||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
@@ -92,6 +114,7 @@ export default function FinancePanel() {
|
|||||||
fetchAdminWorkerFinanceRequests({
|
fetchAdminWorkerFinanceRequests({
|
||||||
status: requestStatus,
|
status: requestStatus,
|
||||||
requestType,
|
requestType,
|
||||||
|
requestId: targetRequestId,
|
||||||
keyword,
|
keyword,
|
||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
@@ -274,6 +297,18 @@ export default function FinancePanel() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="platform-panel-stack">
|
<section className="platform-panel-stack">
|
||||||
|
{targetRequestId ? (
|
||||||
|
<Alert
|
||||||
|
type="info"
|
||||||
|
showIcon
|
||||||
|
message={`已定位资金申请 #${targetRequestId}`}
|
||||||
|
action={
|
||||||
|
<Button size="small" onClick={() => setTargetRequestId(undefined)}>
|
||||||
|
取消定位
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
<Card
|
<Card
|
||||||
title="资金配置"
|
title="资金配置"
|
||||||
bordered={false}
|
bordered={false}
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
|
import { App, Alert, Button, Card, Space, Switch, Table, Typography } from 'antd'
|
||||||
|
import type { TableColumnsType } from 'antd'
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
|
||||||
|
import {
|
||||||
|
fetchAdminWorkerPlatformNotificationConfig,
|
||||||
|
saveAdminWorkerPlatformNotificationConfig,
|
||||||
|
} from '@/services/admin'
|
||||||
|
import type {
|
||||||
|
WorkerPlatformNotificationConfig,
|
||||||
|
WorkerPlatformNotificationEventKey,
|
||||||
|
} from '@/types/worker-platform'
|
||||||
|
|
||||||
|
type NotificationEventRow = {
|
||||||
|
key: WorkerPlatformNotificationEventKey
|
||||||
|
name: string
|
||||||
|
description: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const notificationEventRows: NotificationEventRow[] = [
|
||||||
|
{ key: 'withdraw_requested', name: '提现申请', description: '打手提交新的提现申请' },
|
||||||
|
{ key: 'recharge_requested', name: '充值申请', description: '打手提交新的充值申请' },
|
||||||
|
{ key: 'acceptance_submitted', name: '提交验收', description: '打手提交订单验收资料' },
|
||||||
|
{ key: 'acceptance_reminded', name: '催验收', description: '打手在验收后催促处理' },
|
||||||
|
{ key: 'material_required', name: '待补资料工单', description: '新工单等待后台补充资料' },
|
||||||
|
]
|
||||||
|
|
||||||
|
export default function NotificationsPanel() {
|
||||||
|
const { message } = App.useApp()
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const [draft, setDraft] = useState<WorkerPlatformNotificationConfig | null>(null)
|
||||||
|
const [saving, setSaving] = useState(false)
|
||||||
|
const configQuery = useQuery({
|
||||||
|
queryKey: ['admin-worker-platform-notification-config'],
|
||||||
|
queryFn: fetchAdminWorkerPlatformNotificationConfig,
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const config = configQuery.data?.data
|
||||||
|
if (config) {
|
||||||
|
setDraft(config)
|
||||||
|
}
|
||||||
|
}, [configQuery.data])
|
||||||
|
|
||||||
|
function updateEvent(
|
||||||
|
eventKey: WorkerPlatformNotificationEventKey,
|
||||||
|
field: 'todoEnabled' | 'soundEnabled' | 'externalPushEnabled',
|
||||||
|
value: boolean,
|
||||||
|
) {
|
||||||
|
setDraft((current) => {
|
||||||
|
if (!current) return current
|
||||||
|
const event = current.events[eventKey]
|
||||||
|
const nextEvent = { ...event, [field]: value }
|
||||||
|
if (field === 'todoEnabled' && !value) {
|
||||||
|
nextEvent.soundEnabled = false
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...current,
|
||||||
|
events: { ...current.events, [eventKey]: nextEvent },
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveConfig() {
|
||||||
|
if (!draft) return
|
||||||
|
setSaving(true)
|
||||||
|
try {
|
||||||
|
await saveAdminWorkerPlatformNotificationConfig(draft)
|
||||||
|
await queryClient.invalidateQueries({
|
||||||
|
queryKey: ['admin-worker-platform-notification-config'],
|
||||||
|
})
|
||||||
|
message.success('通知配置已保存')
|
||||||
|
} catch (error) {
|
||||||
|
message.error(error instanceof Error ? error.message : '保存通知配置失败')
|
||||||
|
} finally {
|
||||||
|
setSaving(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const columns: TableColumnsType<NotificationEventRow> = [
|
||||||
|
{
|
||||||
|
title: '通知事件',
|
||||||
|
dataIndex: 'name',
|
||||||
|
minWidth: 220,
|
||||||
|
render: (_, row) => (
|
||||||
|
<div className="cell-stack">
|
||||||
|
<Typography.Text strong>{row.name}</Typography.Text>
|
||||||
|
<Typography.Text type="secondary">{row.description}</Typography.Text>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '后台待办',
|
||||||
|
width: 130,
|
||||||
|
align: 'center',
|
||||||
|
render: (_, row) => (
|
||||||
|
<Switch
|
||||||
|
checked={draft?.events[row.key].todoEnabled || false}
|
||||||
|
disabled={!draft || saving}
|
||||||
|
onChange={(checked) => updateEvent(row.key, 'todoEnabled', checked)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '声音播报',
|
||||||
|
width: 130,
|
||||||
|
align: 'center',
|
||||||
|
render: (_, row) => (
|
||||||
|
<Switch
|
||||||
|
checked={draft?.events[row.key].soundEnabled || false}
|
||||||
|
disabled={!draft?.events[row.key].todoEnabled || saving}
|
||||||
|
onChange={(checked) => updateEvent(row.key, 'soundEnabled', checked)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Bark/WPush',
|
||||||
|
width: 140,
|
||||||
|
align: 'center',
|
||||||
|
render: (_, row) => (
|
||||||
|
<Switch
|
||||||
|
checked={draft?.events[row.key].externalPushEnabled || false}
|
||||||
|
disabled={!draft || saving}
|
||||||
|
onChange={(checked) => updateEvent(row.key, 'externalPushEnabled', checked)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card size="small" bordered={false}>
|
||||||
|
<Space direction="vertical" size={16} style={{ width: '100%' }}>
|
||||||
|
<Alert
|
||||||
|
type="info"
|
||||||
|
showIcon
|
||||||
|
message="配置仅影响保存后产生的通知"
|
||||||
|
description="关闭后台待办后,声音播报会同步关闭;已创建的待办不会被隐藏或删除。"
|
||||||
|
/>
|
||||||
|
<Table
|
||||||
|
rowKey="key"
|
||||||
|
columns={columns}
|
||||||
|
dataSource={notificationEventRows}
|
||||||
|
pagination={false}
|
||||||
|
loading={configQuery.isLoading}
|
||||||
|
scroll={{ x: 660 }}
|
||||||
|
/>
|
||||||
|
<Space>
|
||||||
|
<Button
|
||||||
|
type="primary"
|
||||||
|
loading={saving}
|
||||||
|
disabled={!draft}
|
||||||
|
onClick={() => void saveConfig()}
|
||||||
|
>
|
||||||
|
保存配置
|
||||||
|
</Button>
|
||||||
|
<Typography.Text type="secondary">浏览器总声音开关仍可在后台右上角控制。</Typography.Text>
|
||||||
|
</Space>
|
||||||
|
</Space>
|
||||||
|
</Card>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -37,7 +37,7 @@ import {
|
|||||||
} from 'antd'
|
} from 'antd'
|
||||||
import type { TableColumnsType } from 'antd'
|
import type { TableColumnsType } from 'antd'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { useNavigate } from 'react-router'
|
import { useNavigate, useSearchParams } from 'react-router'
|
||||||
|
|
||||||
import JsonPreview from '@/components/admin/JsonPreview'
|
import JsonPreview from '@/components/admin/JsonPreview'
|
||||||
import WorkOrderEventTimeline from '@/components/WorkOrderEventTimeline'
|
import WorkOrderEventTimeline from '@/components/WorkOrderEventTimeline'
|
||||||
@@ -116,9 +116,11 @@ type CancelOrderFormValues = {
|
|||||||
export default function WorkOrdersPanel() {
|
export default function WorkOrdersPanel() {
|
||||||
const { message, modal } = App.useApp()
|
const { message, modal } = App.useApp()
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
|
const [searchParams, setSearchParams] = useSearchParams()
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const canEditRequirementFields = hasAdminRole('operator')
|
const canEditRequirementFields = hasAdminRole('operator')
|
||||||
const [statuses, setStatuses] = useState<string[]>([])
|
const [statuses, setStatuses] = useState<string[]>([])
|
||||||
|
const [targetWorkOrderId, setTargetWorkOrderId] = useState<number | undefined>()
|
||||||
const [keyword, setKeyword] = useState('')
|
const [keyword, setKeyword] = useState('')
|
||||||
const [keywordInput, setKeywordInput] = useState('')
|
const [keywordInput, setKeywordInput] = useState('')
|
||||||
const [workerId, setWorkerId] = useState<number | undefined>()
|
const [workerId, setWorkerId] = useState<number | undefined>()
|
||||||
@@ -165,12 +167,31 @@ export default function WorkOrdersPanel() {
|
|||||||
)
|
)
|
||||||
const vipEvidencePending = statuses.includes(VIP_EVIDENCE_PENDING_STATUS)
|
const vipEvidencePending = statuses.includes(VIP_EVIDENCE_PENDING_STATUS)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const workOrderId = Number(searchParams.get('workOrderId') || 0)
|
||||||
|
if (!Number.isInteger(workOrderId) || workOrderId <= 0) return
|
||||||
|
setTargetWorkOrderId(workOrderId)
|
||||||
|
setStatuses([])
|
||||||
|
setKeyword('')
|
||||||
|
setKeywordInput('')
|
||||||
|
setWorkerId(undefined)
|
||||||
|
setPage(1)
|
||||||
|
setSearchParams(
|
||||||
|
(current) => {
|
||||||
|
current.delete('workOrderId')
|
||||||
|
return current
|
||||||
|
},
|
||||||
|
{ replace: true },
|
||||||
|
)
|
||||||
|
}, [searchParams, setSearchParams])
|
||||||
|
|
||||||
const ordersQuery = useQuery({
|
const ordersQuery = useQuery({
|
||||||
queryKey: [
|
queryKey: [
|
||||||
'admin-worker-platform-orders',
|
'admin-worker-platform-orders',
|
||||||
statuses.join(','),
|
statuses.join(','),
|
||||||
keyword,
|
keyword,
|
||||||
workerId,
|
workerId,
|
||||||
|
targetWorkOrderId,
|
||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
],
|
],
|
||||||
@@ -179,6 +200,7 @@ export default function WorkOrdersPanel() {
|
|||||||
status:
|
status:
|
||||||
selectedWorkOrderStatuses.length > 0 ? selectedWorkOrderStatuses.join(',') : undefined,
|
selectedWorkOrderStatuses.length > 0 ? selectedWorkOrderStatuses.join(',') : undefined,
|
||||||
vipEvidencePending: vipEvidencePending || undefined,
|
vipEvidencePending: vipEvidencePending || undefined,
|
||||||
|
workOrderId: targetWorkOrderId,
|
||||||
keyword,
|
keyword,
|
||||||
workerId,
|
workerId,
|
||||||
page,
|
page,
|
||||||
@@ -207,7 +229,7 @@ export default function WorkOrdersPanel() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setSelectedAcceptanceOrderIds([])
|
setSelectedAcceptanceOrderIds([])
|
||||||
}, [statuses, keyword, workerId, page, pageSize])
|
}, [statuses, keyword, workerId, targetWorkOrderId, page, pageSize])
|
||||||
|
|
||||||
function openAssignModal(row: WorkOrder) {
|
function openAssignModal(row: WorkOrder) {
|
||||||
setAssignOrder(row)
|
setAssignOrder(row)
|
||||||
@@ -482,6 +504,7 @@ export default function WorkOrdersPanel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearOrderFilters() {
|
function clearOrderFilters() {
|
||||||
|
setTargetWorkOrderId(undefined)
|
||||||
setKeywordInput('')
|
setKeywordInput('')
|
||||||
setKeyword('')
|
setKeyword('')
|
||||||
setStatuses([])
|
setStatuses([])
|
||||||
@@ -865,6 +888,18 @@ export default function WorkOrdersPanel() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="platform-panel-stack">
|
<section className="platform-panel-stack">
|
||||||
|
{targetWorkOrderId ? (
|
||||||
|
<Alert
|
||||||
|
type="info"
|
||||||
|
showIcon
|
||||||
|
message={`已定位工单 #${targetWorkOrderId}`}
|
||||||
|
action={
|
||||||
|
<Button size="small" onClick={() => setTargetWorkOrderId(undefined)}>
|
||||||
|
取消定位
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
<Card title="订单搜索与筛选" bordered={false}>
|
<Card title="订单搜索与筛选" bordered={false}>
|
||||||
<div className="worker-orders-toolbar">
|
<div className="worker-orders-toolbar">
|
||||||
<Space wrap className="filter-form worker-orders-search-controls">
|
<Space wrap className="filter-form worker-orders-search-controls">
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ import {
|
|||||||
fetchWorkerMyOrderOverview,
|
fetchWorkerMyOrderOverview,
|
||||||
fetchWorkerMyOrders,
|
fetchWorkerMyOrders,
|
||||||
fetchWorkerProfile,
|
fetchWorkerProfile,
|
||||||
|
remindWorkerAcceptance,
|
||||||
saveWorkerAcceptanceDraft,
|
saveWorkerAcceptanceDraft,
|
||||||
saveWorkerOrderNote,
|
saveWorkerOrderNote,
|
||||||
supplementWorkerAcceptedOrderEvidence,
|
supplementWorkerAcceptedOrderEvidence,
|
||||||
@@ -300,6 +301,16 @@ export default function WorkerOrdersPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function submitAcceptanceReminder(order: WorkOrder) {
|
||||||
|
try {
|
||||||
|
await remindWorkerAcceptance(order.workOrderId)
|
||||||
|
message.success('已催促管理员验收')
|
||||||
|
await refreshAll()
|
||||||
|
} catch (error) {
|
||||||
|
message.error(error instanceof Error ? error.message : '催验收失败')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function submitAcceptance(values: AcceptanceFormValues) {
|
async function submitAcceptance(values: AcceptanceFormValues) {
|
||||||
if (!editingOrder) return
|
if (!editingOrder) return
|
||||||
const isAcceptedEvidenceSupplement = canSupplementAcceptedEvidence(editingOrder)
|
const isAcceptedEvidenceSupplement = canSupplementAcceptedEvidence(editingOrder)
|
||||||
@@ -597,6 +608,9 @@ export default function WorkerOrdersPage() {
|
|||||||
{hasSubmittedAcceptance(row) ? '补充图片' : '验收'}
|
{hasSubmittedAcceptance(row) ? '补充图片' : '验收'}
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
|
{canRemindAcceptance(row) ? (
|
||||||
|
<Button onClick={() => submitAcceptanceReminder(row)}>催验收</Button>
|
||||||
|
) : null}
|
||||||
</Space>
|
</Space>
|
||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
@@ -893,6 +907,11 @@ export default function WorkerOrdersPage() {
|
|||||||
{hasSubmittedAcceptance(order) ? '补充图片' : '提交验收'}
|
{hasSubmittedAcceptance(order) ? '补充图片' : '提交验收'}
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
|
{canRemindAcceptance(order) ? (
|
||||||
|
<Button size="small" onClick={() => submitAcceptanceReminder(order)}>
|
||||||
|
催验收
|
||||||
|
</Button>
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
@@ -1292,6 +1311,10 @@ function canSubmitAcceptance(order: WorkOrder) {
|
|||||||
return ['in_progress', 'problem'].includes(order.status)
|
return ['in_progress', 'problem'].includes(order.status)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function canRemindAcceptance(order: WorkOrder) {
|
||||||
|
return !order.myShare && order.status === 'pending_acceptance'
|
||||||
|
}
|
||||||
|
|
||||||
function canAutoAcceptOrder(order: WorkOrder, workerCanAutoAcceptWithoutEvidence: boolean) {
|
function canAutoAcceptOrder(order: WorkOrder, workerCanAutoAcceptWithoutEvidence: boolean) {
|
||||||
return (
|
return (
|
||||||
workerCanAutoAcceptWithoutEvidence &&
|
workerCanAutoAcceptWithoutEvidence &&
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ export * from './kuaishou-industry'
|
|||||||
export * from './orders'
|
export * from './orders'
|
||||||
export * from './tasks'
|
export * from './tasks'
|
||||||
export * from './dev-mock'
|
export * from './dev-mock'
|
||||||
|
export * from './notifications'
|
||||||
export * from './worker-platform'
|
export * from './worker-platform'
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { apiGet } from '@/lib/http'
|
||||||
|
|
||||||
|
export type AdminNotification = {
|
||||||
|
notificationId: number
|
||||||
|
notificationType: string
|
||||||
|
priority: 'normal' | 'high' | 'urgent' | string
|
||||||
|
entityType: string
|
||||||
|
entityId: number
|
||||||
|
title: string
|
||||||
|
body: string
|
||||||
|
actionPath: string
|
||||||
|
reminderCount: number
|
||||||
|
soundEnabled: boolean
|
||||||
|
lastRemindedAt: string | null
|
||||||
|
createdAt: string
|
||||||
|
updatedAt: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fetchAdminNotifications() {
|
||||||
|
return apiGet<{ pendingCount: number; items: AdminNotification[] }>('/api/v1/admin/notifications')
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ import type {
|
|||||||
WorkProductRule,
|
WorkProductRule,
|
||||||
WorkerFinanceConfig,
|
WorkerFinanceConfig,
|
||||||
WorkerFinanceRequest,
|
WorkerFinanceRequest,
|
||||||
|
WorkerPlatformNotificationConfig,
|
||||||
WorkerLevel,
|
WorkerLevel,
|
||||||
WorkerListResponse,
|
WorkerListResponse,
|
||||||
WorkerUser,
|
WorkerUser,
|
||||||
@@ -203,6 +204,21 @@ export function saveAdminWorkerFinanceConfig(payload: {
|
|||||||
return apiPost<WorkerFinanceConfig>('/api/v1/admin/worker-platform/finance-config', payload)
|
return apiPost<WorkerFinanceConfig>('/api/v1/admin/worker-platform/finance-config', payload)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function fetchAdminWorkerPlatformNotificationConfig() {
|
||||||
|
return apiGet<WorkerPlatformNotificationConfig>(
|
||||||
|
'/api/v1/admin/worker-platform/notification-config',
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveAdminWorkerPlatformNotificationConfig(
|
||||||
|
payload: WorkerPlatformNotificationConfig,
|
||||||
|
) {
|
||||||
|
return apiPost<WorkerPlatformNotificationConfig>(
|
||||||
|
'/api/v1/admin/worker-platform/notification-config',
|
||||||
|
payload,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
export function fetchAdminWorkerFinanceRequests(params?: Record<string, unknown>) {
|
export function fetchAdminWorkerFinanceRequests(params?: Record<string, unknown>) {
|
||||||
return apiGet<WorkerListResponse<WorkerFinanceRequest>>(
|
return apiGet<WorkerListResponse<WorkerFinanceRequest>>(
|
||||||
'/api/v1/admin/worker-platform/finance-requests',
|
'/api/v1/admin/worker-platform/finance-requests',
|
||||||
|
|||||||
@@ -154,6 +154,12 @@ export function submitWorkerAcceptance(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function remindWorkerAcceptance(workOrderId: number) {
|
||||||
|
return apiPost<{ reminderCount: number; nextRemindAt: string }>(
|
||||||
|
`/api/v1/worker/orders/${workOrderId}/remind-acceptance`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
export function saveWorkerAcceptanceDraft(
|
export function saveWorkerAcceptanceDraft(
|
||||||
workOrderId: number,
|
workOrderId: number,
|
||||||
payload: { note?: string; imageUrls?: string[]; files?: UploadedFile[] },
|
payload: { note?: string; imageUrls?: string[]; files?: UploadedFile[] },
|
||||||
|
|||||||
@@ -449,6 +449,36 @@
|
|||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.admin-sound-muted {
|
||||||
|
opacity: 0.45;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-popover {
|
||||||
|
width: min(380px, calc(100vw - 32px));
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-item {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-item .ant-list-item-meta,
|
||||||
|
.admin-notification-item > div {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-item .ant-typography {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-priority {
|
||||||
|
color: #cf1322;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-notification-time {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.admin-user-copy {
|
.admin-user-copy {
|
||||||
display: grid;
|
display: grid;
|
||||||
justify-items: end;
|
justify-items: end;
|
||||||
|
|||||||
@@ -106,6 +106,24 @@ export type WorkerFinanceConfig = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type WorkerPlatformNotificationEventKey =
|
||||||
|
| 'withdraw_requested'
|
||||||
|
| 'recharge_requested'
|
||||||
|
| 'acceptance_submitted'
|
||||||
|
| 'acceptance_reminded'
|
||||||
|
| 'material_required'
|
||||||
|
|
||||||
|
export type WorkerPlatformNotificationConfig = {
|
||||||
|
events: Record<
|
||||||
|
WorkerPlatformNotificationEventKey,
|
||||||
|
{
|
||||||
|
todoEnabled: boolean
|
||||||
|
soundEnabled: boolean
|
||||||
|
externalPushEnabled: boolean
|
||||||
|
}
|
||||||
|
>
|
||||||
|
}
|
||||||
|
|
||||||
export type WorkerWithdrawalAccount = {
|
export type WorkerWithdrawalAccount = {
|
||||||
accountChannel: string
|
accountChannel: string
|
||||||
accountName: string
|
accountName: string
|
||||||
|
|||||||
Reference in New Issue
Block a user