diff --git a/backend/app/service/externalSendSync.js b/backend/app/service/externalSendSync.js index 523a903..26b7e21 100644 --- a/backend/app/service/externalSendSync.js +++ b/backend/app/service/externalSendSync.js @@ -629,13 +629,16 @@ class ExternalSendSyncService extends Service { * 批量重试同步(人工处理异常单) * * 把状态重置为「待同步」并把次数清零,随后立刻跑一批,避免等定时任务。 + * 与定时任务同样逐单留间隔(平台会把高频请求判成刷单),超过 `limit` 的部分保持「待同步」, + * 下一轮定时任务会接着处理,不会丢。 * @param {Object} p 参数 * @param {number[]} [p.ids] 指定订单ID;为空时按状态筛选 * @param {number} [p.principalId] 主体ID * @param {number[]} [p.statuses] 状态筛选(默认异常 + 待重试) - * @return {Promise} { reset, result } + * @param {number} [p.limit] 本次立刻同步的上限 + * @return {Promise} { reset, synced, success, failed, remaining } */ - async retry({ ids, principalId, statuses = [ SEND_STATUS.EXCEPTION, SEND_STATUS.RETRY ] } = {}) { + async retry({ ids, principalId, statuses = [ SEND_STATUS.EXCEPTION, SEND_STATUS.RETRY ], limit = 200 } = {}) { const { ctx } = this; const Op = ctx.app.Sequelize.Op; const idList = (Array.isArray(ids) ? ids : []).map(Number).filter(Boolean); @@ -652,14 +655,16 @@ class ExternalSendSyncService extends Service { }); } + const batch = rows.slice(0, Math.max(0, Number(limit) || 0)); let success = 0; let failed = 0; - for (const row of rows) { - const result = await this.syncOrder(row, { trigger: 'manual' }); + for (let index = 0; index < batch.length; index += 1) { + if (index > 0) await sleep(SEND_INTERVAL_MS); + const result = await this.syncOrder(batch[index], { trigger: 'manual' }); if (result.ok) success += 1; else failed += 1; } - return { reset: rows.length, success, failed }; + return { reset: rows.length, synced: batch.length, success, failed, remaining: rows.length - batch.length }; } } diff --git a/frontend/src/api/externalSendSync.ts b/frontend/src/api/externalSendSync.ts index 592a818..af7d7b4 100644 --- a/frontend/src/api/externalSendSync.ts +++ b/frontend/src/api/externalSendSync.ts @@ -19,8 +19,12 @@ export interface ExternalSendCounts { /** 批量重试结果 */ export interface ExternalSendRetryResult { reset: number + /** 本次立刻同步的条数(其余排入待同步,由定时任务续跑) */ + synced: number success: number failed: number + /** 超出单次上限、留给定时任务的条数 */ + remaining: number } /** 同步状态枚举(与后端 SEND_STATUS 对齐) */ diff --git a/frontend/src/views/Order/StatusPanel.vue b/frontend/src/views/Order/StatusPanel.vue index 3157422..0401d9b 100644 --- a/frontend/src/views/Order/StatusPanel.vue +++ b/frontend/src/views/Order/StatusPanel.vue @@ -476,7 +476,8 @@ async function handleBatch(key: BatchKey) { }) const res = await retryExternalSend(ids) const result = res.data.data - ElMessage.success(`已重置 ${result.reset} 条:同步成功 ${result.success},失败 ${result.failed}(失败会自动重试,满 3 次转异常)`) + const rest = result.remaining ? `,另有 ${result.remaining} 条已排入待同步、由定时任务续跑` : '' + ElMessage.success(`已重置 ${result.reset} 条:本次同步 ${result.synced} 条,成功 ${result.success},失败 ${result.failed}${rest}`) selectedIds.value = [] await fetchList() await fetchExternalSendCounts()