diff --git a/app/service/systems/express_platform.js b/app/service/systems/express_platform.js index b43d252..3312066 100644 --- a/app/service/systems/express_platform.js +++ b/app/service/systems/express_platform.js @@ -1854,6 +1854,13 @@ class ExpressPlatformService extends MainService { .map(item => String(item || '').trim()) .filter(Boolean) : []; + // tid 优先取订单表 oaid_order_source_code,为空/空字符串时兜底到原逻辑 + const oaidOrderSourceCodes = orderDelivery && orderDelivery.oaid_order_source_code + ? String(orderDelivery.oaid_order_source_code) + .split(',') + .map(item => String(item || '').trim()) + .filter(Boolean) + : []; const recipientMobile = orderDelivery && (orderDelivery.mobile || orderDelivery.tel) || ''; const orderDeliveryOaid = orderDelivery && orderDelivery.oaid ? String(orderDelivery.oaid).trim() : ''; const oaidTooLong = orderDeliveryOaid.indexOf('-') !== -1 || orderDeliveryOaid.length > 128; @@ -1899,9 +1906,11 @@ class ExpressPlatformService extends MainService { phone: recipientMobile, oaid: oaidTooLong ? '' : orderDeliveryOaid, caid: oaidTooLong ? orderDeliveryOaid : '', - tid: sourceOrderCodes.length > 0 - ? sourceOrderCodes[0] - : orderDelivery && orderDelivery.delivery_order_code || '', + tid: oaidOrderSourceCodes.length > 0 + ? oaidOrderSourceCodes[0] + : sourceOrderCodes.length > 0 + ? sourceOrderCodes[0] + : orderDelivery && orderDelivery.delivery_order_code || '', }, user_id: listByWarehousePlatformCode.shop && listByWarehousePlatformCode.shop.owner_id || 0, notify_extend_info: normalizedExtData,