fix(logistics): 修复物流服务中的错误处理和快递公司字段 #67

Merged
zhuotianyuan merged 2 commits from zhuotianyuan/API:main into main 2026-01-27 11:31:45 +00:00
1 changed files with 9 additions and 5 deletions
Showing only changes of commit 1657b96694 - Show all commits

View File

@ -464,7 +464,7 @@ export class LogisticsService {
} }
}; };
} catch (error) { } catch (error) {
if (resShipmentOrder.status === 'SUCCESS') { if (resShipmentOrder?.status === 'SUCCESS') {
await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno); await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno);
} }
throw new Error(`上游请求错误:${error}`); throw new Error(`上游请求错误:${error}`);
@ -735,7 +735,7 @@ export class LogisticsService {
const reqBody: any = { const reqBody: any = {
// shipCompany: 'UPSYYZ7000NEW', // shipCompany: 'UPSYYZ7000NEW',
shipCompany: data.courierCompany || "", shipCompany: data.courierCompany || "",
partnerOrderNumber: order.siteId + '-' + order.externalOrderId, partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
warehouseId: '25072621030107400060', warehouseId: '25072621030107400060',
shipper: { shipper: {
name: data.details.origin.contact_name, // 姓名 name: data.details.origin.contact_name, // 姓名
@ -802,13 +802,17 @@ export class LogisticsService {
//tms只返回了物流订单号需要查询一次来获取完整的物流信息 //tms只返回了物流订单号需要查询一次来获取完整的物流信息
const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单 const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单
resShipmentOrder.push(queryRes); return {
...resShipmentOrder,
...queryRes
}
} }
return resShipmentOrder; return resShipmentOrder;
} catch (error) { } catch (error) {
console.log('物流订单处理失败:', error); // 使用console.log代替this.log // 处理错误,例如记录日志或抛出异常
throw error; throw new Error(`物流订单处理失败: ${error}`);
} }
} }