fix(order_express): 包材批量绑定适配 current+dispatch 双表查询

修复波次团购包材批量绑定只查 current 表导致 dispatch 表订单遗漏的问题:
- bindExpressPackageMaterialByWaybill: 波次检测改为 current→dispatch 双表遍历
- _bindWavePackageMaterialByBusinessKey: 波次订单查询改为双表合并去重
- _getStoreName / _getWaveSysLogisticsName: 货主/物流名查询改为双表遍历
- _upsertPackageMaterialItemRelation: items_hash 查询改为双表遍历
- _updateSingleOrderWeight: items_weight 读取改为双表遍历
This commit is contained in:
liufumingren 2026-07-16 20:19:03 +08:00
parent 16d5f18fa1
commit 391ab87112

View File

@ -690,17 +690,27 @@ class OrderExpressService extends Service {
return '';
}
const { Op } = this.app.Sequelize;
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const orderRow = await orderDeliveryModel.findOne({
where: {
id: { [Op.in]: orderIds },
warehouse_id: warehouseId,
shop_nick: { [Op.ne]: null },
},
attributes: [ 'shop_nick' ],
raw: true,
});
return orderRow ? String(orderRow.shop_nick || '').trim() : '';
const tableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findOne !== 'function') continue;
const orderRow = await model.findOne({
where: {
id: { [Op.in]: orderIds },
warehouse_id: warehouseId,
shop_nick: { [Op.ne]: null },
},
attributes: [ 'shop_nick' ],
raw: true,
});
if (orderRow) return String(orderRow.shop_nick || '').trim();
} catch (_err) { continue; }
}
return '';
} catch (_err) {
return '';
}
@ -722,17 +732,27 @@ class OrderExpressService extends Service {
return '';
}
const { Op } = this.app.Sequelize;
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const orderRow = await orderDeliveryModel.findOne({
where: {
id: { [Op.in]: orderIds },
warehouse_id: warehouseId,
sys_logistics_name: { [Op.ne]: null },
},
attributes: [ 'sys_logistics_name' ],
raw: true,
});
return orderRow ? String(orderRow.sys_logistics_name || '').trim() : '';
const tableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findOne !== 'function') continue;
const orderRow = await model.findOne({
where: {
id: { [Op.in]: orderIds },
warehouse_id: warehouseId,
sys_logistics_name: { [Op.ne]: null },
},
attributes: [ 'sys_logistics_name' ],
raw: true,
});
if (orderRow) return String(orderRow.sys_logistics_name || '').trim();
} catch (_err) { continue; }
}
return '';
} catch (_err) {
return '';
}
@ -792,18 +812,28 @@ class OrderExpressService extends Service {
});
// 从订单表读取当前 items_weight(只读,不做 UPDATE)
// 依次查 current / dispatch 两张表
let itemsWeight = 0;
if (warehouseId) {
try {
const orderDeliveryFactory = this.ctx.model && this.ctx.model.OrderDeliveryFactory;
if (orderDeliveryFactory && typeof orderDeliveryFactory.getCurrentModel === 'function') {
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const orderRow = await orderDeliveryModel.findOne({
where: { id: Number(targetRow.order_id), warehouse_id: warehouseId },
attributes: [ 'items_weight' ],
raw: true,
});
itemsWeight = orderRow ? Number(orderRow.items_weight || 0) : 0;
const tableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findOne !== 'function') continue;
const orderRow = await model.findOne({
where: { id: Number(targetRow.order_id), warehouse_id: warehouseId },
attributes: [ 'items_weight' ],
raw: true,
});
if (orderRow) { itemsWeight = Number(orderRow.items_weight || 0); break; }
} catch (_err) { continue; }
}
}
} catch (_err) {
// 查询失败时静默降级为 0
@ -1131,16 +1161,28 @@ class OrderExpressService extends Service {
async _upsertPackageMaterialItemRelation({ orderId, waybillCode, packageMaterialId, packageMaterialCode, packageMaterialName, warehouseId }) {
const { ctx } = this;
try {
// 1. 查订单的 items_hash / items_crc
// 1. 查订单的 items_hash / items_crc(依次查 current / dispatch 两张表)
const orderDeliveryFactory = ctx.model && ctx.model.OrderDeliveryFactory;
if (!orderDeliveryFactory || typeof orderDeliveryFactory.getCurrentModel !== 'function') return;
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const orderRow = await orderDeliveryModel.findOne({
where: { id: orderId, warehouse_id: warehouseId },
attributes: [ 'items_hash', 'items_crc' ],
raw: true,
});
const tableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
let orderRow = null;
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findOne !== 'function') continue;
const row = await model.findOne({
where: { id: orderId, warehouse_id: warehouseId },
attributes: [ 'items_hash', 'items_crc' ],
raw: true,
});
if (row) { orderRow = row; break; }
} catch (_err) { continue; }
}
if (!orderRow || !orderRow.items_hash) return;
const { items_hash: itemsHash, items_crc: itemsCrc } = orderRow;
@ -1329,16 +1371,28 @@ class OrderExpressService extends Service {
const materialRow = await this.findActivePackageMaterialById(normalizedPackageMaterialId, warehouseId);
// --- 团购波次自动感知 ---
// 尝试查询运单所属订单是否属于团购波次
// 依次查询 current / dispatch 表获取波次信息
const orderDeliveryFactory = this.ctx.model && this.ctx.model.OrderDeliveryFactory;
if (orderDeliveryFactory && typeof orderDeliveryFactory.getCurrentModel === 'function') {
try {
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const orderRow = await orderDeliveryModel.findOne({
where: { id: Number(orderExpressRow.order_id), warehouse_id: warehouseId },
attributes: [ 'id', 'wave_id', 'wave_no' ],
raw: true,
});
const orderTableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
let orderRow = null;
for (const entry of orderTableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findOne !== 'function') continue;
const row = await model.findOne({
where: { id: Number(orderExpressRow.order_id), warehouse_id: warehouseId },
attributes: [ 'id', 'wave_id', 'wave_no' ],
raw: true,
});
if (row) { orderRow = row; break; }
} catch (_err) { continue; }
}
if (orderRow) {
const waveId = Number(orderRow.wave_id || 0);
@ -1499,24 +1553,38 @@ class OrderExpressService extends Service {
triggerOrderId,
triggerWaybillCode,
}) {
// 1. 查询波次下所有订单
// 1. 查询波次下所有订单(current + dispatch 两张表)
const orderDeliveryFactory = this.ctx.model && this.ctx.model.OrderDeliveryFactory;
if (!orderDeliveryFactory || typeof orderDeliveryFactory.getCurrentModel !== 'function') {
throw this.createBusinessError('订单模型未初始化', 500);
}
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
const waveOrders = await orderDeliveryModel.findAll({
where: { wave_id: waveId, warehouse_id: warehouseId },
attributes: [ 'id' ],
raw: true,
});
const tableOrders = [
{ label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) },
];
if (!waveOrders || waveOrders.length === 0) {
const orderIdSet = new Set();
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.findAll !== 'function') continue;
const rows = await model.findAll({
where: { wave_id: waveId, warehouse_id: warehouseId },
attributes: [ 'id' ],
raw: true,
});
if (Array.isArray(rows)) {
rows.forEach(r => orderIdSet.add(Number(r.id)));
}
} catch (_err) { continue; }
}
if (orderIdSet.size === 0) {
throw this.createBusinessError('波次下未找到订单', 404);
}
const orderIds = waveOrders.map(o => Number(o.id));
const orderIds = Array.from(orderIdSet);
// 2. 查询这些订单下相同 business_key 的所有有效运单
const { Op } = this.app.Sequelize;