forked from yoone/API
fix(logistics): 修复货运平台courierCompany字段处理逻辑
当courierCompany为"最优物流"时设置为空字符串,否则使用原值
This commit is contained in:
parent
5fa5ed21b0
commit
5488e1b7c6
|
|
@ -734,10 +734,15 @@ export class LogisticsService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.shipmentPlatform === 'freightwaves') {
|
if (data.shipmentPlatform === 'freightwaves') {
|
||||||
|
|
||||||
|
let courierCompany: string = "";
|
||||||
|
if (data.courierCompany != "最优物流") {
|
||||||
|
courierCompany = data.courierCompany;
|
||||||
|
}
|
||||||
// 根据TMS系统对接说明文档格式化参数
|
// 根据TMS系统对接说明文档格式化参数
|
||||||
const reqBody: any = {
|
const reqBody: any = {
|
||||||
// shipCompany: 'UPSYYZ7000NEW',
|
// shipCompany: 'UPSYYZ7000NEW',
|
||||||
shipCompany: data.courierCompany || "",
|
shipCompany: courierCompany,
|
||||||
partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
|
partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
|
||||||
warehouseId: '25072621030107400060',
|
warehouseId: '25072621030107400060',
|
||||||
shipper: {
|
shipper: {
|
||||||
|
|
@ -831,12 +836,15 @@ export class LogisticsService {
|
||||||
id: data.address_id,
|
id: data.address_id,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const address = shipments?.address;
|
const address = shipments?.address;
|
||||||
|
let courierCompany: string = "";
|
||||||
|
if (data.courierCompany != "最优物流") {
|
||||||
|
courierCompany = data.courierCompany;
|
||||||
|
}
|
||||||
// 转换为RateTryRequest格式
|
// 转换为RateTryRequest格式
|
||||||
const r = {
|
const r = {
|
||||||
//shipCompany: 'UPSYYZ7000NEW', // 必填,但ShipmentFeeBookDTO中缺少
|
//shipCompany: 'UPSYYZ7000NEW', // 必填,但ShipmentFeeBookDTO中缺少
|
||||||
shipCompany: data.courierCompany || "",
|
shipCompany: courierCompany,
|
||||||
partnerOrderNumber: `order-${Date.now()}`, // 必填,使用时间戳生成
|
partnerOrderNumber: `order-${Date.now()}`, // 必填,使用时间戳生成
|
||||||
warehouseId: '25072621030107400060', // 可选,使用stockPointId转换
|
warehouseId: '25072621030107400060', // 可选,使用stockPointId转换
|
||||||
shipper: {
|
shipper: {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue