diff --git a/backend/app/contract/index.js b/backend/app/contract/index.js index 8f3259d..a4e25ab 100644 --- a/backend/app/contract/index.js +++ b/backend/app/contract/index.js @@ -1209,7 +1209,8 @@ module.exports = { principal_id: { type: 'integer', required: true, description: '所属主体ID,由请求拦截器注入' }, start_time: { type: 'string', description: '平台下单时间起(yyyy-MM-dd HH:mm:ss),与 days 二选一' }, end_time: { type: 'string', description: '平台下单时间止,默认当前时间' }, - days: { type: 'integer', description: '未传 start_time 时按最近 N 天拉取,默认 1' }, + days: { type: 'integer', description: '未传 start_time 时按最近 N 天拉取(滚动窗口),默认 1;传 0 表示不限下单时间(全部待处理)' }, + all: { type: 'boolean', description: 'true 等价于 days=0:不限下单时间,拉取店铺全部未发货订单' }, }, externalPrintShopOrderSyncResult: { start_time: { type: 'string', description: '本次拉取的下单时间起' }, diff --git a/backend/app/controller/externalPrintAccount.js b/backend/app/controller/externalPrintAccount.js index 3c9b1e1..7c71b8c 100644 --- a/backend/app/controller/externalPrintAccount.js +++ b/backend/app/controller/externalPrintAccount.js @@ -679,13 +679,18 @@ class ExternalPrintAccountController extends Controller { } const body = ctx.request.body || {}; - const days = Math.max(1, Number(body.days) || 1); + const days = Number(body.days); + // days = 0(或 all=true)表示「全部待处理」:不限下单时间,由服务端按平台发货状态过滤, + // 用于把店铺历史上积压的未发货订单一次性拉进来 + const allPending = body.all === true || days === 0; const endTime = body.end_time ? new Date(body.end_time) : new Date(); // 「最近 N 天」按滚动时间窗计算(此刻往前 N×24 小时), // 不用「今天 00:00」对齐:凌晨拉单会只覆盖当天几小时,导致明明有待处理订单却提示 0 单 const startTime = body.start_time ? new Date(body.start_time) - : new Date(endTime.getTime() - days * 86400000); + : allPending + ? new Date('2018-01-01T00:00:00+08:00') + : new Date(endTime.getTime() - Math.max(1, days || 1) * 86400000); if (Number.isNaN(startTime.getTime()) || Number.isNaN(endTime.getTime())) { ctx.status = 400; ctx.body = { code: 400, message: '时间格式不正确' }; diff --git a/backend/app/lib/printPlatform/dgj.js b/backend/app/lib/printPlatform/dgj.js index 7b3d528..b5030da 100644 --- a/backend/app/lib/printPlatform/dgj.js +++ b/backend/app/lib/printPlatform/dgj.js @@ -982,7 +982,9 @@ class DgjService extends PrintPlatformService { */ async fetchOrderPages(host, { traceId, dbname, startTime, endTime }) { const rows = []; - let pageCount = 1; + // 平台不保证返回 PageCount(实测多为 null),因此以 Total 和「本页是否满页」判断结束, + // 只依赖 PageCount 会在超过 500 条时静默截断 + let total = Infinity; for (let pageIndex = 1; pageIndex <= ORDER_MAX_PAGES; pageIndex++) { const page = await this.fetchOrderPage(host, { @@ -992,9 +994,11 @@ class DgjService extends PrintPlatformService { endTime, pageIndex, }); + if (!page.rows.length) break; rows.push(...page.rows); - pageCount = page.pageCount || pageCount; - if (page.rows.length < ORDER_PAGE_SIZE || pageIndex >= pageCount) break; + if (Number(page.total) > 0) total = Number(page.total); + if (rows.length >= total) break; + if (page.rows.length < ORDER_PAGE_SIZE) break; } return rows; diff --git a/backend/app/service/externalPrintOrder.js b/backend/app/service/externalPrintOrder.js index 69532d2..1750e0f 100644 --- a/backend/app/service/externalPrintOrder.js +++ b/backend/app/service/externalPrintOrder.js @@ -15,6 +15,16 @@ function truncateText(value, max) { return String(value == null ? '' : value).slice(0, max); } +/** + * 是否为平台登录态失效类错误(各分区接口统一返回「登录信息过期,请重新登录」或 token is invalid) + * @param {Error} err 异常 + * @return {boolean} 是否需要重新登录 + */ +function isSessionExpiredError(err) { + const message = String((err && err.message) || ''); + return /登录信息过期|登录已失效|token is invalid|未登录|缺少 token/i.test(message); +} + /** * 明细行转列表摘要快照(与订单页 product_info 口径一致) * @param {Array} lines 明细 @@ -90,10 +100,18 @@ class ExternalPrintOrderService extends Service { */ async syncOrders(shop, account, { startTime, endTime }) { const platformService = this.createPlatformService(account); - const result = await platformService.listOrders(shop.get ? shop.get({ plain: true }) : shop, { - startTime, - endTime, - }); + const shopPlain = shop.get ? shop.get({ plain: true }) : shop; + let result; + try { + result = await platformService.listOrders(shopPlain, { startTime, endTime }); + } catch (err) { + // 店管家会话到期/被其它端顶掉时各分区接口会统一返回「登录信息过期」, + // 这里重新登录一次再重试,避免定时拉单因为会话过期整天失败 + if (!isSessionExpiredError(err)) throw err; + this.ctx.logger.warn('[externalPrintOrder] 拉单时登录态失效,重新登录后重试:%s', err.message); + await platformService.loginByPassword(); + result = await platformService.listOrders(shopPlain, { startTime, endTime }); + } const saved = await this.saveOrders(shop, account, result.list); // 平台侧已发货/已终结、但本地仍停留在待审核的副本:自动作废,避免脏单积压在待审核 diff --git a/frontend/src/views/Shop/Index.vue b/frontend/src/views/Shop/Index.vue index 0114fd2..9ddf80b 100644 --- a/frontend/src/views/Shop/Index.vue +++ b/frontend/src/views/Shop/Index.vue @@ -194,6 +194,7 @@ const FETCH_ORDER_DAYS = [ { label: '最近 7 天', value: 7 }, { label: '最近 30 天', value: 30 }, { label: '最近 90 天', value: 90 }, + { label: '全部待处理(不限下单时间)', value: 0 }, ] /** 打开手动拉单弹窗(外部打单平台店铺) */ @@ -206,7 +207,6 @@ function openFetchOrder(row: ShopItem) { fetchOrderForm.days = 7 fetchOrderVisible.value = true } - /** 手动拉取订单:后端按店铺所属商家逐平台分区拉取并写入订单/明细 */ async function submitFetchOrder() { const shop = fetchOrderShop.value @@ -217,14 +217,16 @@ async function submitFetchOrder() { const res = await syncExternalPrintShopOrders(shop.external_print_account_id, shop.id, { days: fetchOrderForm.days, }) - const range = `${formatDateTime(res.start_time)} ~ ${formatDateTime(res.end_time)}` + const scope = fetchOrderForm.days === 0 + ? '全部待处理' + : `${formatDateTime(res.start_time)} ~ ${formatDateTime(res.end_time)}` if (res.orders || res.skipped || res.voided) { ElMessage.success( - `拉取完成(${range}):未发货 ${res.orders} 单(新增 ${res.created},更新 ${res.updated}),明细 ${res.items} 条` + + `拉取完成(${scope}):未发货 ${res.orders} 单(新增 ${res.created},更新 ${res.updated}),明细 ${res.items} 条` + `${res.skipped ? `;跳过平台已发货 ${res.skipped} 单` : ''}${res.voided ? `;自动作废 ${res.voided} 单` : ''}`, ) } else { - ElMessage.warning(`该时间窗(${range})内没有平台未发货的订单`) + ElMessage.warning(`该范围(${scope})内没有平台未发货的订单`) } fetchOrderVisible.value = false await fetchList()