Compare commits
3 Commits
87a6d40802
...
7a25a685a5
| Author | SHA1 | Date |
|---|---|---|
|
|
7a25a685a5 | |
|
|
c592310fa9 | |
|
|
acecd3bef4 |
|
|
@ -399,10 +399,16 @@ export class LogisticsService {
|
||||||
const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数
|
const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数
|
||||||
|
|
||||||
let co: any;
|
let co: any;
|
||||||
|
let unique_id: any;
|
||||||
|
let state: any;
|
||||||
if (data.shipmentPlatform === 'uniuni') {
|
if (data.shipmentPlatform === 'uniuni') {
|
||||||
co = resShipmentOrder.data.tno;
|
co = resShipmentOrder.data.tno;
|
||||||
|
unique_id = resShipmentOrder.data.uni_order_sn;
|
||||||
|
state = resShipmentOrder.data.uni_status_code;
|
||||||
} else {
|
} else {
|
||||||
co = resShipmentOrder.data?.shipOrderId;
|
co = resShipmentOrder.data?.shipOrderId;
|
||||||
|
unique_id = resShipmentOrder.data?.shipOrderId;
|
||||||
|
state = ErpOrderStatus.COMPLETED;
|
||||||
}
|
}
|
||||||
// 同步物流信息到woocommerce
|
// 同步物流信息到woocommerce
|
||||||
const site = await this.siteService.get(Number(order.siteId), true);
|
const site = await this.siteService.get(Number(order.siteId), true);
|
||||||
|
|
@ -415,10 +421,10 @@ export class LogisticsService {
|
||||||
const shipment = await shipmentRepo.save({
|
const shipment = await shipmentRepo.save({
|
||||||
tracking_provider: tracking_provider,
|
tracking_provider: tracking_provider,
|
||||||
tracking_id: res.data.tracking_id,
|
tracking_id: res.data.tracking_id,
|
||||||
unique_id: resShipmentOrder.data.uni_order_sn,
|
unique_id: unique_id,
|
||||||
stockPointId: String(data.stockPointId), // todo
|
stockPointId: String(data.stockPointId), // todo
|
||||||
state: resShipmentOrder.data.uni_status_code,
|
state: state,
|
||||||
return_tracking_number: resShipmentOrder.data.tno,
|
return_tracking_number: co,
|
||||||
fee: data.details.shipmentFee,
|
fee: data.details.shipmentFee,
|
||||||
order: order
|
order: order
|
||||||
});
|
});
|
||||||
|
|
@ -729,7 +735,7 @@ export class LogisticsService {
|
||||||
// 根据TMS系统对接说明文档格式化参数
|
// 根据TMS系统对接说明文档格式化参数
|
||||||
const reqBody: any = {
|
const reqBody: any = {
|
||||||
shipCompany: 'UPSYYZ7000NEW',
|
shipCompany: 'UPSYYZ7000NEW',
|
||||||
partnerOrderNumber: order.externalOrderId ,
|
partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
|
||||||
warehouseId: '25072621030107400060',
|
warehouseId: '25072621030107400060',
|
||||||
shipper: {
|
shipper: {
|
||||||
name: data.details.origin.contact_name, // 姓名
|
name: data.details.origin.contact_name, // 姓名
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue