diff --git a/backend/app/controller/externalPrintAccount.js b/backend/app/controller/externalPrintAccount.js index ce8be04..3c9b1e1 100644 --- a/backend/app/controller/externalPrintAccount.js +++ b/backend/app/controller/externalPrintAccount.js @@ -1,18 +1,5 @@ 'use strict'; -/** - * 把东八区时间对齐到整天:startOfDay/endOfDay - * @param {Date} date 时间 - * @param {boolean} end 是否取当天 23:59:59 - * @return {Date} 对齐后的时间 - */ -function alignDay(date, end) { - const value = new Date(date); - if (end) value.setHours(23, 59, 59, 999); - else value.setHours(0, 0, 0, 0); - return value; -} - /** * @controller ExternalPrintAccountController 外部打单账号管理 * 账号归属主体,在前端「店铺管理 → 外部打单平台」维护(新增 / 修改 / 删除) @@ -692,10 +679,13 @@ class ExternalPrintAccountController extends Controller { } const body = ctx.request.body || {}; + const days = Math.max(1, Number(body.days) || 1); 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(alignDay(endTime, false).getTime() - (Math.max(1, Number(body.days) || 1) - 1) * 86400000); + : new Date(endTime.getTime() - days * 86400000); if (Number.isNaN(startTime.getTime()) || Number.isNaN(endTime.getTime())) { ctx.status = 400; ctx.body = { code: 400, message: '时间格式不正确' }; @@ -706,7 +696,7 @@ class ExternalPrintAccountController extends Controller { try { saved = await ctx.service.externalPrintOrder.syncOrders(shop, account, { startTime, - endTime: alignDay(endTime, true), + endTime, }); } catch (err) { ctx.status = 400; diff --git a/backend/app/schedule/fetchExternalShopOrders.js b/backend/app/schedule/fetchExternalShopOrders.js index 9d166a4..be4a216 100644 --- a/backend/app/schedule/fetchExternalShopOrders.js +++ b/backend/app/schedule/fetchExternalShopOrders.js @@ -7,7 +7,8 @@ * 按各店铺配置的间隔(auto_fetch_interval,最小 3 分钟)判断是否到期: * - 上次拉取时间 + 间隔 > 现在 → 跳过 * - 否则以「上次拉取时间向前重叠 10 分钟」为起点拉取,避免边界订单漏单; - * 从未拉取过时按最近一个间隔拉取 + * 从未拉取过时回看 7 天,把店铺的历史待处理订单一次性拉进来 + * (只按一个间隔回看会漏掉上架前就积压的未发货订单) * * 拉取逻辑与手动拉取共用 service(externalPrintOrder),保证入库口径一致; * 每次执行后记录 last_order_sync_at / last_order_sync_msg,失败不影响其它店铺。 @@ -16,6 +17,9 @@ const OVERLAP_MS = 10 * 60 * 1000; const MIN_INTERVAL_MINUTES = 3; const DEFAULT_INTERVAL_MINUTES = 3; +/** 首次拉取(从未同步过)时回看的天数 */ +const INITIAL_LOOKBACK_DAYS = 7; + /** 防止上一轮未结束时重复触发(单进程内串行) */ let running = false; @@ -78,7 +82,9 @@ module.exports = { continue; } - const startTime = last ? new Date(last.getTime() - OVERLAP_MS) : new Date(now.getTime() - interval); + const startTime = last + ? new Date(last.getTime() - OVERLAP_MS) + : new Date(now.getTime() - INITIAL_LOOKBACK_DAYS * 24 * 3600 * 1000); try { const result = await ctx.service.externalPrintOrder.syncOrders(shop, account, { diff --git a/frontend/src/views/Shop/Index.vue b/frontend/src/views/Shop/Index.vue index 94a1650..0114fd2 100644 --- a/frontend/src/views/Shop/Index.vue +++ b/frontend/src/views/Shop/Index.vue @@ -186,13 +186,14 @@ const fetchingOrderId = ref(null) const fetchOrderVisible = ref(false) const fetchOrderSubmitting = ref(false) const fetchOrderShop = ref(null) -const fetchOrderForm = reactive({ days: 1 }) +const fetchOrderForm = reactive({ days: 7 }) const FETCH_ORDER_DAYS = [ { label: '最近 1 天', value: 1 }, { label: '最近 3 天', value: 3 }, { label: '最近 7 天', value: 7 }, { label: '最近 30 天', value: 30 }, + { label: '最近 90 天', value: 90 }, ] /** 打开手动拉单弹窗(外部打单平台店铺) */ @@ -202,7 +203,7 @@ function openFetchOrder(row: ShopItem) { return } fetchOrderShop.value = row - fetchOrderForm.days = 1 + fetchOrderForm.days = 7 fetchOrderVisible.value = true } @@ -216,10 +217,15 @@ async function submitFetchOrder() { const res = await syncExternalPrintShopOrders(shop.external_print_account_id, shop.id, { days: fetchOrderForm.days, }) - ElMessage.success( - `拉取完成:未发货 ${res.orders} 单(新增 ${res.created},更新 ${res.updated}),明细 ${res.items} 条` + - `${res.skipped ? `;跳过平台已发货 ${res.skipped} 单` : ''}${res.voided ? `;自动作废 ${res.voided} 单` : ''}`, - ) + const range = `${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} 条` + + `${res.skipped ? `;跳过平台已发货 ${res.skipped} 单` : ''}${res.voided ? `;自动作废 ${res.voided} 单` : ''}`, + ) + } else { + ElMessage.warning(`该时间窗(${range})内没有平台未发货的订单`) + } fetchOrderVisible.value = false await fetchList() if (currentShop.value && currentShop.value.id === shop.id) await fetchDetail(shop.id) @@ -551,7 +557,7 @@ onMounted(fetchList) type="info" :closable="false" show-icon - title="按店铺所属商家逐平台分区拉取;只拉取平台侧未发货的订单(已发货/已完成/已关闭的订单会跳过)。下拉时间越长耗时越久。开启「自动拉取订单」后系统会按间隔定时拉取" + title="按店铺所属商家逐平台分区拉取;时间窗按「此刻往前 N×24 小时」计算。只拉取平台侧未发货的订单(已发货/已完成/已关闭的订单会跳过)。下拉时间越长耗时越久。开启「自动拉取订单」后系统会按间隔定时拉取" class="fetch-order-tip" />