yoone
/
API
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(logistics): 修复物流服务中订单状态和唯一ID的赋值逻辑 #58

Merged
longbot merged 3 commits from zhuotianyuan/API:div into stable 2026-01-22 06:53:18 +00:00
Conversation 0 Commits 3 Files Changed 3 +26 -26
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a25a685a5 - Show all commits

22
src/service/logistics.service.ts
View File

@ -141,7 +141,7 @@ export class LogisticsService {
}
//"expressFinish": 0, //是否快递创建完成（1：完成 0：未完成，需要轮询 2:失败）
//"expressFinish": 0, //是否快递创建完成（1：完成 0：未完成，需要轮询 2:失败）
async updateFreightwavesShipmentState(shipment: Shipment) {
try {
const data = await this.freightwavesService.queryOrder({ shipOrderId: shipment.order_id.toString() });
@ -372,7 +372,7 @@ export class LogisticsService {
// }
// }
resShipmentOrder =await this.mepShipment(data,order);
resShipmentOrder = await this.mepShipment(data, order);
// if (data.shipmentPlatform === 'uniuni') {
// // 添加运单
@ -385,7 +385,7 @@ export class LogisticsService {
// }
// 记录物流信息,并将订单状态转到完成
if (resShipmentOrder.status === 'SUCCESS'||resShipmentOrder.code === '00000200') {
if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') {
order.orderStatus = ErpOrderStatus.COMPLETED;
} else {
throw new Error('运单生成失败');
@ -398,14 +398,14 @@ export class LogisticsService {
const shipmentRepo = manager.getRepository(Shipment);
const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数
let co:any;
let unique_id:any;
let state:any;
let co: any;
let unique_id: any;
let state: any;
if (data.shipmentPlatform === 'uniuni') {
co = resShipmentOrder.data.tno;
unique_id = resShipmentOrder.data.uni_order_sn;
state = resShipmentOrder.data.uni_status_code;
}else{
} else {
co = resShipmentOrder.data?.shipOrderId;
unique_id = resShipmentOrder.data?.shipOrderId;
state = ErpOrderStatus.COMPLETED;
@ -433,7 +433,7 @@ export class LogisticsService {
}
// 同步订单状态到woocommerce
if(order.source_type!="shopyy"){
if (order.source_type != "shopyy") {
if (order.status !== OrderStatus.COMPLETED) {
await this.wpService.updateOrder(site, order.externalOrderId, {
status: OrderStatus.COMPLETED,
@ -693,7 +693,7 @@ export class LogisticsService {
async mepShipment(data: ShipmentBookDTO,order:Order) {
async mepShipment(data: ShipmentBookDTO, order: Order) {
try {
const stock_point = await this.stockPointModel.findOneBy({ id: data.stockPointId });
let resShipmentOrder;
@ -735,7 +735,7 @@ export class LogisticsService {
// 根据TMS系统对接说明文档格式化参数
const reqBody: any = {
shipCompany: 'UPSYYZ7000NEW',
partnerOrderNumber: order.siteId+'-'+order.externalOrderId ,
partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
warehouseId: '25072621030107400060',
shipper: {
name: data.details.origin.contact_name, // 姓名
@ -778,7 +778,7 @@ export class LogisticsService {
weightUnit: (data.details.packaging_properties.packages[0].measurements.weight.unit === 'kg' ? 'KG' : 'LB') as 'KG' | 'LB' // 重量单位（LB,KG）
},
currency: 'CAD', // 币种（默认CAD）
description: '订单编号:'+order.externalOrderId // 包裹描述（确保是字符串类型）
description: '订单编号:' + order.externalOrderId // 包裹描述（确保是字符串类型）
}
],
signService: 0