From 23a7715dc9e9751c4027711e7f1ca28f4cc0af22 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 5 Nov 2026 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=96=B0=E5=A2=9E=E5=9B=9E=E4=BC=A0=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=8F=91=E8=B4=A7=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=90=8E=E6=8A=8A=E8=BF=90=E5=8D=95=E5=8F=B7=E5=86=99?= =?UTF-8?q?=E5=9B=9E=E5=AE=A2=E6=88=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - shop_database_configs 增加回传设置:方式(不回传/写回字段/写回行)、目标表、运单号字段、定位字段、间隔符、写回行字段映射 - 配置弹窗新增「回传单号」区块:写回字段选表+字段+定位字段+间隔符;写回行按回传值(订单号/运单号/快递公司编码/快递公司名称/回传时间)逐项选列 - 保存时校验回传表与列在客户库中存在,回传行必填项(订单号、运单号) - 发货确认(WMS 回推运单号)后自动回传:写回字段按间隔符合并写单值,写回行按订单号先删后插保证幂等;失败只记日志不影响发货确认 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/contract/index.js | 19 ++ backend/app/controller/shopDatabase.js | 104 ++++++++- backend/app/lib/orderCallback.js | 83 +++++++- backend/app/lib/shopDatabaseFields.js | 42 +++- backend/app/model/shopDatabaseConfig.js | 6 + backend/app/service/shopDatabaseSync.js | 111 +++++++++- ...0-add-callback-to-shop-database-configs.js | 58 ++++++ frontend/src/api/shopDatabase.ts | 22 ++ frontend/src/views/Shop/Index.vue | 197 +++++++++++++++++- 9 files changed, 633 insertions(+), 9 deletions(-) create mode 100644 backend/database/migrations/20261105083000-add-callback-to-shop-database-configs.js diff --git a/backend/app/contract/index.js b/backend/app/contract/index.js index daa04ae..52da726 100644 --- a/backend/app/contract/index.js +++ b/backend/app/contract/index.js @@ -1230,6 +1230,12 @@ module.exports = { product_fields: { type: 'shopDatabaseFieldMapping', description: '商品表字段映射' }, order_fields: { type: 'shopDatabaseFieldMapping', description: '订单表字段映射' }, order_item_fields: { type: 'shopDatabaseFieldMapping', description: '订单明细表字段映射' }, + callback_mode: { type: 'integer', description: '回传单号方式:0不回传 1写回字段 2写回行' }, + callback_table: { type: 'string', description: '回传单号写回的目标表名' }, + callback_field: { type: 'string', description: '写回字段方式:运单号写入的列名' }, + callback_key_field: { type: 'string', description: '写回字段方式:定位订单行的列名(一般是订单号列)' }, + callback_separator: { type: 'string', description: '写回字段方式:多包裹运单号的间隔符' }, + callback_fields: { type: 'shopDatabaseFieldMapping', description: '写回行方式:{ 回传值: 目标列名 }' }, last_test_at: { type: 'string', description: '最近一次校验时间' }, last_test_success: { type: 'integer', description: '最近一次校验结果:1成功 0失败' }, last_test_message: { type: 'string', description: '最近一次校验说明' }, @@ -1238,6 +1244,13 @@ module.exports = { config: { type: 'shopDatabaseConfigItem', description: '数据库连接与映射配置' }, db_types: { type: 'array', itemType: 'shopDatabaseOption', description: '可选数据库类型' }, datasets: { type: 'array', itemType: 'shopDatabaseDataset', description: '可映射字段定义' }, + callback_modes: { type: 'array', itemType: 'shopDatabaseCallbackMode', description: '回传单号方式选项' }, + callback_fields: { type: 'array', itemType: 'shopDatabaseDatasetField', description: '写回行可映射的回传值定义' }, + default_callback_separator: { type: 'string', description: '写回字段默认的多包裹间隔符' }, + }, + shopDatabaseCallbackMode: { + value: { type: 'integer', description: '方式值:0不回传 1写回字段 2写回行' }, + label: { type: 'string', description: '方式名称' }, }, shopDatabaseConfigResponse: { code: { type: 'integer', description: '业务状态码,0 成功' }, @@ -1274,6 +1287,12 @@ module.exports = { product_fields: { type: 'shopDatabaseFieldMapping', description: '商品表字段映射' }, order_fields: { type: 'shopDatabaseFieldMapping', description: '订单表字段映射' }, order_item_fields: { type: 'shopDatabaseFieldMapping', description: '订单明细表字段映射' }, + callback_mode: { type: 'integer', description: '回传单号方式:0不回传 1写回字段 2写回行' }, + callback_table: { type: 'string', description: '回传单号写回的目标表名' }, + callback_field: { type: 'string', description: '写回字段方式:运单号写入的列名' }, + callback_key_field: { type: 'string', description: '写回字段方式:定位订单行的列名(一般是订单号列)' }, + callback_separator: { type: 'string', description: '写回字段方式:多包裹运单号的间隔符' }, + callback_fields: { type: 'shopDatabaseFieldMapping', description: '写回行方式:{ 回传值: 目标列名 }' }, }, shopDatabaseTableItem: { name: { type: 'string', description: '表名' }, diff --git a/backend/app/controller/shopDatabase.js b/backend/app/controller/shopDatabase.js index 1f16c82..067111c 100644 --- a/backend/app/controller/shopDatabase.js +++ b/backend/app/controller/shopDatabase.js @@ -6,6 +6,12 @@ const { DEFAULT_DB_TYPE, DATASETS, datasetDefs, + CALLBACK_MODES, + CALLBACK_MODE_OFF, + CALLBACK_MODE_FIELD, + CALLBACK_MODE_ROW, + DEFAULT_CALLBACK_SEPARATOR, + CALLBACK_FIELDS, } = require('../lib/shopDatabaseFields'); const { SAFE_IDENTIFIER, @@ -123,6 +129,12 @@ class ShopDatabaseController extends Controller { product_fields: plain.product_fields || {}, order_fields: plain.order_fields || {}, order_item_fields: plain.order_item_fields || {}, + callback_mode: plain.callback_mode == null ? CALLBACK_MODE_OFF : Number(plain.callback_mode), + callback_table: plain.callback_table || '', + callback_field: plain.callback_field || '', + callback_key_field: plain.callback_key_field || '', + callback_separator: plain.callback_separator || DEFAULT_CALLBACK_SEPARATOR, + callback_fields: plain.callback_fields || {}, last_test_at: plain.last_test_at || null, last_test_success: plain.last_test_success == null ? null : Number(plain.last_test_success), last_test_message: plain.last_test_message || '', @@ -150,6 +162,9 @@ class ShopDatabaseController extends Controller { config: this.toView(config, shop), db_types: DB_TYPES, datasets: datasetDefs(), + callback_modes: CALLBACK_MODES, + callback_fields: CALLBACK_FIELDS, + default_callback_separator: DEFAULT_CALLBACK_SEPARATOR, }, }; } @@ -193,14 +208,70 @@ class ShopDatabaseController extends Controller { return result; } + /** + * 校验并整理「回传单号」设置 + * @param {Object} body 请求体 + * @return {{error?: string, value?: Object}} 校验结果 + */ + resolveCallback(body) { + const input = body || {}; + const mode = Number(input.callback_mode == null ? CALLBACK_MODE_OFF : input.callback_mode); + if (![ CALLBACK_MODE_OFF, CALLBACK_MODE_FIELD, CALLBACK_MODE_ROW ].includes(mode)) { + return { error: '回传单号方式仅支持:0 不回传 / 1 写回字段 / 2 写回行' }; + } + const value = { + callback_mode: mode, + callback_table: '', + callback_field: '', + callback_key_field: '', + callback_separator: '', + callback_fields: {}, + }; + if (mode === CALLBACK_MODE_OFF) return { value }; + + const table = String(input.callback_table || '').trim(); + if (!table) return { error: '回传单号:请选择写回的目标表' }; + if (!SAFE_IDENTIFIER.test(table)) return { error: '回传单号:目标表名不合法' }; + value.callback_table = table; + + if (mode === CALLBACK_MODE_FIELD) { + const field = String(input.callback_field || '').trim(); + const keyField = String(input.callback_key_field || '').trim(); + if (!field) return { error: '回传单号:请选择运单号写入的字段' }; + if (!keyField) return { error: '回传单号:请选择定位订单行的字段(订单号列)' }; + if (!SAFE_IDENTIFIER.test(field) || !SAFE_IDENTIFIER.test(keyField)) { + return { error: '回传单号:字段名不合法' }; + } + value.callback_field = field; + value.callback_key_field = keyField; + value.callback_separator = String(input.callback_separator == null ? '' : input.callback_separator).slice(0, 10); + return { value }; + } + + const raw = input.callback_fields && typeof input.callback_fields === 'object' ? input.callback_fields : {}; + const allowed = new Set(CALLBACK_FIELDS.map(field => field.key)); + for (const key of Object.keys(raw)) { + if (!allowed.has(key)) return { error: `回传单号:不支持的回传值 ${key}` }; + } + const cleaned = this.cleanMapping(raw); + const missing = CALLBACK_FIELDS + .filter(field => field.required) + .filter(field => !cleaned[field.key]) + .map(field => field.label); + if (missing.length) return { error: `回传单号:请完成必填映射(${missing.join('、')})` }; + value.callback_fields = cleaned; + return { value }; + } + /** * 连库校验:表是否存在、映射列是否存在于对应表 * @param {Object} params 连接参数 * @param {Object} tables 三张数据集选表结果 { product_table: 表名 ... } * @param {Object} mappings 三张数据集映射 { product_fields: {...} ... } + * @param {Object} [callback] 回传单号设置 * @return {Promise<{ok: boolean, connected: boolean, message?: string}>} 校验结果(connected 表示是否连上了库) */ - async verifyAgainstDatabase(params, tables, mappings) { + async verifyAgainstDatabase(params, tables, mappings, callback) { let conn = null; try { conn = await openConnection(params); @@ -232,6 +303,26 @@ class ShopDatabaseController extends Controller { } } } + // 回传单号:目标表与列同样要校验存在 + if (callback && Number(callback.callback_mode) && callback.callback_table) { + const table = callback.callback_table; + if (!names.has(table)) { + return { ok: false, connected: true, message: `回传单号:库中不存在表 ${table},请重新连接后选择` }; + } + if (!columnsByTable.has(table)) { + const rows = await listColumns(conn, params, table); + columnsByTable.set(table, new Set(rows.map(row => row.name))); + } + const columns = columnsByTable.get(table); + const checks = Number(callback.callback_mode) === CALLBACK_MODE_FIELD + ? [[ '运单号字段', callback.callback_field ], [ '定位字段', callback.callback_key_field ]] + : CALLBACK_FIELDS.map(field => [ field.label, (callback.callback_fields || {})[field.key] ]); + for (const [ label, column ] of checks) { + if (column && !columns.has(column)) { + return { ok: false, connected: true, message: `回传单号:${label} 映射的列 ${column} 不存在` }; + } + } + } return { ok: true, connected: true }; } catch (err) { return { @@ -294,9 +385,17 @@ class ShopDatabaseController extends Controller { mappings[dataset.fieldColumn] = this.cleanMapping(body[dataset.fieldColumn]); } + // 回传单号设置(发货确认后把运单号写回客户库) + const callback = this.resolveCallback(body); + if (callback.error) { + ctx.status = 400; + ctx.body = { code: 400, message: callback.error }; + return; + } + // 能连上就校验表/列是否真实存在:连上但校验不过直接拒绝(避免存下跑不通的映射); // 连不上时仍保存连接信息,便于先存配置再排查网络 - const verified = await this.verifyAgainstDatabase(params, tables, mappings); + const verified = await this.verifyAgainstDatabase(params, tables, mappings, callback.value); if (verified.connected && !verified.ok) { ctx.status = 400; ctx.body = { code: 400, message: verified.message }; @@ -313,6 +412,7 @@ class ShopDatabaseController extends Controller { password: params.password, ...tables, ...mappings, + ...callback.value, last_test_at: new Date(), last_test_success: verified.ok ? 1 : 0, last_test_message: String(verified.ok ? '配置保存成功,表与字段校验通过' : verified.message).slice(0, 500), diff --git a/backend/app/lib/orderCallback.js b/backend/app/lib/orderCallback.js index 25790a5..a70ee5d 100644 --- a/backend/app/lib/orderCallback.js +++ b/backend/app/lib/orderCallback.js @@ -866,7 +866,13 @@ async function confirmDelivery(ctx, { principalId, warehouseId, data }) { // 新表(order_index + 状态表):委外中 → 配送(扣减锁定库存),已配送幂等回执 if (resolved.isNewModel) { - return confirmOrderStatusDelivery(ctx, { resolved, payload, packages, lines, pkgInfo }); + const result = await confirmOrderStatusDelivery(ctx, { resolved, payload, packages, lines, pkgInfo }); + if (result.ok) { + await writeBackShopWaybills(ctx, resolved.order, pkgInfo, { + orderNo: resolved.order.parent_order_no || resolved.index.order_no, + }); + } + return result; } // 幂等:已完成(4) 直接回成功,不再流转状态、不重复扣减库存(外部重复推送同一报文时返回相同结果) @@ -884,6 +890,7 @@ async function confirmDelivery(ctx, { principalId, warehouseId, data }) { stock_locked: Number(order.stock_locked) === 1, }; ctx.logger.info('[order-callback] 发货单已完成,跳过(幂等回执)', done); + await writeBackShopWaybills(ctx, order, pkgInfo); return { ok: true, message: 'ok', data: done }; } if (Number(order.status) !== DELIVERY_STATUS_PUSHED) { @@ -931,9 +938,83 @@ async function confirmDelivery(ctx, { principalId, warehouseId, data }) { line_count: lines.length, }; ctx.logger.info('[order-callback] 发货确认完成', result); + await writeBackShopWaybills(ctx, order, pkgInfo); return { ok: true, message: 'ok', data: result }; } +/** + * 推导源订单号(数据库店铺回传单号时用于定位客户库中的订单行) + * 新表取 parent_order_no(拉单时写入的平台/源单号),老表取 source_order_codes 首个 + * @param {Object} order 订单实例 + * @return {String} 源订单号(取不到返回空串) + */ +function guessSourceOrderNo(order) { + if (!order) return ''; + if (order.parent_order_no) return String(order.parent_order_no).trim(); + const raw = order.source_order_codes; + if (Array.isArray(raw) && raw.length) return String(raw[0]).trim(); + if (typeof raw === 'string' && raw) { + try { + const parsed = JSON.parse(raw); + if (Array.isArray(parsed) && parsed.length) return String(parsed[0]).trim(); + } catch (err) { + // 非 JSON 时按单值处理 + return raw.trim(); + } + } + return ''; +} + +/** + * 数据库店铺(shops.type=3)回传单号:发货确认拿到运单号后写回客户自有库 + * 只对数据库店铺生效;未开启回传/配置缺失/调用失败都只记日志,不影响发货确认本身 + * @param {Object} ctx egg context + * @param {Object} order 订单实例(状态表行 / order_deliveries) + * @param {Object} pkgInfo 运单号与快递解析结果(express_code / express_codes / logistics_*) + * @param {Object} [options] 可选参数 + * @param {String} [options.orderNo] 源订单号(缺省按实例字段推导) + * @return {Promise} 回传结果(无需回传时返回 null) + */ +async function writeBackShopWaybills(ctx, order, pkgInfo, { orderNo } = {}) { + const shopId = Number(order && order.shop_id); + if (!shopId) return null; + + const codes = []; + if (pkgInfo && Array.isArray(pkgInfo.express_codes)) { + for (const code of pkgInfo.express_codes) { + const text = String(code == null ? '' : code).trim(); + if (text && !codes.includes(text)) codes.push(text); + } + } + const single = String((pkgInfo && pkgInfo.express_code) || '').trim(); + if (single && !codes.includes(single)) codes.push(single); + if (!codes.length) return null; + + const shop = await ctx.model.Shop.findByPk(shopId, { attributes: [ 'id', 'principal_id', 'type' ] }); + if (!shop || Number(shop.type) !== 3) return null; + + const sourceOrderNo = String(orderNo || guessSourceOrderNo(order)).trim(); + if (!sourceOrderNo) return null; + + try { + const result = await ctx.service.shopDatabaseSync.writeBackWaybills(shop, { + orderNo: sourceOrderNo, + waybills: codes, + expressCode: (pkgInfo && pkgInfo.logistics_code) || single, + expressName: pkgInfo && pkgInfo.logistics_name, + }); + if (result.written) { + ctx.logger.info(`[order-callback] 数据库店铺 ${shop.id} 回传单号(订单 ${sourceOrderNo}):${codes.join(',')}`); + } else { + ctx.logger.info(`[order-callback] 数据库店铺 ${shop.id} 跳过回传单号:${result.reason}`); + } + return result; + } catch (err) { + ctx.logger.warn(`[order-callback] 数据库店铺 ${shop.id} 回传单号失败:${err.message}`); + return null; + } +} + /** * 定位发货单(订单):先查新表(order_index.order_no → 对应状态表),再回退老表(order_deliveries) * @param {Object} ctx egg context diff --git a/backend/app/lib/shopDatabaseFields.js b/backend/app/lib/shopDatabaseFields.js index 3066abf..9785215 100644 --- a/backend/app/lib/shopDatabaseFields.js +++ b/backend/app/lib/shopDatabaseFields.js @@ -71,6 +71,34 @@ const DATASETS = { }, }; +/** + * 回传单号(运单号写回客户库)的两种方式 + * - field:把运单号写回某个表的一个字段(多包裹用间隔符合并成一个字符串) + * - row:把运单号写回某个表的一行(多包裹一个运单一行) + */ +const CALLBACK_MODES = [ + { value: 0, label: '不回传' }, + { value: 1, label: '写回字段' }, + { value: 2, label: '写回行' }, +]; +const CALLBACK_MODE_OFF = 0; +const CALLBACK_MODE_FIELD = 1; +const CALLBACK_MODE_ROW = 2; +/** 写回字段默认的多包裹间隔符 */ +const DEFAULT_CALLBACK_SEPARATOR = ','; + +/** + * 「写回行」可映射的 OMS 回传值:每项都要指定写进源表的哪一列 + * - order_no:源订单号(拉单时写入的 external_order_id),同时作为定位已有行的条件 + */ +const CALLBACK_FIELDS = [ + { key: 'order_no', label: '订单号(定位行)', required: true }, + { key: 'waybill_no', label: '运单号', required: true }, + { key: 'express_code', label: '快递公司编码', required: false }, + { key: 'express_name', label: '快递公司名称', required: false }, + { key: 'synced_at', label: '回传时间', required: false }, +]; + /** * 供接口返回给前端的字段定义(含必填标记与保存列名,前端据此渲染映射表单) * @return {Array} 三组字段定义 @@ -85,4 +113,16 @@ function datasetDefs() { })); } -module.exports = { DB_TYPES, DEFAULT_DB_TYPE, DEFAULT_PORT, DATASETS, datasetDefs }; +module.exports = { + DB_TYPES, + DEFAULT_DB_TYPE, + DEFAULT_PORT, + DATASETS, + datasetDefs, + CALLBACK_MODES, + CALLBACK_MODE_OFF, + CALLBACK_MODE_FIELD, + CALLBACK_MODE_ROW, + DEFAULT_CALLBACK_SEPARATOR, + CALLBACK_FIELDS, +}; diff --git a/backend/app/model/shopDatabaseConfig.js b/backend/app/model/shopDatabaseConfig.js index 9a9540d..f0b7a03 100644 --- a/backend/app/model/shopDatabaseConfig.js +++ b/backend/app/model/shopDatabaseConfig.js @@ -28,6 +28,12 @@ module.exports = app => { product_fields: { type: JSONTYPE, comment: '商品表字段映射:{ oms字段: 源列名 }' }, order_fields: { type: JSONTYPE, comment: '订单表字段映射:{ oms字段: 源列名 }' }, order_item_fields: { type: JSONTYPE, comment: '订单明细表字段映射:{ oms字段: 源列名 }' }, + callback_mode: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 0, comment: '回传单号方式:0不回传 1写回字段 2写回行' }, + callback_table: { type: STRING(100), comment: '回传单号的目标表名' }, + callback_field: { type: STRING(100), comment: '写回字段方式:运单号写入的列名' }, + callback_key_field: { type: STRING(100), comment: '写回字段方式:定位行的列名(一般是订单号列)' }, + callback_separator: { type: STRING(10), comment: '写回字段方式:多包裹运单号的间隔符' }, + callback_fields: { type: JSONTYPE, comment: '写回行方式:{ oms回传值: 目标列名 }' }, last_test_at: { type: DATE, comment: '最近一次测试连通时间' }, last_test_success: { type: TINYINT, comment: '最近一次测试结果:1成功 0失败' }, last_test_message: { type: STRING(500), comment: '最近一次测试结果说明' }, diff --git a/backend/app/service/shopDatabaseSync.js b/backend/app/service/shopDatabaseSync.js index aa4691e..86df50c 100644 --- a/backend/app/service/shopDatabaseSync.js +++ b/backend/app/service/shopDatabaseSync.js @@ -3,8 +3,9 @@ const { Service } = require('egg'); const { ORDER_STATUS } = require('../lib/orderStatus'); const { buildSnapshot } = require('../lib/orderItemExpand'); -const { DEFAULT_DB_TYPE, DEFAULT_PORT, DATASETS } = require('../lib/shopDatabaseFields'); +const { DEFAULT_DB_TYPE, DEFAULT_PORT, DATASETS, CALLBACK_MODE_FIELD, CALLBACK_MODE_ROW, DEFAULT_CALLBACK_SEPARATOR } = require('../lib/shopDatabaseFields'); const { + SAFE_IDENTIFIER, normalizeParams, validateParams, openConnection, @@ -40,6 +41,18 @@ function buildProductInfo(lines) { })); } +/** + * 回传时间格式化(客户库多为 datetime 列,统一写 'YYYY-MM-DD HH:mm:ss') + * @param {Date} date 时间 + * @return {string} 本地时间字符串 + */ +function formatLocalDateTime(date) { + const d = date instanceof Date ? date : new Date(date); + const pad = n => String(n).padStart(2, '0'); + return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ` + + `${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`; +} + /** * 数据库店铺(shops.type=3)拉取服务 * @@ -498,6 +511,102 @@ class ShopDatabaseSyncService extends Service { }; } + /** + * 回传单号:把发货确认拿到的运单号写回客户自有库 + * + * 支持两种方式(见 CALLBACK_MODES): + * 1 写回字段:UPDATE 目标表 SET 运单号字段 = '单号1,单号2' WHERE 定位字段 = 订单号; + * 2 写回行:按订单号先删后插,多包裹每个运单号一行(重复回传不会产生重复行)。 + * 未开启回传、缺少表/列配置、订单号或运单号为空时直接返回未写入。 + * @param {Object} shop 店铺实例(需含 id / principal_id) + * @param {Object} payload 回传数据 + * @param {string} payload.orderNo 源订单号(拉单时写入的 external_order_id) + * @param {Array} payload.waybills 运单号集合 + * @param {string} [payload.expressCode] 快递公司编码 + * @param {string} [payload.expressName] 快递公司名称 + * @param {Date} [payload.syncedAt] 回传时间(默认当前时间) + * @return {Promise<{written: boolean, mode?: number, reason?: string, affected?: number, rows?: number}>} 写入结果 + */ + async writeBackWaybills(shop, payload = {}) { + const { ctx } = this; + const orderNo = String(payload.orderNo == null ? '' : payload.orderNo).trim(); + const waybills = (payload.waybills || []) + .map(item => String(item == null ? '' : item).trim()) + .filter(Boolean); + if (!orderNo || !waybills.length) { + return { written: false, reason: '缺少订单号或运单号' }; + } + + const config = await ctx.model.ShopDatabaseConfig.findOne({ where: { shop_id: shop.id } }); + const mode = config ? Number(config.callback_mode || 0) : 0; + if (!config || !mode) return { written: false, reason: '未开启回传单号' }; + if (!config.callback_table || !SAFE_IDENTIFIER.test(config.callback_table)) { + return { written: false, reason: '回传单号:目标表未配置' }; + } + const params = this.paramsOf(config); + const paramsError = validateParams(params); + if (paramsError) return { written: false, reason: `数据库配置不完整:${paramsError}` }; + + const expressCode = truncateText(payload.expressCode, 50); + const expressName = truncateText(payload.expressName, 200); + const syncedAt = payload.syncedAt ? new Date(payload.syncedAt) : new Date(); + + let conn = null; + try { + conn = await openConnection(params); + const table = conn.escapeId(config.callback_table); + + if (mode === CALLBACK_MODE_FIELD) { + const field = config.callback_field; + const keyField = config.callback_key_field; + if (!field || !keyField || !SAFE_IDENTIFIER.test(field) || !SAFE_IDENTIFIER.test(keyField)) { + return { written: false, reason: '回传单号:运单号字段或定位字段未配置' }; + } + const separator = config.callback_separator || DEFAULT_CALLBACK_SEPARATOR; + const [ res ] = await conn.query( + `UPDATE ${table} SET ${conn.escapeId(field)} = ? WHERE ${conn.escapeId(keyField)} = ?`, + [ waybills.join(separator), orderNo ] + ); + if (!res.affectedRows) { + ctx.logger.warn(`[shop-database] 店铺 ${shop.id} 回传单号未命中订单行:${orderNo}`); + } + return { written: true, mode, affected: res.affectedRows || 0 }; + } + + if (mode !== CALLBACK_MODE_ROW) return { written: false, reason: `不支持的回传方式:${mode}` }; + + const mapping = config.callback_fields && typeof config.callback_fields === 'object' ? config.callback_fields : {}; + const keyField = mapping.order_no; + if (!keyField || !SAFE_IDENTIFIER.test(keyField)) { + return { written: false, reason: '回传单号:未配置订单号列' }; + } + const values = waybill => ({ + order_no: orderNo, + waybill_no: waybill, + express_code: expressCode, + express_name: expressName, + synced_at: formatLocalDateTime(syncedAt), + }); + const keys = Object.keys(mapping).filter(key => SAFE_IDENTIFIER.test(mapping[key])); + if (!keys.length) return { written: false, reason: '回传单号:未配置任何回传列' }; + + // 先删后插:同一订单重复回传(含包裹数变化)不会留下重复行 + await conn.query(`DELETE FROM ${table} WHERE ${conn.escapeId(keyField)} = ?`, [ orderNo ]); + const columns = keys.map(key => conn.escapeId(mapping[key])).join(', '); + const placeholders = keys.map(() => '?').join(', '); + for (const waybill of waybills) { + const row = values(waybill); + await conn.query( + `INSERT INTO ${table} (${columns}) VALUES (${placeholders})`, + keys.map(key => row[key]) + ); + } + return { written: true, mode, rows: waybills.length }; + } finally { + await closeQuietly(conn); + } + } + /** * 回写店铺最近拉单时间与结果 * @param {Object} shop 店铺实例 diff --git a/backend/database/migrations/20261105083000-add-callback-to-shop-database-configs.js b/backend/database/migrations/20261105083000-add-callback-to-shop-database-configs.js new file mode 100644 index 0000000..bfeeb81 --- /dev/null +++ b/backend/database/migrations/20261105083000-add-callback-to-shop-database-configs.js @@ -0,0 +1,58 @@ +'use strict'; + +/** + * 数据库店铺(shops.type=3)增加「回传单号」设置 + * + * 发货确认(WMS 回推运单号)后,把运单号写回客户自有库,支持两种方式: + * 1 写回字段:选择表 + 运单号字段(多包裹时按 callback_separator 合并)+ 定位字段(订单号列) + * 2 写回行:选择表 + 每个回传值对应的列(订单号列同时作为定位条件,先删后插保证幂等) + * callback_mode=0 表示不回传。 + */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.addColumn('shop_database_configs', 'callback_mode', { + type: Sequelize.TINYINT.UNSIGNED, + allowNull: false, + defaultValue: 0, + comment: '回传单号方式:0不回传 1写回字段 2写回行', + }); + await queryInterface.addColumn('shop_database_configs', 'callback_table', { + type: Sequelize.STRING(100), + allowNull: true, + comment: '回传单号的目标表名', + }); + await queryInterface.addColumn('shop_database_configs', 'callback_field', { + type: Sequelize.STRING(100), + allowNull: true, + comment: '写回字段方式:运单号写入的列名', + }); + await queryInterface.addColumn('shop_database_configs', 'callback_key_field', { + type: Sequelize.STRING(100), + allowNull: true, + comment: '写回字段方式:定位行的列名(一般是订单号列)', + }); + await queryInterface.addColumn('shop_database_configs', 'callback_separator', { + type: Sequelize.STRING(10), + allowNull: true, + comment: '写回字段方式:多包裹运单号的间隔符', + }); + await queryInterface.addColumn('shop_database_configs', 'callback_fields', { + type: Sequelize.JSON, + allowNull: true, + comment: '写回行方式:{ oms回传值: 目标列名 },order_no 列同时用于定位已有行', + }); + }, + + async down(queryInterface) { + for (const column of [ + 'callback_mode', + 'callback_table', + 'callback_field', + 'callback_key_field', + 'callback_separator', + 'callback_fields', + ]) { + await queryInterface.removeColumn('shop_database_configs', column); + } + }, +}; diff --git a/frontend/src/api/shopDatabase.ts b/frontend/src/api/shopDatabase.ts index 0c78be5..61b9dd5 100644 --- a/frontend/src/api/shopDatabase.ts +++ b/frontend/src/api/shopDatabase.ts @@ -28,6 +28,12 @@ export interface ShopDatabaseDataset { /** OMS 字段 → 源表列名 */ export type ShopDatabaseFieldMapping = Record +/** 回传单号方式选项 */ +export interface ShopDatabaseCallbackMode { + value: number + label: string +} + /** 数据库店铺配置(密码不回显) */ export interface ShopDatabaseConfig { shop_id: number @@ -44,6 +50,13 @@ export interface ShopDatabaseConfig { product_fields: ShopDatabaseFieldMapping order_fields: ShopDatabaseFieldMapping order_item_fields: ShopDatabaseFieldMapping + /** 回传单号方式:0不回传 1写回字段 2写回行 */ + callback_mode: number + callback_table: string + callback_field: string + callback_key_field: string + callback_separator: string + callback_fields: ShopDatabaseFieldMapping last_test_at?: string | null last_test_success?: number | null last_test_message?: string @@ -67,6 +80,12 @@ export interface ShopDatabaseSavePayload extends ShopDatabaseConnectionPayload { product_fields?: ShopDatabaseFieldMapping order_fields?: ShopDatabaseFieldMapping order_item_fields?: ShopDatabaseFieldMapping + callback_mode?: number + callback_table?: string + callback_field?: string + callback_key_field?: string + callback_separator?: string + callback_fields?: ShopDatabaseFieldMapping } /** 库内数据表 */ @@ -88,6 +107,9 @@ export function getShopDatabaseConfig(shopId: number) { config: ShopDatabaseConfig db_types: ShopDatabaseTypeOption[] datasets: ShopDatabaseDataset[] + callback_modes: ShopDatabaseCallbackMode[] + callback_fields: ShopDatabaseDatasetField[] + default_callback_separator: string }>(`/shops/${shopId}/database-config`) } diff --git a/frontend/src/views/Shop/Index.vue b/frontend/src/views/Shop/Index.vue index 3f2473d..f2acbcf 100644 --- a/frontend/src/views/Shop/Index.vue +++ b/frontend/src/views/Shop/Index.vue @@ -23,6 +23,8 @@ import { pullShopDatabaseProducts, pullShopDatabaseOrders, type ShopDatabaseDataset, + type ShopDatabaseDatasetField, + type ShopDatabaseCallbackMode, type ShopDatabaseFieldMapping, type ShopDatabaseTable, type ShopDatabaseColumn, @@ -264,6 +266,19 @@ const dbConnecting = ref(false) const dbConfigShop = ref<{ id: number; name: string } | null>(null) const dbTypes = ref([]) const dbDatasets = ref([]) +/** 回传单号:方式选项与可映射的回传值定义 */ +const dbCallbackModes = ref([]) +const dbCallbackFields = ref([]) +/** 回传单号设置(写回字段 / 写回行) */ +const dbCallback = reactive({ + mode: 0, + table: '', + field: '', + keyField: '', + separator: ',', +}) +/** 写回行的列映射:回传值 key → 目标列名 */ +const dbCallbackMapping = reactive({}) /** 表选项:连接成功后填充,供三张数据集选择 */ const dbTables = ref([]) /** 表名 → 字段列表(字段映射下拉用) */ @@ -310,9 +325,12 @@ async function openDatabaseConfig(row: { id: number; name: string }) { dbColumns.value = {} dbLastResult.value = { success: null, message: '', at: '' } try { - const { config, db_types: types, datasets } = await getShopDatabaseConfig(row.id) + const { config, db_types: types, datasets, callback_modes, callback_fields, default_callback_separator } = + await getShopDatabaseConfig(row.id) dbTypes.value = types dbDatasets.value = datasets + dbCallbackModes.value = callback_modes || [] + dbCallbackFields.value = callback_fields || [] dbForm.db_type = config.db_type || 'mysql' dbForm.host = config.host || '' dbForm.port = config.port ?? 3306 @@ -327,6 +345,14 @@ async function openDatabaseConfig(row: { id: number; name: string }) { const saved = (config as unknown as Record)[dataset.field_column] || {} dbMappings[dataset.key] = { ...saved } } + // 回传单号设置 + dbCallback.mode = Number(config.callback_mode || 0) + dbCallback.table = config.callback_table || '' + dbCallback.field = config.callback_field || '' + dbCallback.keyField = config.callback_key_field || config.order_fields?.order_no || '' + dbCallback.separator = config.callback_separator || default_callback_separator || ',' + for (const key of Object.keys(dbCallbackMapping)) delete dbCallbackMapping[key] + Object.assign(dbCallbackMapping, { ...(config.callback_fields || {}) }) if (config.last_test_at) { dbLastResult.value = { success: config.last_test_success === 1, @@ -351,7 +377,7 @@ async function loadSavedTables() { try { const { tables } = await getShopDatabaseTables(dbConfigShop.value.id) dbTables.value = tables - await ensureColumns([ dbForm.product_table, dbForm.order_table, dbForm.order_item_table ]) + await ensureColumns([ dbForm.product_table, dbForm.order_table, dbForm.order_item_table, dbCallback.table ]) } catch { dbTables.value = [] } @@ -407,6 +433,30 @@ function columnsOf(dataset: ShopDatabaseDataset): ShopDatabaseColumn[] { return table ? (dbColumns.value[table] || []) : [] } +/* -------------------- 回传单号设置 -------------------- */ +/** 回传目标表的字段选项 */ +const dbCallbackColumns = computed(() => + dbCallback.table ? (dbColumns.value[dbCallback.table] || []) : [], +) + +/** 切换回传目标表:清空已选字段并拉取该表字段 */ +async function onCallbackTableChange(value: string | null) { + const table = value || '' + if (table === dbCallback.table) return + dbCallback.table = table + dbCallback.field = '' + // 写回字段的定位列跟随目标表的订单号列选择,切表后需要重选 + dbCallback.keyField = '' + for (const key of Object.keys(dbCallbackMapping)) delete dbCallbackMapping[key] + await ensureColumns([ table ]) +} + +/** 写入 / 清空写回行的单个列映射 */ +function setCallbackMapping(key: string, value: string | null) { + if (value) dbCallbackMapping[key] = value + else delete dbCallbackMapping[key] +} + /** 测试连通(服务端连接) */ async function handleTestConnection() { if (!dbConfigShop.value) return @@ -432,7 +482,7 @@ async function handleConnect() { dbTables.value = res.tables || [] dbLastResult.value = { success: true, message: `连接成功,共 ${dbTables.value.length} 张表`, at: formatDateTime(new Date()) } ElMessage.success(`连接成功,共 ${dbTables.value.length} 张表`) - await ensureColumns([ dbForm.product_table, dbForm.order_table, dbForm.order_item_table ]) + await ensureColumns([ dbForm.product_table, dbForm.order_table, dbForm.order_item_table, dbCallback.table ]) } catch { // 拦截器已提示 } finally { @@ -440,7 +490,23 @@ async function handleConnect() { } } -/** 保存配置:连接信息 + 选表 + 字段映射 */ +/** 校验回传单号设置,返回错误提示(通过返回空串) */ +function validateCallbackSetting(): string { + if (!dbCallback.mode) return '' + if (!dbCallback.table) return '回传单号:请选择写回的目标表' + if (dbCallback.mode === 1) { + if (!dbCallback.field) return '回传单号:请选择运单号写入的字段' + if (!dbCallback.keyField) return '回传单号:请选择定位订单行的字段(订单号列)' + return '' + } + const missing = dbCallbackFields.value + .filter(field => field.required) + .filter(field => !dbCallbackMapping[field.key]) + .map(field => field.label) + return missing.length ? `回传单号:请完成必填映射(${missing.join('、')})` : '' +} + +/** 保存配置:连接信息 + 选表 + 字段映射 + 回传单号设置 */ async function handleSaveDatabaseConfig() { if (!dbConfigShop.value) return for (const dataset of dbDatasets.value) { @@ -457,6 +523,11 @@ async function handleSaveDatabaseConfig() { return } } + const callbackError = validateCallbackSetting() + if (callbackError) { + ElMessage.warning(callbackError) + return + } dbConfigSaving.value = true try { const res = await saveShopDatabaseConfig(dbConfigShop.value.id, { @@ -467,6 +538,12 @@ async function handleSaveDatabaseConfig() { product_fields: dbMappings.product || {}, order_fields: dbMappings.order || {}, order_item_fields: dbMappings.order_item || {}, + callback_mode: dbCallback.mode, + callback_table: dbCallback.mode ? dbCallback.table : '', + callback_field: dbCallback.mode === 1 ? dbCallback.field : '', + callback_key_field: dbCallback.mode === 1 ? dbCallback.keyField : '', + callback_separator: dbCallback.mode === 1 ? dbCallback.separator : '', + callback_fields: dbCallback.mode === 2 ? { ...dbCallbackMapping } : {}, }) ElMessage.success(res.verified ? '配置已保存' : '配置已保存(库不可达,未完成连库校验)') dbLastResult.value = { success: res.verified, message: '配置已保存', at: formatDateTime(new Date()) } @@ -1112,6 +1189,115 @@ onMounted(() => { + + 回传单号 +
+ + + + + {{ m.label }} + + + + + + + + + + + + + + + + + +