feat(expressPlatform): 面单下单参数补全

- 菠萝派平台启用 ismultiplepieces/logisticno 并放开体积重量等参数
- 修复 PDD/QT/OTHER 面单回写 orderno 十六进制仓库ID转十进制
- 补全 businesstype/platcode/length/width/height/weight 与 ordertime
- SF 场景 customercode 置空, oaid 含横杠视为超长回退 caid
This commit is contained in:
liufumingren 2026-08-21 02:20:31 +08:00
parent eca309d41f
commit e0b2cf3030

View File

@ -708,8 +708,8 @@ class ExpressPlatformService extends MainService {
orderno: `${order.warehouse_id.toString(16)}_${order.id}_${order_tmp.business_key}`, // 菠萝派平台要求订单号必须为字符串 orderno: `${order.warehouse_id.toString(16)}_${order.id}_${order_tmp.business_key}`, // 菠萝派平台要求订单号必须为字符串
plattradeno: listByWarehousePlatformCode.platform_code === 'DY' && order.from_key === 23060081 && !!order.pay_no ? order.pay_no : order.source_order_codes || order.delivery_order_code || '', plattradeno: listByWarehousePlatformCode.platform_code === 'DY' && order.from_key === 23060081 && !!order.pay_no ? order.pay_no : order.source_order_codes || order.delivery_order_code || '',
tid:listByWarehousePlatformCode.platform_code === 'DY' && order.from_key === 23060081 && !!order.pay_no ? order.pay_no : order.source_order_codes || order.delivery_order_code || '', tid:listByWarehousePlatformCode.platform_code === 'DY' && order.from_key === 23060081 && !!order.pay_no ? order.pay_no : order.source_order_codes || order.delivery_order_code || '',
//ismultiplepieces: order.package_count > 1 ? 1 : 0, ismultiplepieces: order.package_count > 1 ? 1 : 0,
//logisticno: allocatedWaybillMap.get(`${Number(order.id) || 0}:${Number(order_tmp.business_key) || 0}`) || '', logisticno: allocatedWaybillMap.get(`${Number(order.id) || 0}:${Number(order_tmp.business_key) || 0}`) || '',
logistictype: expressListItem[listByWarehousePlatformCode.platform_code] || '', logistictype: expressListItem[listByWarehousePlatformCode.platform_code] || '',
providercode: expressListItem[listByWarehousePlatformCode.platform_code] || order.logistics_code || '', providercode: expressListItem[listByWarehousePlatformCode.platform_code] || order.logistics_code || '',
numpackage: order.package_count || '1', numpackage: order.package_count || '1',
@ -718,26 +718,31 @@ class ExpressPlatformService extends MainService {
transtypecode:'1', transtypecode:'1',
mainsubpaymode:'1', mainsubpaymode:'1',
businessplat: order.sys_platform_code === 'KS' ? order.sys_platform_code : 'OTHERS', businessplat: order.sys_platform_code === 'KS' ? order.sys_platform_code : 'OTHERS',
paymode: listByWarehousePlatformCode.paymode.toString() ?? '1', paymode: '1',
ordertype: listByWarehousePlatformCode.ordertype ?? 'JH_Normal', ordertype: listByWarehousePlatformCode.ordertype ?? 'JH_Normal',
ProviderID:'', ProviderID:'',
//procode: order.procode || '普通商品', procode: order.procode || '普通商品',
//codpaymoney: order.ar_amount ?? null, codpaymoney: order.ar_amount ?? null,
//packagemoney: order.item_amount ?? null, packagemoney: order.item_amount ?? null,
//weight: Number(order.items_weight) || 0, // 单位 g,需确认 PolyAPI 期望单位 weight: Number(order.items_weight) || 0, // 单位 g,需确认 PolyAPI 期望单位
//supporpaymoney: order.total_amount ?? null, supporpaymoney: order.total_amount ?? null,
//ispickup: listByWarehousePlatformCode.ispickup ?? 0, length: Number(order.length) || 0,
//ProductType: listByWarehousePlatformCode.product_type || '', width: Number(order.width) || 0,
//Sipshopid: listByWarehousePlatformCode.platform_shop_id || '', height: Number(order.height) || 0,
volume: Number(order.volume) || 0,
ispickup: listByWarehousePlatformCode.ispickup ?? 0,
ProductType: listByWarehousePlatformCode.product_type || '',
Sipshopid: listByWarehousePlatformCode.platform_shop_id || '',
oaid: order.oaid || '', oaid: order.oaid || '',
cpcode: expressListItem[listByWarehousePlatformCode.platform_code] || '', cpcode: expressListItem[listByWarehousePlatformCode.platform_code] || '',
logisticsproductname: 'JH_02', logisticsproductname: 'JH_02',
//dmssorting: 0, dmssorting: 0,
//brandno: listByWarehousePlatformCode.brandno || null, brandno: listByWarehousePlatformCode.brandno || null,
needencrypt: 1, needencrypt: 1,
ordertime: order.place_order_time || '',
customername:"测试", customername:"测试",
ordersource: matchedPlatform.ordersource || '', ordersource: matchedPlatform.ordersource || '',
//inputsite: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.site_code || '', inputsite: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.site_code || '',
sitecode: listByWarehousePlatformCode.site_code || '', sitecode: listByWarehousePlatformCode.site_code || '',
shipperno: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.shipperno || '', shipperno: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.shipperno || '',
customercode: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.shipperno || listByWarehousePlatformCode.client_id || '', customercode: order.sys_platform_code === 'XHS' ? '' :listByWarehousePlatformCode.shipperno || listByWarehousePlatformCode.client_id || '',
@ -776,8 +781,8 @@ class ExpressPlatformService extends MainService {
//Mallmaskid: '', //Mallmaskid: '',
template_url: listByWarehousePlatformCode.template_id || '', template_url: listByWarehousePlatformCode.template_id || '',
//labelformat: listByWarehousePlatformCode.labelformat || '', labelformat: listByWarehousePlatformCode.labelformat || '',
//extraInfo: ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code)?.polyapi_extra_info || '', extraInfo: ExpressList.find(item => item.code === listByWarehousePlatformCode.sys_express_code)?.polyapi_extra_info || '',
}; };
console.log('matchedPlatform.platid', matchedPlatform.platid); console.log('matchedPlatform.platid', matchedPlatform.platid);
console.log('startPlayload', playload); console.log('startPlayload', playload);
@ -836,11 +841,13 @@ class ExpressPlatformService extends MainService {
orderno, orderno,
plattradeno, plattradeno,
ProductType, ProductType,
businesstype:ProductType,
expresstype: ProductType, expresstype: ProductType,
logistictype, logistictype,
providercode: providercode || cpcode || logistictype || '', providercode: providercode || cpcode || logistictype || '',
numpackage, numpackage,
businessplat, businessplat,
platcode:plattradeno,
mainsubpaymode: '1', mainsubpaymode: '1',
ordertype, ordertype,
businessType: businessType || ordertype || 'JH_Normal', businessType: businessType || ordertype || 'JH_Normal',
@ -855,7 +862,7 @@ class ExpressPlatformService extends MainService {
customername, customername,
goods, goods,
oaid, oaid,
customercode: customercode || shipperno || listByWarehousePlatformCode.shipperno || listByWarehousePlatformCode.client_id || '', customercode: logistictype==="SF" ? undefined: customercode || shipperno || listByWarehousePlatformCode.shipperno || listByWarehousePlatformCode.client_id || '',
sender: { sender: {
name: senderName, name: senderName,
phone: senderPhoneRaw, phone: senderPhoneRaw,
@ -1302,7 +1309,8 @@ class ExpressPlatformService extends MainService {
} }
case 'PDD': case 'PDD':
successUpdates = (result.results || []).map(item => { successUpdates = (result.results || []).map(item => {
const [ warehouse_id, order_id, business_key ] = String(item.orderno || '').split('_'); const [ warehouse_id_hex, order_id, business_key ] = String(item.orderno || '').split('_');
const warehouse_id = parseInt(warehouse_id_hex, 16);
const waybillCode = resolveWaybillCode(item); const waybillCode = resolveWaybillCode(item);
return { return {
warehouse_id, warehouse_id,
@ -1337,7 +1345,8 @@ class ExpressPlatformService extends MainService {
case 'QT': case 'QT':
case 'OTHER': case 'OTHER':
successUpdates = (result.results || []).map(item => { successUpdates = (result.results || []).map(item => {
const [ warehouse_id, order_id, business_key ] = String(item.orderno || '').split('_'); const [ warehouse_id_hex, order_id, business_key ] = String(item.orderno || '').split('_');
const warehouse_id = parseInt(warehouse_id_hex, 16);
const waybillCode = String(item.logisticno || item.waybill_code || '').trim(); const waybillCode = String(item.logisticno || item.waybill_code || '').trim();
return { return {
warehouse_id, warehouse_id,
@ -1761,7 +1770,7 @@ class ExpressPlatformService extends MainService {
: []; : [];
const recipientMobile = orderDelivery && (orderDelivery.mobile || orderDelivery.tel) || ''; const recipientMobile = orderDelivery && (orderDelivery.mobile || orderDelivery.tel) || '';
const orderDeliveryOaid = orderDelivery && orderDelivery.oaid ? String(orderDelivery.oaid).trim() : ''; const orderDeliveryOaid = orderDelivery && orderDelivery.oaid ? String(orderDelivery.oaid).trim() : '';
const oaidTooLong = orderDeliveryOaid.length > 128; const oaidTooLong = orderDeliveryOaid.indexOf("-") !== -1 || orderDeliveryOaid.length > 128;
const tradeOrderInfo = { const tradeOrderInfo = {
logistics_services: normalizedExtData, logistics_services: normalizedExtData,
@ -1785,6 +1794,10 @@ class ExpressPlatformService extends MainService {
})) || [], })) || [],
goods_description: '物品', goods_description: '物品',
id: `${orderDelivery.warehouse_id}_${orderDelivery.id}_${order_tmp.business_key}`, id: `${orderDelivery.warehouse_id}_${orderDelivery.id}_${order_tmp.business_key}`,
length:Number(orderDelivery.length || 1),
width:Number(orderDelivery.width || 1),
height:Number(orderDelivery.height || 1),
weight:Number(orderDelivery.items_weight || 1),
}, },
recipient: { recipient: {
address: { address: {
@ -1800,7 +1813,7 @@ class ExpressPlatformService extends MainService {
phone: recipientMobile, phone: recipientMobile,
oaid: oaidTooLong ? '' : orderDeliveryOaid, oaid: oaidTooLong ? '' : orderDeliveryOaid,
caid: oaidTooLong ? orderDeliveryOaid : '', caid: oaidTooLong ? orderDeliveryOaid : '',
tid: orderDelivery.pay_no || '', tid: orderDelivery.source_order_codes,
}, },
user_id: listByWarehousePlatformCode.shop && listByWarehousePlatformCode.shop.owner_id || 0, user_id: listByWarehousePlatformCode.shop && listByWarehousePlatformCode.shop.owner_id || 0,
notify_extend_info: normalizedExtData, notify_extend_info: normalizedExtData,