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 +65 -59
3 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/job/sync_tms.job.ts
View File

@ -15,20 +15,20 @@ export class SyncTmsJob implements IJob {
logger: ILogger;
@Inject()
logisticsService: LogisticsService;
logisticsService: LogisticsService;
@InjectEntityModel(Shipment)
shipmentModel: Repository<Shipment>
@InjectEntityModel(Shipment)
shipmentModel: Repository<Shipment>
async onTick() {
const shipments:Shipment[] = await this.shipmentModel.findBy({ tracking_provider: 'freightwaves',finished: false });
const results = await Promise.all(
shipments.map(async shipment => {
return await this.logisticsService.updateFreightwavesShipmentState(shipment);
})
)
this.logger.info(`更新运单状态完毕 ${JSON.stringify(results)}`);
return results
const shipments: Shipment[] = await this.shipmentModel.findBy({ tracking_provider: 'freightwaves', finished: false });
const results = await Promise.all(
shipments.map(async shipment => {
return await this.logisticsService.updateFreightwavesShipmentState(shipment);
})
)
this.logger.info(`更新运单状态完毕 ${JSON.stringify(results)}`);
return results
}
onComplete(result: any) {

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

@ -140,20 +140,20 @@ interface QueryOrderResponseData {
}
// 修改订单响应数据接口
interface ModifyOrderResponseData extends CreateOrderResponseData {}
interface ModifyOrderResponseData extends CreateOrderResponseData { }
// 订单退款响应数据接口
interface RefundOrderResponseData {}
interface RefundOrderResponseData { }
@Provide()
export class FreightwavesService {
@Inject() logger;
// 默认配置
// 默认配置
private config: FreightwavesConfig = {
appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt',
apiBaseUrl: 'http://tms.freightwaves.ca:8901/',
partner: '25072621035200000060'
apiBaseUrl: 'http://tms.freightwaves.ca:8901/',
partner: '25072621035200000060'
};
// 初始化配置
@ -180,11 +180,11 @@ export class FreightwavesService {
};
// 记录请求前的详细信息
console.log(`Sending request to: ${this.config.apiBaseUrl}${url}`,JSON.stringify({
console.log(`Sending request to: ${this.config.apiBaseUrl}${url}`, JSON.stringify({
headers,
data
}))
console.log('Request data:', `${this.config.apiBaseUrl}${url}`, data,headers);
console.log('Request data:', `${this.config.apiBaseUrl}${url}`, data, headers);
// 发送请求 - 临时禁用SSL证书验证以解决UNABLE_TO_VERIFY_LEAF_SIGNATURE错误
const response = await axios.post<FreightwavesResponse<T>>(
`${this.config.apiBaseUrl}${url}`,
@ -403,7 +403,7 @@ export class FreightwavesService {
// 注意：在实际环境中取消注释以下行来执行真实请求
const result = await this.createOrder(testParams);
this.log('创建订单成功:', result);
this.log('创建订单成功:', result);
// 返回模拟结果

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

@ -73,7 +73,7 @@ export class LogisticsService {
@Inject()
uniExpressService: UniExpressService;
@Inject()
@Inject()
freightwavesService: FreightwavesService;
@Inject()
@ -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() });
@ -151,9 +151,9 @@ export class LogisticsService {
throw new Error('获取运单状态失败,原因为' + data.expressFailMsg)
}
if (data.expressFinish === 0) {
shipment.state = '203';
shipment.finished = true;
if (data.expressFinish === 0) {
shipment.state = '203';
shipment.finished = true;
}
this.shipmentModel.save(shipment);
@ -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,12 +398,18 @@ export class LogisticsService {
const shipmentRepo = manager.getRepository(Shipment);
const tracking_provider = data.shipmentPlatform; // todo: id未确定,后写进常数
let co:any;
if (data.shipmentPlatform === 'uniuni') {
let co: any;
let unique_id: any;
let state: any;
if (data.shipmentPlatform === 'uniuni') {
co = resShipmentOrder.data.tno;
}else{
unique_id = resShipmentOrder.data.uni_order_sn;
state = resShipmentOrder.data.uni_status_code;
} else {
co = resShipmentOrder.data?.shipOrderId;
}
unique_id = resShipmentOrder.data?.shipOrderId;
state = ErpOrderStatus.COMPLETED;
}
// 同步物流信息到woocommerce
const site = await this.siteService.get(Number(order.siteId), true);
const res = await this.wpService.createFulfillment(site, order.externalOrderId, {
@ -415,10 +421,10 @@ export class LogisticsService {
const shipment = await shipmentRepo.save({
tracking_provider: tracking_provider,
tracking_id: res.data.tracking_id,
unique_id: resShipmentOrder.data.uni_order_sn,
unique_id: unique_id,
stockPointId: String(data.stockPointId), // todo
state: resShipmentOrder.data.uni_status_code,
return_tracking_number: resShipmentOrder.data.tno,
state: state,
return_tracking_number: co,
fee: data.details.shipmentFee,
order: order
});
@ -427,14 +433,14 @@ export class LogisticsService {
}
// 同步订单状态到woocommerce
if(order.source_type!="shopyy"){
if (order.status !== OrderStatus.COMPLETED) {
await this.wpService.updateOrder(site, order.externalOrderId, {
status: OrderStatus.COMPLETED,
});
order.status = OrderStatus.COMPLETED;
if (order.source_type != "shopyy") {
if (order.status !== OrderStatus.COMPLETED) {
await this.wpService.updateOrder(site, order.externalOrderId, {
status: OrderStatus.COMPLETED,
});
order.status = OrderStatus.COMPLETED;
}
}
}
order.orderStatus = ErpOrderStatus.COMPLETED;
@ -687,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;
@ -728,9 +734,9 @@ export class LogisticsService {
if (data.shipmentPlatform === 'freightwaves') {
// 根据TMS系统对接说明文档格式化参数
const reqBody: any = {
shipCompany: 'UPSYYZ7000NEW',
partnerOrderNumber: order.externalOrderId ,
warehouseId: '25072621030107400060',
shipCompany: 'UPSYYZ7000NEW',
partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
warehouseId: '25072621030107400060',
shipper: {
name: data.details.origin.contact_name, // 姓名
phone: data.details.origin.phone_number.number, // 电话（提取number属性转换为字符串）
@ -772,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