From 57f55c097409738a166097c729ff9f5c77ddd376 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 14 Sep 2026 22:14:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E4=BF=AE=E6=AD=A3=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=90=AC=E8=BF=81=E8=BF=81=E7=A7=BB=E5=9C=A8=E5=85=A8?= =?UTF-8?q?=E6=96=B0=E5=BA=93=E4=B8=8A=E7=9A=84=E5=88=97=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 20260915000300 的统计回填要写 order_deliveries.item_total/item_amount/item_kind, 但这三列由后续迁移 20260915000400 添加 - 全新库上本迁移先于它执行,必然报 Unknown column 'd.item_total' 并中断整个迁移流程 - 改为先用 describeTable 判断列是否存在,不存在则跳过回填(全新库 orders 为空、搬迁本就是 0 行) --- ...15000300-migrate-orders-to-order-deliveries.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/backend/database/migrations/20260915000300-migrate-orders-to-order-deliveries.js b/backend/database/migrations/20260915000300-migrate-orders-to-order-deliveries.js index d345e5a..3a187d1 100644 --- a/backend/database/migrations/20260915000300-migrate-orders-to-order-deliveries.js +++ b/backend/database/migrations/20260915000300-migrate-orders-to-order-deliveries.js @@ -91,11 +91,22 @@ module.exports = { WHERE d.legacy_order_id IS NOT NULL `; + // 见下方事务内的说明:全新库上这些统计列尚未创建,需要据此决定是否回填 + const columns = await queryInterface.describeTable('order_deliveries'); + const hasStatsColumns = [ 'item_total', 'item_amount', 'item_kind' ].every(name => Boolean(columns[name])); + await sequelize.transaction(async transaction => { await sequelize.query(headerSql, { transaction }); await sequelize.query(itemSql, { transaction }); - // 统计口径与 recalcOrderDelivery 保持一致:商品总数 / 商品总金额(Σ 计划数量 × 实际单价)/ 商品种类数 - await sequelize.query(statsSql, { transaction }); + // item_total / item_amount / item_kind 三个统计列由**后续**迁移 20260915000400 添加; + // 全新库上本迁移先于它执行,此时列还不存在(且 orders 表为空、搬迁本就是 0 行), + // 所以先确认列是否存在,不存在就跳过回填,避免 Unknown column 把迁移流程打断。 + if (hasStatsColumns) { + // 统计口径与 recalcOrderDelivery 保持一致:商品总数 / 商品总金额(Σ 计划数量 × 实际单价)/ 商品种类数 + await sequelize.query(statsSql, { transaction }); + } else { + console.log('[migration] order_deliveries 尚无 item_total/item_amount/item_kind(由 20260915000400 添加),跳过统计回填'); + } }); },