fix(export): 订单导出子查询补齐筛选列,修复 Unknown column 't.*'

导出订单时,筛选条件作用于外层包装表((inner) AS t),
但内层只投影了导出列,「电商平台」筛选引用的 source_platform_code
等列不在包装表里,导致:
  Unknown column 't.source_platform_code' in 'where clause'

修复:
- 内层各状态分支固定补齐 t.principal_id / t.source_platform_code(不输出到导出表)
- 覆盖所有筛选项 × 订单行/含明细两种模式的组合校验,均通过
- 单测补充平台筛选的内层列断言

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
liufumingren 2026-11-14 01:02:42 +08:00
parent b7010921c9
commit 44b8b09e0e
2 changed files with 12 additions and 3 deletions

View File

@ -898,8 +898,10 @@ const EXPORT_TYPES = {
const inner = stages.map(stage => {
const table = ORDER_TABLE_BY_STATUS[stage];
const archived = stage === ORDER_STATUS.HISTORY ? 't.archived_at' : 'NULL AS archived_at';
// 含明细模式外层要按 principal_id 关联明细表,内层额外带上该列(不输出到导出表)
const extra = exportMode === 'item' ? ', t.principal_id AS principal_id' : '';
// 外层筛选/关联要用的列(不在导出表里展示):
// - principal_id:含明细模式关联 order_status_items
// - source_platform_code:电商平台筛选(选列里只有平台名称,没有编码)
const extra = ', t.principal_id AS principal_id, t.source_platform_code AS source_platform_code';
return `SELECT ${select}${extra}, ${archived} FROM ${table} t WHERE t.principal_id = ?${scopeSql}`;
}).join(' UNION ALL ');
const wh = makeWhere();

View File

@ -16,7 +16,8 @@ describe('test/app/lib/exportDefsOrder.test.js', () => {
assert(!headers.includes('商家编码'));
assert(sql.includes('JSON_ARRAYAGG'), 'SN 列表用 JSON_ARRAYAGG 聚合');
assert(!sql.includes('JOIN order_status_items'));
assert(!sql.includes('t.principal_id AS principal_id'));
// 内层固定补齐筛选/关联要用的列,但不输出到导出表
assert(sql.includes('t.source_platform_code AS source_platform_code'));
});
it('订单含明细:JOIN 明细表,一行一个商品并带明细级序列号', () => {
@ -76,6 +77,12 @@ describe('test/app/lib/exportDefsOrder.test.js', () => {
assert.deepEqual(replacements, [ 5, 4, 7, 3 ]);
});
it('订单行 + 平台筛选:内层补齐 source_platform_code,避免外层 WHERE 找不到列', () => {
const { sql } = buildExportSql('order', { platform_codes: 'tb,pdd' }, 5, 1, GROUP_ACCESS);
assert(sql.includes('t.source_platform_code AS source_platform_code'));
assert(sql.includes('t.source_platform_code IN (?,?)'));
});
it('cleanFilters 保留 export_mode / ids,丢弃未声明字段', () => {
const filters = cleanFilters('order', { export_mode: 'item', ids: '1,2', unknown: 'x', order_no: '' });
assert.deepEqual(filters, { export_mode: 'item', ids: '1,2' });