From d179cd39931d6fa713d171c2703c5b00a2d2e8dc Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 7 Nov 2026 21:03:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(pull):=20=E4=B8=80=E5=8C=BA=EF=BC=88?= =?UTF-8?q?=E8=80=81=E5=88=86=E5=8C=BA=EF=BC=89=E5=A3=B0=E6=98=8E=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E6=97=B6=E8=A1=A5=E6=89=AB=20+=20=E9=80=80=E5=8C=96?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=97=B6=E6=8F=90=E7=A4=BA=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=BC=8F=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户报「抖音/抖店一区的 5 单拉不到」。按平台单号定位:5 单全部在 `fxdd.dgjapp.com(抖店-186,即一区)`,`ErpState=waitsellersend`、 `UpFxUserId=953516`、`ShopId=4500493`,新系统区/精选区里没有它们。 一区能拉到的前提是「待发货」过滤生效(`Contract` 必须是单个 `=`)。 - dgj.listOrders:把分区扫描抽成 scanArea;声明里没有老分区时不再直接跳过, 而是先挂起(deferredLegacy),新系统分区一单都没拉到时回头补扫老分区 (rescueHosts),命中会记 warn;确实有单时仍跳过并在 skippedLegacy 里列出 - externalPrintOrder:buildSupplementHint 兼容「补扫老分区」与「补查其它域名」两类; 新增 buildFallbackHint —— 有分区退化为「时间窗全量」时提示 「平台全量列表不含待发货单,可能漏拉,请检查后端版本(订单过滤 Contract 需为单个等号)」 - 单测:pullOrderHint.test.js 补 2 例(补扫老分区提示、退化兜底提示), test/app/lib 75 passing 实测(本地库,同账号):只声明「抖店-二区」时 listOrders 仍能拿到 6931208417510390802 / 6931197358224080335 / 6931209886018010885 / 6919330748987944687 / 6931230754941796036 这 5 单(待处理 7 单)。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/lib/printPlatform/dgj.js | 192 ++++++++++++--------- backend/app/service/externalPrintOrder.js | 30 +++- backend/test/app/lib/pullOrderHint.test.js | 24 +++ 3 files changed, 162 insertions(+), 84 deletions(-) diff --git a/backend/app/lib/printPlatform/dgj.js b/backend/app/lib/printPlatform/dgj.js index fb83915..ef95213 100644 --- a/backend/app/lib/printPlatform/dgj.js +++ b/backend/app/lib/printPlatform/dgj.js @@ -1933,6 +1933,97 @@ class DgjService extends PrintPlatformService { // 店铺没有声明该平台的老分区(只有新系统分区)时,该平台的老分区属于迁移前遗留数据,跳过不拉 const skippedLegacy = []; const areaFlags = this.resolveAreaFlags(data); + // 「所在区」声明里没有老分区时先跳过(迁移前遗留数据),但**拉到单之前不能就此收工**: + // 声明只写了「抖店-二区」而订单实际还在「抖店-186(一区)」的情况确实存在, + // 声明域名/新系统区都没单时再回头补扫这些老分区 + const deferredLegacy = []; + /** + * 扫一个分区 + * @param {string} host 订单接口域名 + * @param {Object} area 分区(dbname / name) + * @param {boolean} legacyAllowed 是否允许走「不支持过滤 → 时间窗全量」兜底 + * @return {Promise} 无返回值 + */ + const scanArea = async (host, area, legacyAllowed) => { + const areaLabel = `${host}(${area.name || area.dbname})`; + let fetched = null; + // 新系统分区支持「待发货 + 商家」过滤;已知不支持的老分区直接走下面的兜底分支 + if (this.filterSupported(host, area.dbname) !== false) { + try { + fetched = await this.fetchOrderPages(host, { + traceId, + dbname: area.dbname, + startTime: start, + endTime: end, + erpState: ORDER_ERP_STATE_PENDING, + merchantFxUserId, + }); + this.rememberFilterSupport(host, area.dbname, true); + } catch (err) { + if (!isFilterUnsupportedError(err)) throw err; + // 旧系统分区不支持 ErpState/UpFxUserId 过滤(平台返回「服务器繁忙」) + this.rememberFilterSupport(host, area.dbname, false); + fetched = null; + } + } + if (fetched === null) { + // 老分区:店铺没声明老分区时先挂起(迁移前遗留数据,避免每次白拉一遍历史单) + if (!legacyAllowed) { + deferredLegacy.push({ host, area, areaLabel }); + return; + } + fallbackHosts.push(areaLabel); + // 老分区只能全量拉:超大窗口(「全部待处理」)会翻很多页,统一封顶到最近 N 天 + const fallbackStart = new Date(Math.max( + start.getTime(), + end.getTime() - Math.max(1, ORDER_FALLBACK_MAX_DAYS) * 24 * 3600 * 1000 + )); + // 注意:平台「全量」列表不含待发货单,退化分支只能兜住已发货/已终结的核对, + // 拉待发货单必须靠「状态过滤」——所以这里留一条 warn,0 单时不会被误当成「平台没有单」 + if (this.logger && typeof this.logger.warn === 'function') { + this.logger.warn('[dgj] %s 的 %s 不支持状态过滤,退化为时间窗全量拉取(可能漏掉待发货单)', host, areaLabel); + } + fetched = await this.fetchOrderPages(host, { + traceId, + dbname: area.dbname, + startTime: fallbackStart, + endTime: end, + }); + } + if (!fetched.length) return; + hitHosts.push(areaLabel); + for (const row of fetched) { + const upFxUserId = String(row.UpFxUserId || ''); + // 记录平台实际出现的商家:店铺声明的 FxUserId 过期时(重新授权/换绑), + // 按老 FxUserId 过滤永远是 0 条,这里留痕便于直接看出「该换成谁」 + if (upFxUserId) { + const seen = seenMerchants.get(upFxUserId) || { + count: 0, + shopName: String(row.ShopName || row.AgentShopName || row.SelfShopName || ''), + }; + seen.count += 1; + seenMerchants.set(upFxUserId, seen); + } + // 订单列表按账号维度返回,这里只保留当前商家的订单 + if (upFxUserId !== merchantFxUserId) continue; + const order = this.normalizeOrder(row); + if (!order.external_order_id) continue; + // 平台已发货/已终结:不进待审核,只登记给上层用于作废本地未处理的副本 + // (带上命中的具体依据,作废备注里直接写明「平台订单状态 ErpState=sended」之类) + const finishedDetail = describeFinishedOrder(row); + if (finishedDetail.finished) { + finished.set(order.external_order_id, { + external_order_id: order.external_order_id, + platform_order_no: order.platform_order_no, + platform_status: order.platform_status, + place_order_time: order.external_created_at, + reason: finishedDetail.reason, + }); + continue; + } + orders.set(order.external_order_id, order); + } + }; /** * 扫一个域名下的全部分区 * @param {string} host 订单接口域名 @@ -1942,90 +2033,29 @@ class DgjService extends PrintPlatformService { // 商家分区声明里没有该平台的记录时,按「新旧分区都要查」处理,宁可多查也不漏单 const flags = areaFlags[host] || { hasNew: true, hasLegacy: true }; const areas = await this.listProductAreas(host); - for (const area of areas) { - const areaLabel = `${host}(${area.name || area.dbname})`; - let fetched = null; - // 新系统分区支持「待发货 + 商家」过滤;已知不支持的老分区直接走下面的兜底分支 - if (this.filterSupported(host, area.dbname) !== false) { - try { - fetched = await this.fetchOrderPages(host, { - traceId, - dbname: area.dbname, - startTime: start, - endTime: end, - erpState: ORDER_ERP_STATE_PENDING, - merchantFxUserId, - }); - this.rememberFilterSupport(host, area.dbname, true); - } catch (err) { - if (!isFilterUnsupportedError(err)) throw err; - // 旧系统分区不支持 ErpState/UpFxUserId 过滤(平台返回「服务器繁忙」) - this.rememberFilterSupport(host, area.dbname, false); - fetched = null; - } - } - if (fetched === null) { - // 老分区:店铺没声明老分区时跳过(迁移前遗留数据,避免每次白拉一遍历史单) - if (!flags.hasLegacy) { - skippedLegacy.push(areaLabel); - continue; - } - fallbackHosts.push(areaLabel); - // 老分区只能全量拉:超大窗口(「全部待处理」)会翻很多页,统一封顶到最近 N 天 - const fallbackStart = new Date(Math.max( - start.getTime(), - end.getTime() - Math.max(1, ORDER_FALLBACK_MAX_DAYS) * 24 * 3600 * 1000 - )); - // 注意:平台「全量」列表不含待发货单,退化分支只能兜住已发货/已终结的核对, - // 拉待发货单必须靠「状态过滤」——所以这里留一条 warn,0 单时不会被误当成「平台没有单」 - if (this.logger && typeof this.logger.warn === 'function') { - this.logger.warn('[dgj] %s 的 %s 不支持状态过滤,退化为时间窗全量拉取(可能漏掉待发货单)', host, areaLabel); - } - fetched = await this.fetchOrderPages(host, { - traceId, - dbname: area.dbname, - startTime: fallbackStart, - endTime: end, - }); - } - if (!fetched.length) continue; - hitHosts.push(`${host}(${area.name || area.dbname})`); - for (const row of fetched) { - const upFxUserId = String(row.UpFxUserId || ''); - // 记录平台实际出现的商家:店铺声明的 FxUserId 过期时(重新授权/换绑), - // 按老 FxUserId 过滤永远是 0 条,这里留痕便于直接看出「该换成谁」 - if (upFxUserId) { - const seen = seenMerchants.get(upFxUserId) || { - count: 0, - shopName: String(row.ShopName || row.AgentShopName || row.SelfShopName || ''), - }; - seen.count += 1; - seenMerchants.set(upFxUserId, seen); - } - // 订单列表按账号维度返回,这里只保留当前商家的订单 - if (upFxUserId !== merchantFxUserId) continue; - const order = this.normalizeOrder(row); - if (!order.external_order_id) continue; - // 平台已发货/已终结:不进待审核,只登记给上层用于作废本地未处理的副本 - // (带上命中的具体依据,作废备注里直接写明「平台订单状态 ErpState=sended」之类) - const finishedDetail = describeFinishedOrder(row); - if (finishedDetail.finished) { - finished.set(order.external_order_id, { - external_order_id: order.external_order_id, - platform_order_no: order.platform_order_no, - platform_status: order.platform_status, - place_order_time: order.external_created_at, - reason: finishedDetail.reason, - }); - continue; - } - orders.set(order.external_order_id, order); - } - } + for (const area of areas) await scanArea(host, area, flags.hasLegacy); }; for (const host of hosts) await scanHost(host); + // 声明里没有老分区、但新分区一单都没有时,回头补扫这些老分区(如「抖店-186(一区)」) + const rescueHosts = []; + if (!orders.size && !finished.size && deferredLegacy.length) { + for (const item of deferredLegacy) { + await scanArea(item.host, item.area, true); + } + rescueHosts.push(...deferredLegacy.map(item => item.areaLabel)); + if (this.logger && typeof this.logger.warn === 'function') { + this.logger.warn( + '[dgj] 声明分区没拉到单,已补扫老分区:%s(命中:%s)', + deferredLegacy.map(item => item.areaLabel).join('、'), + hitHosts.join('、') || '-' + ); + } + } else { + skippedLegacy.push(...deferredLegacy.map(item => item.areaLabel)); + } + // 店铺的「所在区」声明(external_data.DbAreas)可能过期:重新授权/换绑后不会自动同步, // 声明域名一单都没有时再补查账号的其它域名,否则会出现「店管家 UI 有单、OMS 拉不到」 // (单品补拉 listProductsByIds 一直就是这么兜底的,全量拉取此前只查声明域名) @@ -2055,6 +2085,8 @@ class DgjService extends PrintPlatformService { skippedLegacy, // 声明分区没拉到单时补查的域名(非空说明「店铺所在区」声明可能过期) supplementHosts, + // 声明里没有老分区、但补扫了这些老分区(如「抖店-186(一区)」) + rescueHosts, skipped: finished.size, finished: Array.from(finished.values()), // 店铺声明的商家在平台结果里是否出现过;没出现过通常是 FxUserId 过期(重新授权/换绑) diff --git a/backend/app/service/externalPrintOrder.js b/backend/app/service/externalPrintOrder.js index d66bf15..9d188e6 100644 --- a/backend/app/service/externalPrintOrder.js +++ b/backend/app/service/externalPrintOrder.js @@ -187,24 +187,46 @@ class ExternalPrintOrderService extends Service { hosts: result.hosts, fallbackHosts: result.fallbackHosts || [], supplementHosts: result.supplementHosts || [], - hint: this.buildZeroOrderHint(shopPlain, result, { startTime, endTime }) || this.buildSupplementHint(shopPlain, result), + hint: this.buildZeroOrderHint(shopPlain, result, { startTime, endTime }) + || this.buildSupplementHint(shopPlain, result) + || this.buildFallbackHint(result), }; } /** - * 声明分区没拉到单、补查其它域名才拉到时的提示 + * 有分区走了「不支持状态过滤 → 时间窗全量」兜底时的提示 + * + * 平台全量列表不返回待发货单,退化分支基本只能兜住已发货/已终结的核对; + * 出现这条说明「待发货」过滤没生效(操作符或分区不兼容),待发货单可能全部漏掉。 + * @param {Object} result listOrders 结果 + * @return {string} 提示(无需提示时为空字符串) + */ + buildFallbackHint(result) { + const hosts = (result && Array.isArray(result.fallbackHosts)) ? result.fallbackHosts : []; + if (!hosts.length) return ''; + return `分区 ${hosts.join('、')} 不支持「待发货」过滤,已退化为时间窗全量拉取;` + + '平台全量列表不含待发货单,可能漏拉,请检查后端版本(订单过滤 Contract 需为单个等号)'; + } + + /** + * 声明分区没拉到单、补查其它分区/域名才拉到时的提示 + * + * 两种补查都会出现:① 声明里没有老分区(如「抖店-186 一区」)→ 补扫老分区; + * ② 声明的域名整块过期 → 补查账号的其它域名。 * @param {Object} shopPlain 店铺纯对象 * @param {Object} result listOrders 结果 * @return {string} 提示(无需提示时为空字符串) */ buildSupplementHint(shopPlain, result) { if (!result || !result.total) return ''; + const rescued = Array.isArray(result.rescueHosts) ? result.rescueHosts : []; const supplements = Array.isArray(result.supplementHosts) ? result.supplementHosts : []; - if (!supplements.length) return ''; + const extra = [ ...rescued, ...supplements ]; + if (!extra.length) return ''; const declared = Array.isArray(result.declaredHosts) && result.declaredHosts.length ? result.declaredHosts.join('、') : '(店铺声明的分区)'; - return `店铺声明的分区 ${declared} 没拉到单,已自动补查 ${supplements.join('、')} 并拉到 ${result.total} 单;` + + return `店铺声明的分区 ${declared} 没拉到单,已自动补查 ${extra.join('、')} 并拉到 ${result.total} 单;` + '建议刷新店铺「所在区/商家」,否则每次都要多查一遍'; } diff --git a/backend/test/app/lib/pullOrderHint.test.js b/backend/test/app/lib/pullOrderHint.test.js index 1ebb9d6..8e4d81d 100644 --- a/backend/test/app/lib/pullOrderHint.test.js +++ b/backend/test/app/lib/pullOrderHint.test.js @@ -60,4 +60,28 @@ describe('service/externalPrintOrder 拉单 0 单的排查提示', () => { assert.strictEqual(service.buildSupplementHint({}, { total: 0, supplementHosts: [ 'fxali.dgjapp.com' ] }), ''); assert.strictEqual(service.buildSupplementHint({}, null), ''); }); + + it('补扫老分区才拉到单时也算补查', () => { + const hint = service.buildSupplementHint({}, { + total: 5, + declaredHosts: [ 'fxdd.dgjapp.com' ], + rescueHosts: [ 'fxdd.dgjapp.com(抖店-186)' ], + }); + console.log('补扫老分区提示:', hint); + assert.match(hint, /抖店-186/); + assert.match(hint, /拉到 5 单/); + }); + + it('走了「不支持状态过滤 → 全量」兜底时提示可能漏单', () => { + const hint = service.buildFallbackHint({ + total: 0, + fallbackHosts: [ 'fxdd.dgjapp.com(抖店-186)' ], + }); + console.log('兜底提示:', hint); + assert.match(hint, /抖店-186/); + assert.match(hint, /全量列表不含待发货单/); + assert.match(hint, /单个等号/); + assert.strictEqual(service.buildFallbackHint({ total: 0, fallbackHosts: [] }), ''); + assert.strictEqual(service.buildFallbackHint(null), ''); + }); });