feat: Rock 回库支持上游校验与强制释放,新增 Token 状态历史

This commit is contained in:
2026-11-09 13:38:57 +08:00
parent b90252c093
commit 38cbb37a08
26 changed files with 1376 additions and 140 deletions
+36 -3
View File
@@ -785,6 +785,28 @@ export interface RockTokenRestoreResult {
skipped_items: RockTokenRestoreSkipItem[];
}
export interface RockReleaseCheckResult {
can_release: boolean
upstream_status: string
role_name?: string
role_id?: string
message: string
}
export interface RockTokenStatusLog {
id: number
token_id: number
upstream_token_id: string
event_type: string
from_status: string
to_status: string
source: string
reason: string
forced: boolean
actor_user_id?: number | null
created_at: string
}
export interface RockStaleRefreshResult {
scanned: number;
fixed: number;
@@ -921,10 +943,21 @@ export const rockApi = {
.then((r) => r.data.data as { message?: string; status?: string }),
resetToken: (id: number) =>
request.post(`/platform/rock/tokens/${id}/reset`).then((r) => r.data.data),
releaseToken: (id: number) =>
checkReleaseToken: (id: number) =>
request
.post(`/platform/rock/tokens/${id}/release`)
.then((r) => r.data.data),
.post(`/platform/rock/tokens/${id}/release-check`)
.then((r) => r.data.data as RockReleaseCheckResult),
releaseToken: (
id: number,
data?: { force?: boolean; force_confirm_text?: string },
) =>
request
.post(`/platform/rock/tokens/${id}/release`, data ?? {})
.then((r) => r.data.data as { message: string }),
listTokenStatusLogs: (id: number) =>
request
.get(`/platform/rock/tokens/${id}/status-logs`)
.then((r) => r.data.data as { list: RockTokenStatusLog[] }),
refreshTokenBinding: (id: number) =>
request
.post(`/platform/rock/tokens/${id}/refresh-binding`)
@@ -0,0 +1,228 @@
import { useEffect, useState } from 'react'
import { Alert, Descriptions, Grid, Input, Modal, Space, Tag, Typography, message } from 'antd'
import { ExclamationCircleOutlined, SafetyCertificateOutlined } from '@ant-design/icons'
import {
rockApi,
type RockReleaseCheckResult,
type RockTokenItem,
} from '../../api'
import {
rockTokenStatusLabel,
rockUpstreamStatusLabel,
} from './types'
const { Text } = Typography
export interface ReleaseTokenModalProps {
open: boolean
token: RockTokenItem | null
onCancel: () => void
onReleased: () => void
}
const FORCE_CONFIRM_TEXT = '强制释放'
export function ReleaseTokenModal({
open,
token,
onCancel,
onReleased,
}: ReleaseTokenModalProps) {
const screens = Grid.useBreakpoint()
const isMobile = !screens.md
const [check, setCheck] = useState<RockReleaseCheckResult | null>(null)
const [loadingCheck, setLoadingCheck] = useState(false)
const [checkError, setCheckError] = useState('')
const [submitting, setSubmitting] = useState(false)
const [submitError, setSubmitError] = useState('')
const [forceText, setForceText] = useState('')
useEffect(() => {
if (!open || !token) return
let cancelled = false
setCheck(null)
setCheckError('')
setSubmitError('')
setForceText('')
setLoadingCheck(true)
rockApi
.checkReleaseToken(token.id)
.then((res) => {
if (!cancelled) setCheck(res)
})
.catch((e) => {
if (!cancelled) {
setCheckError(e instanceof Error ? e.message : '释放前校验失败')
}
})
.finally(() => {
if (!cancelled) setLoadingCheck(false)
})
return () => {
cancelled = true
}
}, [open, token])
if (!token) return null
const needForce = Boolean(check && !check.can_release)
const forceConfirmed = forceText.trim() === FORCE_CONFIRM_TEXT
const canSubmit =
Boolean(check) && !loadingCheck && !submitting && (!needForce || forceConfirmed)
const handleSubmit = async () => {
if (!canSubmit) return
setSubmitting(true)
setSubmitError('')
try {
const res = await rockApi.releaseToken(
token.id,
needForce
? { force: true, force_confirm_text: forceText.trim() }
: { force: false },
)
message.success(res.message || '已释放回可用库存,该提货链接可以再次分配')
onReleased()
onCancel()
} catch (e) {
setSubmitError(e instanceof Error ? e.message : '释放失败')
} finally {
setSubmitting(false)
}
}
const roleText =
check && (check.role_name || check.role_id)
? `${check.role_name || '未知角色'}(${check.role_id || '-'})`
: ''
return (
<Modal
open={open}
title={`释放回库存 · #${token.id}`}
width={isMobile ? 'calc(100vw - 24px)' : 640}
style={isMobile ? { top: 16 } : undefined}
onCancel={submitting ? undefined : onCancel}
onOk={handleSubmit}
okText={
submitting
? '释放中…'
: needForce
? '确认强制释放'
: '确认释放回库存'
}
cancelText="取消"
okButtonProps={{ danger: needForce, disabled: !canSubmit, loading: submitting }}
confirmLoading={submitting}
destroyOnHidden
>
<Space direction="vertical" size={12} style={{ width: '100%' }}>
<Descriptions
size="small"
column={1}
bordered
items={[
{
key: 'token',
label: '提货链接',
children: (
<Text style={{ fontFamily: 'monospace', fontSize: 12 }}>
#{token.id} / {token.upstream_token_id || '-'} /{' '}
{token.redeem_code || '-'}
</Text>
),
},
{
key: 'order',
label: '关联工单',
children: token.assigned_order_no ? (
<Text code>{token.assigned_order_no}</Text>
) : (
<Text type="secondary">未关联订单</Text>
),
},
{
key: 'status',
label: '本地状态',
children: <Tag color="processing">{rockTokenStatusLabel(token.status)}</Tag>,
},
]}
/>
{loadingCheck && (
<Alert type="info" showIcon message="正在向上游确认该提货链接的实时状态…" />
)}
{checkError && (
<Alert
type="error"
showIcon
icon={<ExclamationCircleOutlined />}
message="释放前校验失败"
description={checkError}
/>
)}
{check?.can_release && (
<Alert
type="success"
showIcon
icon={<SafetyCertificateOutlined />}
message={`上游确认:${rockUpstreamStatusLabel(check.upstream_status)},可以安全释放`}
description={check.message}
/>
)}
{needForce && check && (
<>
<Alert
type="error"
showIcon
icon={<ExclamationCircleOutlined />}
message={`红色警告:${rockUpstreamStatusLabel(check.upstream_status)},不允许直接释放`}
description={
<Space direction="vertical" size={4}>
<span>{check.message}</span>
{roleText && (
<span>
上游绑定角色:<Text strong>{roleText}</Text>
</span>
)}
<span>
继续强制释放会把这条链接放回可用库存,下一单可能分配到同一链接,
导致买家无法正常提货或与已发货订单冲突。请务必确认该订单已退款、
买家不会再使用,并已核实上游卡密可以重新分配。
</span>
</Space>
}
/>
<div>
<Text type="danger">
确认承担上述风险后,请输入 <Text code>{FORCE_CONFIRM_TEXT}</Text> 解锁强制释放:
</Text>
<Input
value={forceText}
onChange={(e) => setForceText(e.target.value)}
placeholder={FORCE_CONFIRM_TEXT}
style={{ marginTop: 6 }}
status="error"
autoComplete="off"
/>
</div>
</>
)}
{!needForce && !checkError && check && (
<Alert
type="warning"
showIcon
message="释放前请确认该订单已退款或不会再履约"
description="释放后原发货页若仍打开,买家再次获取二维码会重新占用一条库存;请同步告知买家不要再操作。"
/>
)}
{submitError && <Alert type="error" showIcon message={submitError} />}
</Space>
</Modal>
)
}
@@ -7,6 +7,8 @@ import { rockApi } from '../../api'
import { generateVoucherDataURL, copyVoucherDataUrlToClipboard } from '../../utils/voucher'
import { formatDateTime } from '../../utils/time'
import { buildTokenColumns } from './tokenColumns'
import { ReleaseTokenModal } from './ReleaseTokenModal'
import { TokenStatusLogDrawer } from './TokenStatusLogDrawer'
import type { UidEditState } from './types'
const { Text } = Typography
@@ -66,6 +68,8 @@ export function RockTokenTable({
}: RockTokenTableProps) {
const [refreshingTokenId, setRefreshingTokenId] = useState<number | null>(null)
const [openingUpstreamId, setOpeningUpstreamId] = useState<number | null>(null)
const [releaseTarget, setReleaseTarget] = useState<RockTokenItem | null>(null)
const [statusLogTarget, setStatusLogTarget] = useState<RockTokenItem | null>(null)
const handleOpenUpstream = async (id: number) => {
// 先同步打开空白页,避免异步请求后 window.open 被浏览器拦截。
@@ -146,18 +150,6 @@ export function RockTokenTable({
}
}
// 买家未扫码绑定时,把占用中的提货链接放回库存
const handleReleaseToken = async (id: number) => {
try {
await rockApi.releaseToken(id)
message.success('已释放回可用库存,该提货链接可以再次分配')
onReloadData()
onReloadTokens()
} catch (e) {
message.error('释放失败: ' + (e instanceof Error ? e.message : '未知错误'))
}
}
// 复制/生成发货凭证图片
const handleCopyVoucher = async (record: RockTokenItem) => {
setCopyingVoucherId(record.id)
@@ -234,7 +226,8 @@ export function RockTokenTable({
onEditUid,
onViewRawData,
onResetToken: handleResetToken,
onReleaseToken: handleReleaseToken,
onReleaseToken: setReleaseTarget,
onViewStatusLogs: setStatusLogTarget,
onUpdateRemark: handleUpdateRemark,
onMarkAbnormal: handleMarkAbnormal,
})
@@ -299,6 +292,22 @@ export function RockTokenTable({
},
}}
/>
<ReleaseTokenModal
open={Boolean(releaseTarget)}
token={releaseTarget}
onCancel={() => setReleaseTarget(null)}
onReleased={() => {
onReloadData()
onReloadTokens()
}}
/>
<TokenStatusLogDrawer
open={Boolean(statusLogTarget)}
token={statusLogTarget}
onClose={() => setStatusLogTarget(null)}
/>
</div>
)
}
@@ -0,0 +1,193 @@
import { useCallback, useEffect, useState } from 'react'
import { Alert, Button, Drawer, Empty, Grid, Space, Spin, Tag, Timeline, Typography } from 'antd'
import { ReloadOutlined } from '@ant-design/icons'
import { rockApi, type RockTokenItem, type RockTokenStatusLog } from '../../api'
import { formatDateTime } from '../../utils/time'
import { rockTokenStatusLabel } from './types'
const { Text, Paragraph } = Typography
export interface TokenStatusLogDrawerProps {
open: boolean
token: RockTokenItem | null
onClose: () => void
}
const EVENT_META: Record<string, { label: string; color: string }> = {
created: { label: '入库', color: 'green' },
status_changed: { label: '状态变更', color: 'blue' },
deleted: { label: '删除', color: 'red' },
restored: { label: '恢复', color: 'orange' },
}
const SOURCE_LABELS: Record<string, string> = {
assign: '分配订单',
bindcheck: '扫码检测',
redeem: '自动发货',
refresh: '刷新上游',
release: '释放回库存',
reset: '人工重置',
manual: '人工更新',
order_cancel: '订单取消',
purchase: '采购入库',
package_sync: '上游包同步',
delete: '删除',
restore: '回收站恢复',
}
function eventLabel(eventType: string): string {
return EVENT_META[eventType]?.label || eventType || '事件'
}
function eventColor(eventType: string): string {
return EVENT_META[eventType]?.color || 'gray'
}
function sourceLabel(source: string): string {
if (!source) return '未知来源'
return SOURCE_LABELS[source] || source
}
function transitionText(log: RockTokenStatusLog): string {
const from = log.from_status
? rockTokenStatusLabel(log.from_status)
: log.event_type === 'restored'
? '回收站'
: '新增'
const to = log.to_status
? rockTokenStatusLabel(log.to_status)
: log.event_type === 'deleted'
? '已删除'
: '—'
return `${from} → ${to}`
}
export function TokenStatusLogDrawer({
open,
token,
onClose,
}: TokenStatusLogDrawerProps) {
const screens = Grid.useBreakpoint()
const isMobile = !screens.md
const [logs, setLogs] = useState<RockTokenStatusLog[]>([])
const [loading, setLoading] = useState(false)
const [error, setError] = useState('')
const load = useCallback(async () => {
if (!token) return
setLoading(true)
setError('')
try {
const res = await rockApi.listTokenStatusLogs(token.id)
setLogs(res.list || [])
} catch (e) {
setError(e instanceof Error ? e.message : '加载状态历史失败')
} finally {
setLoading(false)
}
}, [token])
useEffect(() => {
if (!open || !token) return
setLogs([])
load()
}, [open, token, load])
return (
<Drawer
open={open}
onClose={onClose}
width={isMobile ? '100%' : 600}
title={token ? `状态历史 · #${token.id}` : '状态历史'}
extra={
<Button
size="small"
icon={<ReloadOutlined />}
loading={loading}
onClick={load}
>
刷新
</Button>
}
>
{token && (
<div
style={{
marginBottom: 16,
padding: 10,
borderRadius: 8,
background: '#f8fafc',
border: '1px solid #e2e8f0',
}}
>
<Space direction="vertical" size={2} style={{ width: '100%' }}>
<Text style={{ fontFamily: 'monospace', fontSize: 12 }}>
{token.upstream_token_id || '-'} / {token.redeem_code || '-'}
</Text>
<Text type="secondary" style={{ fontSize: 12 }}>
当前状态:{rockTokenStatusLabel(token.status)}
{token.assigned_order_no ? ` · 工单 ${token.assigned_order_no}` : ''}
</Text>
</Space>
</div>
)}
{error && (
<Alert
type="error"
showIcon
message={error}
style={{ marginBottom: 12 }}
action={
<Button size="small" onClick={load}>
重试
</Button>
}
/>
)}
{loading ? (
<div style={{ padding: '48px 0', textAlign: 'center' }}>
<Spin />
</div>
) : logs.length === 0 ? (
<Empty description="暂无状态历史记录" />
) : (
<Timeline
items={logs.map((log) => ({
key: log.id,
color: eventColor(log.event_type),
children: (
<Space direction="vertical" size={4} style={{ width: '100%' }}>
<Space size={[6, 4]} wrap>
<Tag color={eventColor(log.event_type)}>{eventLabel(log.event_type)}</Tag>
<Text strong style={{ fontSize: 13 }}>
{transitionText(log)}
</Text>
{log.forced && (
<Tag color="red" style={{ fontWeight: 600 }}>
强制
</Tag>
)}
<Tag>{sourceLabel(log.source)}</Tag>
</Space>
{log.reason && (
<Paragraph
type="secondary"
style={{ margin: 0, fontSize: 12, wordBreak: 'break-word' }}
>
{log.reason}
</Paragraph>
)}
<Text type="secondary" style={{ fontSize: 11 }}>
{formatDateTime(log.created_at)} · 操作人{' '}
{log.actor_user_id ? `#${log.actor_user_id}` : '系统/自动'}
</Text>
</Space>
),
}))}
/>
)}
</Drawer>
)
}
@@ -4,6 +4,7 @@ import {
ExportOutlined,
EyeOutlined,
FileTextOutlined,
HistoryOutlined,
StopOutlined,
SyncOutlined,
UndoOutlined,
@@ -88,7 +89,8 @@ export interface TokenColumnHandlers {
onEditUid: (state: UidEditState) => void
onViewRawData: (record: RockTokenItem) => void
onResetToken: (id: number) => void
onReleaseToken: (id: number) => void
onReleaseToken: (record: RockTokenItem) => void
onViewStatusLogs: (record: RockTokenItem) => void
onUpdateRemark: (id: number, remark: string, status?: string) => void
onMarkAbnormal: (id: number, remark?: string) => void
}
@@ -108,6 +110,7 @@ export function buildTokenColumns({
onViewRawData,
onResetToken,
onReleaseToken,
onViewStatusLogs,
onUpdateRemark,
onMarkAbnormal,
}: TokenColumnHandlers): ColumnsType<RockTokenItem> {
@@ -500,9 +503,19 @@ export function buildTokenColumns({
</span>
</Tooltip>
)
const historyButton = (
<Button
size="small"
type="text"
icon={<HistoryOutlined />}
onClick={() => onViewStatusLogs(record)}
>
历史
</Button>
)
if (record.status === 'mismatch') {
return (
<Space direction="vertical" size={4}>
<Space size={4} wrap>
{refreshButton}
{upstreamButton}
<Button
@@ -542,12 +555,13 @@ export function buildTokenColumns({
解冻重置
</Button>
</Popconfirm>
{historyButton}
</Space>
)
}
if (record.status === 'abnormal') {
return (
<Space direction="vertical" size={4}>
<Space size={4} wrap>
<Text type="secondary" style={{ fontSize: 11 }}>已失效作废</Text>
{upstreamButton}
<Popconfirm
@@ -562,42 +576,35 @@ export function buildTokenColumns({
恢复回库存
</Button>
</Popconfirm>
{historyButton}
</Space>
)
}
if (record.status === 'using') {
const canRelease = !record.bound_at && !record.actual_role_id
return (
<Space direction="vertical" size={4}>
<Space size={4} wrap>
{refreshButton}
{upstreamButton}
{canRelease && (
<Popconfirm
title="释放这条未绑定的提货链接?"
description="仅在买家没有扫码绑定时可以释放。系统会先向上游确认;确认未绑定后,链接回到可用库存,可以分给下一单。请先确认该订单已退款。原发货页若仍打开,买家再次获取二维码会重新占用一条库存。"
okText="确认释放"
cancelText="取消"
onConfirm={() => onReleaseToken(record.id)}
>
<Button size="small" icon={<UndoOutlined />}>
释放回库存
</Button>
</Popconfirm>
)}
<Button size="small" icon={<UndoOutlined />} onClick={() => onReleaseToken(record)}>
释放回库存
</Button>
{historyButton}
</Space>
)
}
if (record.status === 'bound') {
return (
<Space direction="vertical" size={4}>
<Space size={4} wrap>
{refreshButton}
{upstreamButton}
{historyButton}
</Space>
)
}
return (
<Space direction="vertical" size={4}>
<Space size={4} wrap>
{upstreamButton}
{historyButton}
</Space>
)
},
+32
View File
@@ -4,3 +4,35 @@ export interface UidEditState {
scanned: string
roleName: string
}
// Token 主状态中文名,状态历史与释放弹窗共用。
export const ROCK_TOKEN_STATUS_LABELS: Record<string, string> = {
available: '可用库存',
using: '扫码使用中',
bound: '已授权绑定',
redeemed: '已交付发货',
mismatch: '绑定错误',
abnormal: '已上报失效',
using_overdue: '使用超时',
bound_overdue: '绑定超时',
}
export function rockTokenStatusLabel(status?: string): string {
if (!status) return '—'
return ROCK_TOKEN_STATUS_LABELS[status] || status
}
// 上游释放校验状态中文名(release-check 返回的 upstream_status)。
export const ROCK_UPSTREAM_STATUS_LABELS: Record<string, string> = {
unbound: '上游未绑定',
bound: '上游已扫码绑定',
redeemed: '上游已发货',
abnormal: '上游已上报失效',
not_found: '上游卡密不存在',
check_failed: '上游状态校验失败',
}
export function rockUpstreamStatusLabel(status?: string): string {
if (!status) return '未知状态'
return ROCK_UPSTREAM_STATUS_LABELS[status] || status
}