问题:手动拉单的「最近 N 天」被按自然日对齐(今天 00:00 起), 凌晨拉单只覆盖当天几小时,明明平台有待发货订单也提示「0 单」; 店铺首次自动拉单也只回看一个间隔(默认 3 分钟),历史待处理订单永远拉不进来。 - sync-orders 改为滚动时间窗:end=此刻(或指定时间),start=end - days×24h - 手动拉单下拉增加「最近 90 天」,默认值 1 天 → 7 天 - 弹窗说明与结果提示补充实际拉取时间窗;窗口内无数据时用 warning 提示而不是成功 - 定时任务首次拉取(last_order_sync_at 为空)回看 7 天,命中店铺历史未发货订单 - 移除不再使用的 alignDay 辅助函数 实测:店铺 19(13668975305 意洁)最近 1 天 → 未发货 8 单(原为 0), 最近 30 天 → 未发货 12 单(跳过平台已发货 1329 单),订单页待审核可见 14 单 (含店铺 18 的 2 单)。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
117 lines
4.2 KiB
JavaScript
117 lines
4.2 KiB
JavaScript
'use strict';
|
||
|
||
/**
|
||
* 定时拉取外部打单平台订单。
|
||
*
|
||
* 每分钟扫描开启「自动拉取订单」的外部打单平台店铺(type=2),
|
||
* 按各店铺配置的间隔(auto_fetch_interval,最小 3 分钟)判断是否到期:
|
||
* - 上次拉取时间 + 间隔 > 现在 → 跳过
|
||
* - 否则以「上次拉取时间向前重叠 10 分钟」为起点拉取,避免边界订单漏单;
|
||
* 从未拉取过时回看 7 天,把店铺的历史待处理订单一次性拉进来
|
||
* (只按一个间隔回看会漏掉上架前就积压的未发货订单)
|
||
*
|
||
* 拉取逻辑与手动拉取共用 service(externalPrintOrder),保证入库口径一致;
|
||
* 每次执行后记录 last_order_sync_at / last_order_sync_msg,失败不影响其它店铺。
|
||
*/
|
||
const OVERLAP_MS = 10 * 60 * 1000;
|
||
const MIN_INTERVAL_MINUTES = 3;
|
||
const DEFAULT_INTERVAL_MINUTES = 3;
|
||
|
||
/** 首次拉取(从未同步过)时回看的天数 */
|
||
const INITIAL_LOOKBACK_DAYS = 7;
|
||
|
||
/** 防止上一轮未结束时重复触发(单进程内串行) */
|
||
let running = false;
|
||
|
||
module.exports = {
|
||
schedule: {
|
||
cron: '0 * * * * *',
|
||
type: 'worker',
|
||
disable: false,
|
||
},
|
||
|
||
async task(ctx) {
|
||
if (running) {
|
||
ctx.logger.info('[external-order-fetch] 上一轮仍在执行,跳过本次');
|
||
return { skipped: true };
|
||
}
|
||
|
||
running = true;
|
||
try {
|
||
const Op = ctx.app.Sequelize.Op;
|
||
const shops = await ctx.model.Shop.findAll({
|
||
where: {
|
||
type: 2,
|
||
status: 1,
|
||
auto_fetch_order: 1,
|
||
external_print_account_id: { [Op.ne]: null },
|
||
},
|
||
order: [[ 'id', 'ASC' ]],
|
||
});
|
||
if (!shops.length) return { shops: 0 };
|
||
|
||
const accountIds = Array.from(new Set(shops.map(shop => Number(shop.external_print_account_id))));
|
||
const accounts = await ctx.model.ExternalPrintAccount.findAll({
|
||
where: { id: { [Op.in]: accountIds } },
|
||
include: [
|
||
{
|
||
model: ctx.model.ExternalPrintPlatform,
|
||
as: 'platform',
|
||
attributes: [ 'id', 'code', 'name', 'url', 'fetch_waybill_no' ],
|
||
},
|
||
],
|
||
});
|
||
const accountMap = new Map(accounts.map(account => [ Number(account.id), account ]));
|
||
|
||
const now = new Date();
|
||
let fetched = 0;
|
||
let failed = 0;
|
||
|
||
for (const shop of shops) {
|
||
const interval = Math.max(
|
||
MIN_INTERVAL_MINUTES,
|
||
Number(shop.auto_fetch_interval) || DEFAULT_INTERVAL_MINUTES
|
||
) * 60 * 1000;
|
||
const last = shop.last_order_sync_at ? new Date(shop.last_order_sync_at) : null;
|
||
if (last && now.getTime() - last.getTime() < interval) continue;
|
||
|
||
const account = accountMap.get(Number(shop.external_print_account_id));
|
||
if (!account) {
|
||
await ctx.service.externalPrintOrder.markShopSynced(shop, now, '拉单失败:店铺关联的打单账号不存在');
|
||
failed++;
|
||
continue;
|
||
}
|
||
|
||
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, {
|
||
startTime,
|
||
endTime: now,
|
||
});
|
||
await ctx.service.externalPrintOrder.markShopSynced(
|
||
shop,
|
||
now,
|
||
`自动拉取成功:${result.orders} 单(新增 ${result.created},更新 ${result.updated}),明细 ${result.items} 条` +
|
||
`,跳过平台已发货 ${result.skipped || 0} 单,自动作废 ${result.voided || 0} 单`
|
||
);
|
||
fetched++;
|
||
ctx.logger.info(
|
||
`[external-order-fetch] 店铺 ${shop.id} 拉单成功:订单 ${result.orders},明细 ${result.items},跳过已发货 ${result.skipped || 0},作废 ${result.voided || 0}`
|
||
);
|
||
} catch (err) {
|
||
await ctx.service.externalPrintOrder.markShopSynced(shop, now, `自动拉取失败:${err.message}`);
|
||
failed++;
|
||
ctx.logger.warn(`[external-order-fetch] 店铺 ${shop.id} 拉单失败:${err.message}`);
|
||
}
|
||
}
|
||
|
||
return { shops: shops.length, fetched, failed };
|
||
} finally {
|
||
running = false;
|
||
}
|
||
},
|
||
};
|