feat(order): 手工录入运单号支持指定快递编码(express_code 同步订单快递信息)

This commit is contained in:
liufumingren 2026-09-30 03:08:52 +08:00
parent 576eb1b2e8
commit 8c50bcd6b7

View File

@ -6624,6 +6624,49 @@ class PendingOrderService extends OrderBaseService {
const logisticsInterfaceName = String(requestData.logistics_interface_name || '').trim() || null;
// 1.1 可选参数:快递编码。传入时参考 updateOrderExpress 的行为,同步修改订单的快递信息
const expressCodeRaw = String(requestData.express_code || '').trim();
let expressResolved = null;
if (expressCodeRaw) {
// 使用带缓存的仓库快递列表
const expressList = await this.service.systems.express.getExpressList();
const expressItem = Array.isArray(expressList)
? expressList.find(item => String(item.code || item.value || '').trim() === expressCodeRaw)
: null;
if (!expressItem) {
throw new Error(`快递编码 ${expressCodeRaw} 不存在`);
}
let sysLogisticsCode;
let sysLogisticsName;
let logisticsCode;
let logisticsName;
if (expressItem.is_system_setting) {
// 自定义映射:express_code 字段存储对应的系统快递编码
sysLogisticsCode = String(expressItem.express_code || '').trim();
// 系统快递名称从列表中查找
const sysItem = expressList.find(item => !item.is_system_setting && String(item.code || '').trim() === sysLogisticsCode);
sysLogisticsName = sysItem ? String(sysItem.name || '').trim() : sysLogisticsCode;
logisticsCode = expressItem.code;
logisticsName = String(expressItem.alias || expressItem.name || '').trim();
} else {
// 系统快递:logistics_code/name 与 sys 一致
sysLogisticsCode = expressItem.code;
sysLogisticsName = String(expressItem.name || '').trim();
logisticsCode = expressItem.code;
logisticsName = sysLogisticsName;
}
expressResolved = {
sysLogisticsCode,
sysLogisticsName,
logisticsCode,
logisticsName,
};
}
// 2. 查询订单并校验状态(待处理:step in [1,2,3] 且 outbound_status != 'padding')
const model = await this.getOrderModel('order', warehouseId);
const where = this.buildOrderWhere([ orderId ], warehouseId);
@ -6684,8 +6727,12 @@ class PendingOrderService extends OrderBaseService {
order_id: orderId,
waybill_code: waybillCode,
logistics_interface_name: logisticsInterfaceName,
logistics_code: String(order.sys_logistics_code || '').trim() || null,
logistics_name: String(order.sys_logistics_name || '').trim() || null,
logistics_code: expressResolved
? expressResolved.logisticsCode
: String(order.sys_logistics_code || '').trim() || null,
logistics_name: expressResolved
? expressResolved.logisticsName
: String(order.sys_logistics_name || '').trim() || null,
delivery_order_code: String(order.delivery_order_code || '').trim() || null,
source_order_codes: String(order.source_order_codes || '').trim() || null,
warehouse_id: Number(order.warehouse_id) || warehouseId,
@ -6695,13 +6742,22 @@ class PendingOrderService extends OrderBaseService {
create_at: new Date(),
});
// 3.2 更新订单表的 print_status 与 post_status 为 'fin',表示外部已打印
// 3.2 更新订单表的 print_status 与 post_status 为 'fin',表示外部已打印;
// 若传入了 express_code,同步修改订单的快递信息(与 updateOrderExpress 口径一致)
const orderUpdateFields = {
print_status: 'fin',
post_status: 'fin',
updated_at: new Date(),
};
if (expressResolved) {
orderUpdateFields.sys_logistics_code = expressResolved.sysLogisticsCode;
orderUpdateFields.sys_logistics_name = expressResolved.sysLogisticsName;
orderUpdateFields.logistics_code = expressResolved.logisticsCode;
orderUpdateFields.logistics_name = expressResolved.logisticsName;
}
await model.update(
{
print_status: 'fin',
post_status: 'fin',
updated_at: new Date(),
},
orderUpdateFields,
{
where: {
id: orderId,
@ -6723,7 +6779,14 @@ class PendingOrderService extends OrderBaseService {
logisticsInterfaceName,
businessKey: nextBusinessKey,
expressRecordId: expressRecord.id,
message: `手工录入运单号:订单 ${orderId},运单号 ${waybillCode}`,
expressCode: expressCodeRaw || null,
sysLogisticsCode: expressResolved ? expressResolved.sysLogisticsCode : String(order.sys_logistics_code || '').trim() || null,
sysLogisticsName: expressResolved ? expressResolved.sysLogisticsName : String(order.sys_logistics_name || '').trim() || null,
logisticsCode: expressResolved ? expressResolved.logisticsCode : String(order.sys_logistics_code || '').trim() || null,
logisticsName: expressResolved ? expressResolved.logisticsName : String(order.sys_logistics_name || '').trim() || null,
message: expressResolved
? `手工录入运单号:订单 ${orderId},运单号 ${waybillCode},快递 ${expressResolved.logisticsCode}(${expressResolved.logisticsName})`
: `手工录入运单号:订单 ${orderId},运单号 ${waybillCode}`,
},
beforeChanges: null,
});
@ -6757,14 +6820,23 @@ class PendingOrderService extends OrderBaseService {
);
}
return this.success('ok', {
const result = {
id: expressRecord.id,
order_id: orderId,
waybill_code: waybillCode,
business_key: nextBusinessKey,
logistics_interface_name: logisticsInterfaceName,
create_at: expressRecord.create_at,
});
};
if (expressResolved) {
result.express_code = expressCodeRaw;
result.sys_logistics_code = expressResolved.sysLogisticsCode;
result.sys_logistics_name = expressResolved.sysLogisticsName;
result.logistics_code = expressResolved.logisticsCode;
result.logistics_name = expressResolved.logisticsName;
}
return this.success('ok', result);
}
/**