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 +11 -5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit acecd3bef4 - Show all commits

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

@ -398,11 +398,17 @@ export class LogisticsService {
const shipmentRepo = manager.getRepository(Shipment); const shipmentRepo = manager.getRepository(Shipment);
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, // 姓名