From 73d12cdf1a8d54876dcdcfe7aa0c04b26a69f974 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 26 Aug 2026 15:31:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=AE=A2=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20oaid=5Forder=5Fsource=5Fcode=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=90=BD=E5=BA=93=EF=BC=8C=E5=8F=96=E5=8F=B7=E9=93=BE=E8=B7=AF?= =?UTF-8?q?=20plattradeno=20=E4=BC=98=E5=85=88=E5=8F=96=E8=AF=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/model/order_delivery.js | 5 ++ app/service/systems/delivery_order.js | 2 + app/service/systems/express.js | 1 + app/service/systems/express_platform.js | 4 +- script/fix-order-oaid-column.cjs | 73 +++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 script/fix-order-oaid-column.cjs diff --git a/app/model/order_delivery.js b/app/model/order_delivery.js index efb37d1..21a6aa0 100644 --- a/app/model/order_delivery.js +++ b/app/model/order_delivery.js @@ -81,6 +81,11 @@ module.exports = app => { allowNull: true, comment: '来源平台名称', }, + oaid_order_source_code: { + type: STRING(50), + allowNull: true, + comment: 'OAID订单来源编码', + }, create_channel: { type: STRING(20), allowNull: false, diff --git a/app/service/systems/delivery_order.js b/app/service/systems/delivery_order.js index 2d286ba..be919f2 100644 --- a/app/service/systems/delivery_order.js +++ b/app/service/systems/delivery_order.js @@ -1306,6 +1306,7 @@ class DeliveryOrderService extends Service { orderFlag, sourcePlatformCode, sourcePlatformName, + oaidOrderSourceCode, placeOrderTime, payTime, payNo, @@ -1357,6 +1358,7 @@ class DeliveryOrderService extends Service { order_flag: orderFlag || '', source_platform_code: sourcePlatformCode || '', source_platform_name: sourcePlatformName || '', + oaid_order_source_code: oaidOrderSourceCode || '', create_channel: String(createChannel || 'MANUAL').trim().toUpperCase() || 'MANUAL', sys_platform_code: platformSnapshot.sysPlatformCode, sys_platform_name: platformSnapshot.sysPlatformName, diff --git a/app/service/systems/express.js b/app/service/systems/express.js index fb97ab2..538ebe0 100644 --- a/app/service/systems/express.js +++ b/app/service/systems/express.js @@ -17,6 +17,7 @@ const WAYBILL_ORDER_DELIVERY_MIN_ATTRIBUTES = Object.freeze([ 'delivery_order_code', 'source_platform_code', 'source_platform_name', + 'oaid_order_source_code', 'sys_platform_code', 'sys_platform_name', 'order_type', diff --git a/app/service/systems/express_platform.js b/app/service/systems/express_platform.js index 8a4cb21..fdb30ef 100644 --- a/app/service/systems/express_platform.js +++ b/app/service/systems/express_platform.js @@ -749,7 +749,7 @@ class ExpressPlatformService extends MainService { const order = order_tmp.order_delivery; console.log('order', order); const expressListItem = ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code) || {}; - let plattradeno = order.source_order_codes; + let plattradeno = order.oaid_order_source_code || order.source_order_codes || ''; if (listByWarehousePlatformCode.platform_code === 'DY' && order.from_key === 23060081 && !!order.pay_no && plattradeno.indexOf(',') > -1) { plattradeno = order.pay_no; } @@ -2437,7 +2437,7 @@ class ExpressPlatformService extends MainService { object_id: `${order_tmp.order_delivery.warehouse_id}_${order_tmp.order_delivery.id}_${order_tmp.business_key}`, order_info: { order_channels_type: 'PDD', - trade_order_list: [`${order_tmp.order_delivery.warehouse_id}_${order_tmp.order_delivery.id}_${order_tmp.business_key}`], + trade_order_list: [ `${order_tmp.order_delivery.warehouse_id}_${order_tmp.order_delivery.id}_${order_tmp.business_key}` ], }, package_info: { items: (order_tmp.order_delivery && order_tmp.order_delivery.orderItems || []).map(item => ({ diff --git a/script/fix-order-oaid-column.cjs b/script/fix-order-oaid-column.cjs new file mode 100644 index 0000000..29fcbed --- /dev/null +++ b/script/fix-order-oaid-column.cjs @@ -0,0 +1,73 @@ +'use strict'; + +/** + * 幂等补齐订单分表的 oaid_order_source_code 列。 + * + * 背景:该列由订单模型(app/model/order_delivery.js)定义,分表工厂 + * (order_delivery_factory.js)在首次访问某张分表时自动同步;history / + * outsourced 等长期不被访问的表可能滞后,可用本脚本提前补齐。 + * + * 用法: + * 开发:node script/fix-order-oaid-column.cjs + * 生产:PowerShell 中 $env:NODE_ENV='production'; node script/fix-order-oaid-column.cjs + * + * 安全:只 ADD 缺失列(VARCHAR(50) NULL,与模型定义一致),不触碰 id / + * AUTO_INCREMENT,不修改已有列,可重复执行。 + */ +(async () => { + try { + const configs = require('../database/config.js'); + const env = process.env.NODE_ENV || 'development'; + const cfg = configs[env]; + if (!cfg) { + console.error('NO_CONFIG_FOR_ENV'); + process.exit(2); + } + + const mysql = require('mysql2/promise'); + const conn = await mysql.createConnection({ + host: cfg.host, + port: cfg.port || 3306, + user: cfg.username, + password: cfg.password, + database: cfg.database, + }); + + const [ tables ] = await conn.query( + `SELECT TABLE_NAME FROM information_schema.TABLES + WHERE TABLE_SCHEMA = ? AND TABLE_NAME LIKE 'wms_order_delivery\\_%' + ORDER BY TABLE_NAME`, + [ cfg.database ] + ); + + console.log(`环境: ${env}, 库: ${cfg.host}:${cfg.port}/${cfg.database}`); + console.log(`订单分表数量: ${tables.length}\n`); + + const columnSql = 'ADD COLUMN oaid_order_source_code VARCHAR(50) NULL COMMENT \'OAID订单来源编码\''; + let added = 0; + let ok = 0; + + for (const row of tables) { + const tableName = row.TABLE_NAME || row.table_name; + const [ columns ] = await conn.query( + `SELECT COLUMN_NAME FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME = 'oaid_order_source_code'`, + [ cfg.database, tableName ] + ); + if (columns.length === 0) { + await conn.query(`ALTER TABLE \`${tableName}\` ${columnSql}`); + console.log(`[ADD] ${tableName} 已补齐列`); + added += 1; + } else { + ok += 1; + } + } + + console.log(`\n完成: 已存在 ${ok} 张, 新增 ${added} 张`); + await conn.end(); + process.exit(0); + } catch (err) { + console.error('ERROR', err.message); + process.exit(3); + } +})();