feat(fulfillment): 增加统一结算与多渠道人工履约

This commit is contained in:
yml2213
2026-11-05 16:14:56 +08:00
parent 548070c2ad
commit 4e83dbb84c
43 changed files with 1582 additions and 334 deletions
@@ -68,6 +68,7 @@ const CHANNEL_OPTIONS = [
{ value: 'affiliate_dash', label: '自动发货' },
{ value: 'third_party_voucher', label: '第三方卡券' },
{ value: 'manual', label: '人工客服' },
{ value: 'on_account', label: '统一结算' },
]
const CHANNEL_COLOR: Record<string, string> = {
@@ -75,6 +76,7 @@ const CHANNEL_COLOR: Record<string, string> = {
affiliate_dash: 'green',
third_party_voucher: 'purple',
manual: 'orange',
on_account: 'gold',
}
const CHANNEL_SOURCE_LABEL: Record<string, string> = {
@@ -133,6 +135,7 @@ function PendingPanel() {
const [page, setPage] = useState(1)
const [pageSize, setPageSize] = useState(ADMIN_DEFAULT_PAGE_SIZE)
const [selections, setSelections] = useState<Record<string, string>>({})
const [internalSkuDrafts, setInternalSkuDrafts] = useState<Record<string, string>>({})
const query = useQuery({
queryKey: ['fulfillment-pending', keyword, page, pageSize],
@@ -142,16 +145,26 @@ function PendingPanel() {
const assignMutation = useMutation({
mutationFn: (row: PendingChannelGroup) =>
assignChannelByInternalSku({
internalSku: row.internal_sku,
groupKey: row.group_key,
internalSku: row.internal_sku || '',
mappedInternalSku: row.internal_sku
? ''
: String(internalSkuDrafts[rowKey(row)] || '').trim(),
channel: selections[rowKey(row)] || '',
}),
onSuccess: (result) => {
const productMessage = result.data.draftProductId ? '和标准商品' : ''
if (result.data.carrierFailed > 0) {
const firstFailure = result.data.carrierFailures?.[0]
message.warning(
`已指定 ${result.data.updated} 个订单项,${result.data.carrierFailed} 个因载体创建失败仍待处理`,
`渠道${productMessage}已保存,${result.data.carrierFailed} 个订单项仍待补配置${
firstFailure?.message ? `:${firstFailure.message}` : ''
}`,
)
} else {
message.success(`已指定 ${result.data.updated} 个订单项`)
message.success(
`已指定 ${result.data.updated} 个订单项${productMessage ? `并创建${productMessage.slice(1)}` : ''}`,
)
}
void queryClient.invalidateQueries({ queryKey: ['fulfillment-pending'] })
},
@@ -183,7 +196,7 @@ function PendingPanel() {
const retryCarrierMutation = useMutation({
mutationFn: (row: PendingChannelGroup) =>
retryPendingCarriers({ internalSku: row.internal_sku }),
retryPendingCarriers({ internalSku: row.internal_sku || '' }),
onSuccess: (result) => {
const data = result.data
const detail = [
@@ -205,11 +218,11 @@ function PendingPanel() {
const deleteMutation = useMutation({
mutationFn: (row: PendingChannelGroup) =>
deletePendingChannelGroup({ internalSku: row.internal_sku }),
deletePendingChannelGroup({ groupKey: row.group_key }),
onSuccess: (result) => {
const data = result.data
message.success(
`已删除 ${data.archivedItems} 个待分类订单项,原始订单保留;财务事实已重算 ${data.refreshedDays} 天`,
`已忽略归档 ${data.archivedItems} 个待分类订单项,原始订单保留;财务事实已重算 ${data.refreshedDays} 天`,
)
void queryClient.invalidateQueries({ queryKey: ['fulfillment-pending'] })
void queryClient.invalidateQueries({ queryKey: ['fulfillment-exceptions'] })
@@ -261,9 +274,23 @@ function PendingPanel() {
title: '内部SKU',
dataIndex: 'internal_sku',
width: 220,
render: (value: string, row: PendingChannelGroup) => (
<Space direction="vertical" size={2}>
<Typography.Text delete={!value}>{value || '未识别内部 SKU'}</Typography.Text>
render: (value: string | null, row: PendingChannelGroup) => (
<Space direction="vertical" size={4}>
{value ? (
<Typography.Text>{value}</Typography.Text>
) : (
<Input
size="small"
placeholder="填写内部 SKU"
value={internalSkuDrafts[rowKey(row)] || ''}
onChange={(event) =>
setInternalSkuDrafts((current) => ({
...current,
[rowKey(row)]: event.target.value,
}))
}
/>
)}
{row.configured_channels?.length ? (
<Space size={2} wrap>
{row.configured_channels.map((channel) => (
@@ -345,7 +372,9 @@ function PendingPanel() {
<Select
size="small"
style={{ width: 180 }}
placeholder="选择渠道"
placeholder={
row.internal_sku || internalSkuDrafts[rowKey(row)] ? '选择渠道' : '先补内部 SKU'
}
options={CHANNEL_OPTIONS}
value={selections[rowKey(row)]}
onChange={(value) => setSelections((prev) => ({ ...prev, [rowKey(row)]: value }))}
@@ -353,11 +382,14 @@ function PendingPanel() {
<Button
size="small"
type="primary"
disabled={!selections[rowKey(row)]}
disabled={
(!row.internal_sku && !String(internalSkuDrafts[rowKey(row)] || '').trim()) ||
!selections[rowKey(row)]
}
loading={assignMutation.isPending}
onClick={() => assignMutation.mutate(row)}
>
指定
保存渠道
</Button>
{row.configured_channels?.length ? (
<Tooltip title="重新确认渠道并补建工单或自动发货任务">
@@ -371,26 +403,26 @@ function PendingPanel() {
</Button>
</Tooltip>
) : null}
<Tooltip title="删除待分类记录,不删除原始订单">
<Tooltip title="从待办中忽略并归档,不删除原始订单">
<Button
danger
icon={<DeleteOutlined />}
loading={deleteMutation.isPending}
onClick={() =>
Modal.confirm({
title: '删除待分类记录',
title: '忽略并归档待分类记录',
content: (
<div>
<p>
将归档 <strong>{row.item_count}</strong> 个订单项,并清除已生成的成本快照、
分类异常,重算对应销售事实与总账。
将从待办中归档 <strong>{row.item_count}</strong> 个订单项,并清除已生成的
派生成本快照、分类异常;可重建的财务事实会按开放期间重算。
</p>
<p style={{ marginBottom: 0 }}>
原始订单和订单商品不会被删除;已关账期间禁止删除。
原始订单和订单商品不会删除;已关账期间只跳过重算,不再阻止归档。
</p>
</div>
),
okText: '确认删除',
okText: '确认归档',
okButtonProps: { danger: true },
cancelText: '取消',
onOk: () => deleteMutation.mutateAsync(row),
@@ -441,7 +473,7 @@ function PendingPanel() {
type="warning"
showIcon
style={{ marginBottom: 12 }}
message="删除只会归档对应订单项并清理财务成本记录,不会删除原始订单。配置错误优先修正模板/映射后重试匹配;确认无需履约或核算时,可直接删除。"
message="指定渠道会先保存渠道和草稿标准商品;载体或成本未配置时会继续留在队列中。忽略归档只影响派生流程,不删除原始订单。"
/>
<PercentTable
rowKey={(row) => rowKey(row)}
@@ -1196,7 +1228,7 @@ function PipelinesPanel() {
}
function rowKey(row: PendingChannelGroup) {
return row.internal_sku
return row.group_key
}
function formatCarrierParams(row: ChannelRule) {