merge: 合并 main 并保留寄卖内部匹配与客户退款

This commit is contained in:
2026-11-05 18:02:47 +08:00
105 changed files with 7248 additions and 665 deletions
@@ -237,6 +237,10 @@ export type WorkOrderVoucherConsumeResult = {
failedCount: number
voucherCodes: string[]
errorMessage: string
queuedCount: number
jobIds: number[]
dueAt: string
status: 'queued' | 'already_scheduled' | 'skipped' | 'failed'
}
export function fulfillWorkOrderWithConsignment(payload: {
@@ -378,8 +378,11 @@ export function scanAdminManualSkus(payload: { fromDate: string; toDate: string
export function saveAdminManualConfig(payload: {
skuKey: string
platformKey: string
creditQuantity: number
channels: Array<{
platformKey: string
creditQuantity: number
enabled?: boolean
}>
canonicalProductId?: number | null
enabled?: boolean
note?: string
@@ -493,6 +496,7 @@ export function fetchAdminManualFulfillmentPending(
export function confirmAdminManualFulfillment(payload: {
orderItemId: number
platformKey: string
costFen?: number
payeeName?: string
note?: string
@@ -2,13 +2,18 @@ import { apiDelete, apiGet, apiPost } from '@/lib/http'
/** 待分类队列(按内部 SKU 聚合)。 */
export type PendingChannelGroup = {
internal_sku: string
group_key: string
scope_type: 'internal_sku' | 'source_sku'
internal_sku: string | null
sku_name: string
providers: string[]
shop_ids: string[]
shops: Array<{ id: string; name: string }>
sku_codes: string[]
pending_reasons: string[]
pending_subreasons: string[]
configured_channels: string[]
locked_item_count: number
item_count: number
revenue_fen: number
first_seen_at: string
@@ -27,7 +32,7 @@ export type ChannelRule = {
id: number
match_key_type: 'internal_sku'
match_key: string
channel: 'work_order' | 'affiliate_dash' | 'third_party_voucher' | 'manual'
channel: 'work_order' | 'affiliate_dash' | 'third_party_voucher' | 'manual' | 'on_account'
priority: number
enabled: boolean
is_fallback: boolean
@@ -100,6 +105,15 @@ export type PendingWorkOrderRetryResult = {
skipReasons: Record<string, number>
}
export type PendingCarrierRetryResult = {
scanned: number
workOrdersCreated: number
affiliateTasksCreated: number
assigned: number
failed: number
remaining: number
}
export type DeletePendingChannelGroupResult = {
archivedItems: number
preservedOrders: number
@@ -128,6 +142,67 @@ export type FinancePipelineStatus = {
} | null
}
export type VoucherConsumeProvider = 'kuaishou_industry' | 'douyin_mashida'
export type VoucherConsumeChannel =
| 'affiliate_dash'
| 'work_order'
| 'manual'
| 'on_account'
| 'third_party_voucher'
export type VoucherConsumeMode =
| 'manual'
| 'after_order_received'
| 'after_link_generated'
| 'after_task_created'
| 'after_work_order_published'
| 'after_work_order_assigned'
| 'after_work_order_published_or_assigned'
export type VoucherChannelConsumePolicy = {
enabled: boolean
mode: VoucherConsumeMode
delaySeconds: number
}
export type VoucherConsumePolicy = {
version: number
enabled: boolean
platforms: Record<
VoucherConsumeProvider,
{
enabled: boolean
channels: Record<VoucherConsumeChannel, VoucherChannelConsumePolicy>
}
>
}
export type VoucherConsumeJob = {
id: number
provider: VoucherConsumeProvider
channel: VoucherConsumeChannel
trigger_event: string
platform_order_id: string
order_id: number | null
order_item_id: number | null
task_id: number | null
work_order_id: number | null
due_at: string
status: 'pending' | 'processing' | 'succeeded' | 'failed' | 'cancelled'
attempt_count: number
max_attempts: number
last_error: string
created_at: string
updated_at: string
finished_at: string | null
}
export type VoucherConsumeJobListResult = {
items: VoucherConsumeJob[]
total: number
page: number
pageSize: number
}
export function fetchPendingChannelGroups(
params: {
page?: number
@@ -138,6 +213,30 @@ export function fetchPendingChannelGroups(
return apiGet<PendingChannelGroupListResult>('/api/v1/admin/fulfillment/pending', params)
}
export function fetchVoucherConsumePolicy() {
return apiGet<VoucherConsumePolicy>('/api/v1/admin/fulfillment/voucher-consume-policy')
}
export function saveVoucherConsumePolicy(payload: VoucherConsumePolicy) {
return apiPost<VoucherConsumePolicy>('/api/v1/admin/fulfillment/voucher-consume-policy', payload)
}
export function fetchVoucherConsumeJobs(
params: { status?: string; page?: number; pageSize?: number } = {},
) {
return apiGet<VoucherConsumeJobListResult>(
'/api/v1/admin/fulfillment/voucher-consume-jobs',
params,
)
}
export function retryVoucherConsumeJob(id: number) {
return apiPost<VoucherConsumeJob | null>(
`/api/v1/admin/fulfillment/voucher-consume-jobs/${id}/retry`,
{},
)
}
export function fetchChannelExceptions(
params: {
reason?: string
@@ -158,7 +257,14 @@ export function retryPendingWorkOrderRouting(
)
}
export function deletePendingChannelGroup(payload: { internalSku: string }) {
export function retryPendingCarriers(payload: { internalSku: string }) {
return apiPost<PendingCarrierRetryResult>(
'/api/v1/admin/fulfillment/pending/retry-carriers',
payload,
)
}
export function deletePendingChannelGroup(payload: { groupKey: string }) {
return apiPost<DeletePendingChannelGroupResult>(
'/api/v1/admin/fulfillment/pending/delete',
payload,
@@ -166,14 +272,20 @@ export function deletePendingChannelGroup(payload: { internalSku: string }) {
}
export function assignChannelByInternalSku(payload: {
groupKey?: string
internalSku: string
mappedInternalSku?: string
channel: string
note?: string
}) {
return apiPost<{ updated: number; carrierFailed: number; ruleCreated: boolean }>(
'/api/v1/admin/fulfillment/assign',
payload,
)
return apiPost<{
updated: number
carrierFailed: number
ruleCreated: boolean
channelSaved: boolean
draftProductId: number | null
carrierFailures: Array<{ orderItemId: number; reason: string; message: string }>
}>('/api/v1/admin/fulfillment/assign', payload)
}
export function assignChannelToItems(payload: {
@@ -46,10 +46,32 @@ type WorkOrderVoucherConsumeResult = {
failedCount: number
voucherCodes: string[]
errorMessage: string
queuedCount: number
jobIds: number[]
dueAt: string
status: 'queued' | 'already_scheduled' | 'skipped' | 'failed'
}
export type AdminLeaderboardPeriod = 'all' | 'daily' | 'weekly' | 'monthly'
export type CustomerRefundPreview = {
workOrderId: number
orderId: number
provider: string
platform: string
platformOrderId: string
workOrderStatus: string
remainingFen: number
itemCount: number
workOrderCount: number
externalAfterSaleId: string
platformUpdateTime: string
platformAmountFen: number
platformState: string
canExecute: boolean
notes: string[]
}
export type AdminWorkerLeaderboardEntry = {
rank: number
workerId: number
@@ -851,6 +873,29 @@ export function deleteAdminWorkOrder(workOrderId: number) {
return apiDelete<{ deleted: boolean }>(`/api/v1/admin/worker-platform/orders/${workOrderId}`)
}
export function previewAdminCustomerRefund(workOrderId: number) {
return apiPost<CustomerRefundPreview>(
`/api/v1/admin/worker-platform/orders/${workOrderId}/customer-refund/preview`,
)
}
export function executeAdminCustomerRefund(
workOrderId: number,
payload: { reason: string; note?: string },
) {
return apiPost<{
idempotent: boolean
operationId: number
localRefundRecorded?: boolean
workOrderId?: number
orderId?: number
cancelledWorkOrders?: number
cancelledShares?: number
releasedDepositFen?: number
closedTaskCount?: number
}>(`/api/v1/admin/worker-platform/orders/${workOrderId}/customer-refund`, payload)
}
export function unpublishAdminWorkOrder(workOrderId: number) {
return apiPost<{ order: WorkOrder }>(
`/api/v1/admin/worker-platform/orders/${workOrderId}/unpublish`,