@@ -8,7 +8,6 @@ import {
type JdCollectGroupVo ,
} from '@/shared/api/types/modules/jd-collect'
import {
activateJdPublishTask ,
createJdPublishTask ,
deleteJdPublishTask ,
fetchJdPublishDashboard ,
@@ -35,12 +34,9 @@ import NotificationBell from '@/shared/components/NotificationBell.vue'
* 当前登录用户的行),页内翻页、勾选跨页累计;
* 2. 改价规则三档(none/percent/fixed,蓝图 §3 死契约),与勾选集一起进建单体;服务端按
* 同一规则折算 SKU 价(铁律 27a 改价同源);
* 3. 建单成功把服务端下发 的 queuePayload( type=jd-product-publish-run,铁律 32 第三件)原样
* 推进本机客户端队列;激活(PENDING→RUNNING)必须在推队列之前(2026-11-14 采集链真机
* 实录同因);推送失败不回滚建单(兜底拉取认领);
* 3. 网页原样转交建单响应 的 queuePayload;认领只由客户端与后端完成,投递失败仍可由客户端拉取;
* 4. 进度只读服务端:行级四档计数来自发布明细表聚合,total 缺失时只报已发布行数,不编造百分比;
* 5. 失败/中断「重试/继续」走通用原位复位(铁律 26,不克隆),推送载荷从历史行的建单载荷
* (分类 id+改价规则)同源重建——与建单响应 queuePayload 同键同形状;
* 5. 失败/中断「重试/继续」走通用原位复位(铁律 26,不克隆),新一轮由客户端拉取认领;
* 6. 京麦未登录等凭据致命失败(铁律 31):服务端整单判死后 useLiveTaskBoard 经
* reportCredentialFatal 弹一次窗(credential-fatal 同形接入,AC-5 用户端半边;弹窗组件
* 挂 App.vue,本页无需重复挂)。
@@ -85,8 +81,22 @@ const productTotal = ref(0)
const productPage = ref ( 1 )
const productsLoading = ref ( false )
const selectedProducts = ref ( new Map < number , JdPublishProductVo > ( ) )
let productRequest = 0
const selectedProductIds = computed ( ( ) => Array . from ( selectedProducts . value . keys ( ) ) )
const wholePageSelected = computed ( ( ) => products . value . length > 0
&& products . value . every ( ( row ) => selectedProducts . value . has ( row . id ) ) )
const partOfPageSelected = computed ( ( ) => ! wholePageSelected . value
&& products . value . some ( ( row ) => selectedProducts . value . has ( row . id ) ) )
function togglePage ( checked : boolean ) {
const next = new Map ( selectedProducts . value )
for ( const row of products . value ) {
if ( checked ) next . set ( row . id , row )
else next . delete ( row . id )
}
selectedProducts . value = next
}
function toggleProduct ( row : JdPublishProductVo , checked : boolean ) {
const next = new Map ( selectedProducts . value )
@@ -100,18 +110,35 @@ function clearSelection() {
}
async function loadProducts ( ) {
const request = ++ productRequest
products . value = [ ]
if ( selectedGroupId . value == null ) {
productTotal . value = 0
productsLoading . value = false
return
}
productsLoading . value = true
try {
const vo = await fetchJdPublishProducts ( selectedGroupId . value , productPage . value , PRODUCT _PAGE _SIZE )
if ( request !== productRequest ) return
products . value = vo . items ? ? [ ]
productTotal . value = vo . total ? ? 0
} catch ( err ) {
errorMessage . value = err instanceof Error ? err . message : '商品列表拉取失败,请稍后重试'
if ( request === productRequest ) {
errorMessage . value = err instanceof Error ? err . message : '商品列表拉取失败,请稍后重试'
}
} finally {
productsLoading . value = false
if ( request === productRequest ) productsLoading . value = false
}
}
function changeGroup ( ) {
productPage . value = 1
productTotal . value = 0
clearSelection ( )
void loadProducts ( )
}
function changePage ( page : number ) {
productPage . value = page
void loadProducts ( )
@@ -134,12 +161,54 @@ const submitDisabled = computed(() =>
|| ! selectedProducts . value . size
|| priceValueMissing . value )
// 重试回执不带代数:旧代 + 1 只用作读侧下限,不生成任务或队列数据。
const retryAttemptFloor = new Map < number , number > ( )
const awaitingRetryProgress = new Set < number > ( )
const retryingTaskIds = ref ( new Set < number > ( ) )
function acceptsAttempt ( taskId : number | undefined , attempt : number | undefined ) {
const floor = taskId == null ? undefined : retryAttemptFloor . get ( taskId )
return floor == null || ( attempt != null && attempt >= floor )
}
async function fetchCurrentHistory ( ) : ReturnType < typeof fetchJdPublishHistory > {
const history = await fetchJdPublishHistory ( )
return {
... history ,
items : history . items . flatMap ( ( item ) : JdPublishHistoryItemVo [ ] => {
if ( acceptsAttempt ( item . taskId , item . resumeAttempt ) ) return [ item ]
const current = board . historyItems . value . find ( ( row ) => row . taskId === item . taskId )
return current && acceptsAttempt ( current . taskId , current . resumeAttempt ) ? [ current ] : [ ]
} ) ,
}
}
async function fetchCurrentProgress ( taskIds : number [ ] , { force } : { force : boolean } ) {
const floorsAtRequest = new Map ( taskIds . map ( ( id ) => [ id , retryAttemptFloor . get ( id ) ] ) )
const unchanged = ( id : number ) => ! retryingTaskIds . value . has ( id )
&& retryAttemptFloor . get ( id ) === floorsAtRequest . get ( id )
const batch = await fetchJdPublishTaskProgressBatch ( taskIds , {
force : force || taskIds . some ( ( id ) => awaitingRetryProgress . has ( id ) ) ,
} )
return {
... batch ,
items : batch . items . filter ( ( { task , items } ) => {
if ( task ? . id == null || ! unchanged ( task . id ) || ! acceptsAttempt ( task . id , task . resumeAttempt ) ) return false
const row = items ? . [ 0 ]
if ( row && ! acceptsAttempt ( task . id , row . resumeAttempt ) ) return false
awaitingRetryProgress . delete ( task . id )
return true
} ) ,
missingTaskIds : batch . missingTaskIds . filter ( unchanged ) ,
}
}
// ---- 实时任务面板(照 JdCollectTab 的 useLiveTaskBoard 形状;京东发布无结果文件,无下载层)----
const board = useLiveTaskBoard < JdPublishHistoryItemVo > ( {
scope : 'jd-publish' ,
pollingStorageKey : ( ) => ` jd-publish:tasks: ${ uidForStorage ( ) } ` ,
fetchHistory : fetchJdPublishHistory ,
fetchProgressBatch : fetchJdPublishTaskProgressBatch ,
fetchHistory : fetchCurrentHistory ,
fetchProgressBatch : fetchCurrentProgress ,
fetchDashboard : fetchJdPublishDashboard ,
normalizeTaskStatus ,
// 京东发布没有结果文件:状态到终态即结束,没有「等文件」那一层
@@ -291,25 +360,23 @@ async function interruptTaskRecord(item: JdPublishHistoryItemVo | null | undefin
async function retryTaskRecord ( item : JdPublishHistoryItemVo | null | undefined ) {
const taskId = item ? . taskId
if ( ! taskId ) return
if ( ! taskId || retryingTaskIds . value . has ( taskId ) ) return
const isResume = normalizeTaskStatus ( item ) === 'CANCELLED'
try {
await retryClientTask ( taskId )
ElMessage . success ( isResume
? '已继续:在这条任务上接着跑(已成功的商品不会重复发布)'
: '已提交重试:在这条任务上继续跑(不新建任务)' )
// 复位是 PENDING:与建单同一条激活+推队列链路,客户端才会立刻领到这一单。
const activateError = await activateTask ( taskId )
if ( ! activateError ) {
const priceRule = item ? . priceRule && item . priceRule . mode ? item . priceRule : { mode : 'none' }
// 推送载荷从历史行的建单载荷同源重建(与建单响应 queuePayload 同键:type/taskId/priceRule)。
await pushToClientQueue ( { type : 'jd-product-publish-run' , data : { taskId , priceRule } } )
}
board . addPollingTask ( taskId )
await refreshBoard ( )
} catch ( error ) {
retryingTaskIds . value . add ( taskId )
const retried = await retryClientTask ( taskId ) . then ( ( ) => true , ( error : unknown ) => {
ElMessage . error ( error instanceof Error ? error . message : '重试失败' )
}
return false
} )
retryingTaskIds . value . delete ( taskId )
if ( ! retried ) return
retryAttemptFloor . set ( taskId , ( item . resumeAttempt ? ? 0 ) + 1 )
awaitingRetryProgress . add ( taskId )
board . removePollingTask ( taskId )
board . historyItems . value = board . historyItems . value . filter ( ( row ) => row . taskId !== taskId )
board . addPollingTask ( taskId )
ElMessage . success ( isResume ? '已提交继续,等待本机客户端领取' : '已提交原任务重试,等待本机客户端领取' )
await refreshBoard ( ) . catch ( ( error ) => console . error ( '[jd-publish] 重试后刷新任务失败' , error ) )
}
/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度 */
@@ -321,38 +388,21 @@ async function refreshBoard() {
] )
}
/** 激活任务(PENDING→RUNNING),返回 null 表示可推队列,返回 string 表示失败原因。
* 漏掉这一步,客户端第一个回传会被「任务不在运行中(PENDING)」拒收(采集链真机实录同因)。 */
async function activateTask ( id : number ) : Promise < string | null > {
try {
await activateJdPublishTask ( id )
return null
} catch ( err ) {
const text = err instanceof Error ? err . message : ''
// 客户端兜底拉取已原子认领(PENDING→RUNNING)时后端回这句:等同激活成功,不当失败展示。
if ( text . includes ( '已在执行中' ) ) {
return null
}
console . error ( '[jd-publish] 激活任务失败' , err )
return '任务激活失败,本机客户端领不到这一单,请稍后重试'
}
}
const WAIT _FOR _CLIENT = '任务已创建,等待本机客户端领取。请保持客户端在线。'
/** 推送本机队列:建单路径传服务端下发的 queuePayload(页面不拼载荷),重试路径按同键形状重建后传入。 */
async function pushToClientQueue ( payload : Record < string , unknown > ) : Promise < string | null > {
async function pushToClientQueue ( payload : Record < string , unknown > | undefined ) : Promise < string | null > {
if ( ! payload ) return WAIT _FOR _CLIENT
const api = getPywebviewApi ( )
if ( ! api ? . enqueue _json ) {
return '当前环境未启用任务队列能力(浏览器预览环境不会启动),请在本机客户端中打开本页 '
return '任务已创建,等待本机客户端领取。请打开本机客户端并登录同一账号。 '
}
const pushResult = await api . enqueue _json ( payload )
if ( pushResult ? . success ) {
const result = await api . enqueue _json ( payload ) . catch ( ( error ) => {
console . error ( '[jd-publish] 推送本机队列失败' , error )
return null
}
// 桥返回的 error 原文(系统/英文)不透传进界面:console 留链,界面固定中文动作句
if ( pushResult ? . error ) {
console . error ( '[jd-publish] enqueue_json 被拒' , pushResult . error )
}
return '推送本机队列失败,任务将由客户端兜底拉取认领'
} )
if ( result ? . success ) return null
if ( result ? . error ) console . error ( '[jd-publish] enqueue_json 被拒' , result . error )
return '任务已创建,但未能推送到本机队列。请保持客户端在线,客户端会自动领取。'
}
const isRunning = computed ( ( ) => Boolean ( board . dashboard . value . pendingTaskCount ) || submitting . value )
@@ -378,29 +428,11 @@ async function startPublish() {
const productIds = selectedProductIds . value
const vo = await createJdPublishTask ( categoryId , productIds , priceRule )
board . addPollingTask ( vo . taskId )
let pushNote = ''
const activateError = await activateTask ( vo . taskId )
if ( activateError ) {
// 没激活成功就不推队列:推了也是白跑一轮。任务留在 PENDING,
// 由服务端兜底拉取认领后照样会跑,所以这里只提示、不回滚建单。
pushNote = activateError
} else {
try {
// 建单响应自带 queuePayload(服务端组装,铁律 32 第三件),页面原样投递。
const pushError = await pushToClientQueue ( vo . queuePayload
? ? { type : 'jd-product-publish-run' , data : { taskId : vo . taskId , priceRule } } )
if ( pushError ) pushNote = pushError
} catch ( pushErr ) {
pushNote = '推送本机队列失败,任务将由服务端兜底派发给本机客户端执行'
console . error ( '[jd-publish] 推送本机队列失败' , pushErr )
}
}
if ( pushNote ) {
errorMessage . value = pushNote
} else {
successMessage . value = ` 任务已创建( ${ productIds . length } 个商品)并推送给本机客户端,进度显示在右侧任务区 `
}
const pushNote = await pushToClientQueue ( vo . queuePayload )
successMessage . value = pushNote
? ? ` 任务已创建( ${ productIds . length } 个商品)并送入本机队列,等待客户端领取。 `
await Promise . all ( [ board . loadDashboard ( ) , board . loadHistory ( { force : true } ) ] )
. catch ( ( error ) => console . error ( '[jd-publish] 建单后刷新任务失败' , error ) )
} catch ( err ) {
errorMessage . value = err instanceof Error ? err . message : '建单失败,请稍后重试'
} finally {
@@ -458,7 +490,7 @@ onUnmounted(() => {
< div class = "category-block" >
< span class = "category-label" > 自定义分类 < / span >
< el-select v-model = "selectedGroupId" placeholder="选择分类" class="shop-cat-select"
:loading = "groupsLoading" @change ="() => { productPage = 1; clearSelection(); void loadProducts() } " >
:loading = "groupsLoading" @change ="changeGroup " >
< el -option v-for = "group in groupOptions" :key="group.id"
: label = "`${group.name}( ${group.productCount ?? 0} 个商品)`" :value = "group.id" / >
< / el-select >
@@ -468,6 +500,12 @@ onUnmounted(() => {
< div class = "product-block" v-loading = "productsLoading" >
< div class = "product-head" >
< span class = "category-label" > 选择商品 ( 已选 { { selectedProducts . size } } 个 , 跨页累计 ) < / span >
< label v-if = "products.length" class="category-hint" >
< input type = "checkbox" class = "product-select-page" :checked = "wholePageSelected"
:indeterminate.prop = "partOfPageSelected"
@change ="togglePage(($event.target as HTMLInputElement).checked)" / >
全选本页
< / label >
< button v-if = "selectedProducts.size" class="shop-cat-clear" type="button"
@click ="clearSelection" > 清空勾选 < / button >
< / div >