Merge branch 'dev'

2026-11-02 12:04:32 +08:00
parent 8b0666caec db3f477ab3
commit 360cfceac7
38 changed files with 1615 additions and 942 deletions
@@ -32,7 +32,6 @@ import type { WorkerAnnouncementConfig } from '@/types/worker-platform'
 import { formatAdminDateTime } from '@/utils/admin-time'

 import HallConfigPanel from './HallConfigPanel'
-import MaterialLinkConfigPanel from './MaterialLinkConfigPanel'

 function isDepositUnfreezeJob(job: AdminScheduledJobItem) {
  return job.type === 'deposit_unfreeze' || job.id === 'deposit-unfreeze'
@@ -45,7 +44,6 @@ export default function AnnouncementPanel() {
      <DepositUnfreezeCard />
      <MockCustomShopsCard />
      <HallConfigPanel />
-      <MaterialLinkConfigPanel />
    </Space>
  )
 }
@@ -1,74 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { App, Button, Card, Form, InputNumber, Space, Typography } from 'antd'
-import { useEffect, useState } from 'react'
-
-import {
-  fetchAdminWorkerMaterialLinkConfig,
-  saveAdminWorkerMaterialLinkConfig,
-} from '@/services/admin'
-import type { WorkerMaterialLinkConfig } from '@/types/worker-platform'
-
-export default function MaterialLinkConfigPanel() {
-  const { message } = App.useApp()
-  const queryClient = useQueryClient()
-  const [form] = Form.useForm<WorkerMaterialLinkConfig>()
-  const [saving, setSaving] = useState(false)
-
-  const configQuery = useQuery({
-    queryKey: ['admin-worker-material-link-config'],
-    queryFn: fetchAdminWorkerMaterialLinkConfig,
-  })
-  const config = configQuery.data?.data
-
-  useEffect(() => {
-    if (config) {
-      form.setFieldsValue({ ttlMinutes: config.ttlMinutes })
-    }
-  }, [config, form])
-
-  async function saveConfig(values: WorkerMaterialLinkConfig) {
-    setSaving(true)
-    try {
-      await saveAdminWorkerMaterialLinkConfig({ ttlMinutes: Number(values.ttlMinutes) })
-      await queryClient.invalidateQueries({ queryKey: ['admin-worker-material-link-config'] })
-      message.success('补资料链接配置已保存')
-    } catch (error) {
-      message.error(error instanceof Error ? error.message : '保存补资料链接配置失败')
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  return (
-    <Card title="补资料链接" bordered={false} loading={configQuery.isLoading}>
-      <Space direction="vertical" size="middle" style={{ width: '100%', maxWidth: 700 }}>
-        <Typography.Paragraph type="secondary" style={{ marginBottom: 0 }}>
-          客服在「接单工单」复制的一次性补资料链接，客户只能修改补资料内容；提交成功后工单转为「未分配」，
-          链接立即失效，需要重新发送。修改有效期只影响新生成的链接。
-        </Typography.Paragraph>
-        <Form form={form} layout="vertical" onFinish={saveConfig}>
-          <Form.Item
-            name="ttlMinutes"
-            label="链接有效期（分钟）"
-            extra="默认 30 分钟，可设置 1 - 10080 分钟（7 天）。"
-            rules={[{ required: true, message: '请输入链接有效期' }]}
-            style={{ marginBottom: 12 }}
-          >
-            <InputNumber
-              min={1}
-              max={10080}
-              precision={0}
-              style={{ width: 220 }}
-              addonAfter="分钟"
-            />
-          </Form.Item>
-          <Form.Item style={{ marginBottom: 0 }}>
-            <Button type="primary" htmlType="submit" loading={saving}>
-              保存配置
-            </Button>
-          </Form.Item>
-        </Form>
-      </Space>
-    </Card>
-  )
-}
@@ -60,7 +60,6 @@ import {
  cancelAdminWorkOrderSharingPart,
  completeAdminWorkOrderGiftCooldown,
  confirmAdminWorkOrderFriend,
-  createAdminWorkOrderMaterialLink,
  deductAdminWorkOrderPendingDeposit,
  deleteAdminWorkOrder,
  disposeAdminWorkOrderShareProblem,
@@ -78,6 +77,7 @@ import {
  reduceAdminWorkOrderShareQuantity,
  reopenAdminCancelledWorkOrder,
  resetAdminWorkOrderGiftMaterial,
+  resetAdminWorkOrderMaterialStatus,
  resolveAdminProblemWorkOrder,
  submitAdminWorkOrderMaterial,
  unpublishAdminWorkOrder,
@@ -106,6 +106,7 @@ import dayjs, { ADMIN_DATE_FORMAT } from '@/lib/dayjs'
 import { ADMIN_DEFAULT_PAGE_SIZE, buildAdminTablePagination } from '@/utils/admin-pagination'
 import { getAdminUsername, hasAdminPermission, hasAdminRole } from '@/utils/admin-auth'
 import { formatAdminDateTime } from '@/utils/admin-time'
+import { buildCollectMaterialLinkUrl } from '@/utils/collect-link'
 import { isExplicitOrderNoSearch, normalizeSearchText } from '@/utils/admin-realtime-work-orders'
 import {
  DeadlineCountdown,
@@ -203,10 +204,11 @@ function getConsignmentFulfillment(row: WorkOrder): ConsignmentFulfillmentInfo |
  return Object.keys(consignment).length > 0 ? (consignment as ConsignmentFulfillmentInfo) : null
 }

-/** 公开补资料链接只在「待完善 / 未分配」阶段生成；已进大厅或已接单不允许客户改资料。 */
+/** 补资料链接按平台订单号打开；只有待完善 / 待分配且存在平台订单号时才展示复制入口。 */
 function canCopyMaterialLink(order: WorkOrder): boolean {
  const status = String(order.rawStatus || order.status || '')
-  return status === 'pending_material' || status === 'unassigned'
+  const platformOrderId = String(order.platformOrderId || '').trim()
+  return (status === 'pending_material' || status === 'unassigned') && Boolean(platformOrderId)
 }

 /** 剪贴板 API 在 HTTP + IP 下可能不可用，补一个 textarea 兜底。 */
@@ -351,11 +353,7 @@ export default function WorkOrdersPanel() {
  const [materialOrder, setMaterialOrder] = useState<WorkOrder | null>(null)
  const [materialScreenshots, setMaterialScreenshots] = useState<UploadedFile[]>([])
  const [materialPasteText, setMaterialPasteText] = useState('')
-  const [materialLinkLoadingId, setMaterialLinkLoadingId] = useState<number | null>(null)
-  const [materialLinkFallback, setMaterialLinkFallback] = useState<{
-    url: string
-    expiresAt: string
-  } | null>(null)
+  const [materialLinkFallback, setMaterialLinkFallback] = useState<{ url: string } | null>(null)
  const [sharingOrder, setSharingOrder] = useState<WorkOrder | null>(null)
  const [cancelShare, setCancelShare] = useState<WorkOrderShare | null>(null)
  const [reduceShare, setReduceShare] = useState<WorkOrderShare | null>(null)
@@ -1491,7 +1489,7 @@ export default function WorkOrdersPanel() {
    modal.confirm({
      title: `确认删除订单 ${getDisplayOrderNo(row)}？`,
      content:
-        '删除后工单将从列表中移除，且不可恢复。仅未分配、待完善或已取消且无拼单参与的工单可删除。',
+        '删除后工单将从列表中移除，且不可恢复。仅待分配、待完善或已取消且无拼单参与的工单可删除。',
      okText: '确认删除',
      okButtonProps: { danger: true },
      cancelText: '取消',
@@ -1577,6 +1575,22 @@ export default function WorkOrdersPanel() {
    })
  }

+  function requestResetMaterial(row: WorkOrder) {
+    modal.confirm({
+      title: '重置补资料状态？',
+      content:
+        '将把该工单重置为“待完善”，客户可用订单号重新提交一次资料。已填资料会保留，客户重新提交后覆盖；此操作会记录在订单流转记录中。',
+      okText: '确认重置',
+      okButtonProps: { type: 'primary' },
+      cancelText: '取消',
+      onOk: () =>
+        runAction(
+          () => resetAdminWorkOrderMaterialStatus(row.workOrderId),
+          '已重置为待完善，客户刷新补资料页即可重新提交',
+        ),
+    })
+  }
+
  function copyBuyerMaterialInfo(order: WorkOrder) {
    const items = getMaterialDetailItems(order).filter((item) => String(item.value || '').trim())
    if (items.length === 0) {
@@ -1635,24 +1649,23 @@ export default function WorkOrdersPanel() {
  }

  async function copyMaterialLink(order: WorkOrder) {
-    setMaterialLinkLoadingId(order.workOrderId)
-    try {
-      const response = await createAdminWorkOrderMaterialLink(order.workOrderId)
-      const url = `${window.location.origin}/supplement/${encodeURIComponent(response.data.token)}`
-      const copied = await copyTextToClipboard(url)
-      const expiresText = formatAdminDateTime(response.data.expiresAt)
-      if (copied) {
-        message.success(
-          `${response.data.reused ? '已复制现有链接' : '已生成并复制新链接'}，${expiresText} 前有效，仅可提交一次`,
-        )
-      } else {
-        setMaterialLinkFallback({ url, expiresAt: response.data.expiresAt })
-      }
-    } catch (error) {
-      message.error(error instanceof Error ? error.message : '生成补资料链接失败')
-    } finally {
-      setMaterialLinkLoadingId(null)
+    const platformOrderId = String(order.platformOrderId || '').trim()
+    if (!platformOrderId) {
+      message.error('复制补资料链接失败：缺少平台订单号')
+      return
    }
+    const url = buildCollectMaterialLinkUrl(window.location.origin, platformOrderId)
+    if (!url) {
+      message.error('复制补资料链接失败：链接地址为空')
+      return
+    }
+    const copied = await copyTextToClipboard(url)
+    if (copied) {
+      message.success(`补资料链接已复制（订单号 ${platformOrderId}）`)
+      return
+    }
+    // 剪贴板 API 不可用时退回弹窗，让客服手动复制。
+    setMaterialLinkFallback({ url })
  }

  const columns: TableColumnsType<WorkOrder> = [
@@ -1914,13 +1927,13 @@ export default function WorkOrdersPanel() {
              onClick={() => {
                modal.confirm({
                  title: '确认重新启用该订单？',
-                  content: '订单将恢复为未分配状态。请确认资料与金额后，再发布到抢单大厅。',
+                  content: '订单将恢复为待分配状态。请确认资料与金额后，再发布到抢单大厅。',
                  okText: '重新启用',
                  cancelText: '取消',
                  onOk: () =>
                    runAction(
                      () => reopenAdminCancelledWorkOrder(row.workOrderId),
-                      '订单已恢复为未分配状态，可编辑后发布',
+                      '订单已恢复为待分配状态，可编辑后发布',
                    ),
                })
              }}
@@ -1967,13 +1980,21 @@ export default function WorkOrdersPanel() {
          {row.capabilities?.canUpdateMaterial && canUpdateMaterial && canCopyMaterialLink(row) ? (
            <Button
              icon={<LinkOutlined />}
-              loading={materialLinkLoadingId === row.workOrderId}
              onClick={() => void copyMaterialLink(row)}
-              title="生成一次性补资料链接（有效期内仅可提交一次）"
+              title="复制补资料链接（按平台订单号打开）"
            >
              复制补资料链接
            </Button>
          ) : null}
+          {row.capabilities?.canResetMaterial && canUpdateMaterial ? (
+            <Button
+              icon={<RollbackOutlined />}
+              onClick={() => requestResetMaterial(row)}
+              title="把已提交的补资料重置为待完善，客户可重新提交一次"
+            >
+              重置补资料
+            </Button>
+          ) : null}
          {row.capabilities?.canPublish && canPublishOrder ? (
            <Button
              icon={<SendOutlined />}
@@ -2006,11 +2027,11 @@ export default function WorkOrdersPanel() {
              onClick={() => {
                modal.confirm({
                  title: '确认下架该订单？',
-                  content: '下架后订单会回到未分配状态，不再在抢单大厅展示。',
+                  content: '下架后订单会回到待分配状态，不再在抢单大厅展示。',
                  okText: '确认下架',
                  cancelText: '取消',
                  onOk: () =>
-                    runAction(() => unpublishAdminWorkOrder(row.workOrderId), '订单已撤回到未分配'),
+                    runAction(() => unpublishAdminWorkOrder(row.workOrderId), '订单已撤回到待分配'),
                })
              }}
            >
@@ -3251,7 +3272,7 @@ export default function WorkOrdersPanel() {
        {materialLinkFallback ? (
          <Space direction="vertical" size={10} style={{ width: '100%' }}>
            <Typography.Text type="secondary">
-              链接仅可提交一次，{formatAdminDateTime(materialLinkFallback.expiresAt)} 前有效。
+              该链接按平台订单号打开，可查看该订单号下全部工单的补资料状态；每个工单仅可提交一次。
            </Typography.Text>
            <Input.TextArea
              value={materialLinkFallback.url}
@@ -205,7 +205,7 @@ export function formatMoney(value: number | undefined) {
 export function formatStatus(status: string) {
  const labels: Record<string, string> = {
    pending_material: '待完善',
-    unassigned: '未分配',
+    unassigned: '待分配',
    open: '待抢单',
    in_progress: '代练中',
    pending_acceptance: '待验收',