diff --git a/src/dto/logistics.dto.ts b/src/dto/logistics.dto.ts index 48841db..f0bd6ba 100644 --- a/src/dto/logistics.dto.ts +++ b/src/dto/logistics.dto.ts @@ -25,7 +25,7 @@ export class ShipmentBookDTO { shipmentPlatform: string; @ApiProperty() - @Rule(RuleType.string()) + @Rule(RuleType.any()) courierCompany: string; } diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 07815aa..046ccd9 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -733,15 +733,10 @@ export class LogisticsService { } if (data.shipmentPlatform === 'freightwaves') { - - let courierCompany: string = ""; - if (data.courierCompany != "最优物流") { - courierCompany = data.courierCompany; - } // 根据TMS系统对接说明文档格式化参数 const reqBody: any = { // shipCompany: 'UPSYYZ7000NEW', - shipCompany: courierCompany, + shipCompany: data.courierCompany, partnerOrderNumber: order.siteId + '-' + order.externalOrderId, warehouseId: '25072621030107400060', shipper: { @@ -822,11 +817,7 @@ export class LogisticsService { } - /** - * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式 - * @param data ShipmentFeeBookDTO数据 - * @returns RateTryRequest格式的数据 - */ + /** * 将ShipmentFeeBookDTO转换为freightwaves的RateTryRequest格式 * @param data ShipmentFeeBookDTO数据 @@ -841,14 +832,10 @@ export class LogisticsService { }) const address = shipments?.address; - let courierCompany: string = ""; - if (data.courierCompany != "最优物流") { - courierCompany = data.courierCompany; - } // 转换为RateTryRequest格式 const r = { // shipCompany: 'UPSYYZ7000NEW', - shipCompany: courierCompany, + shipCompany: data.courierCompany, partnerOrderNumber: `order-${Date.now()}`, // 必填,使用时间戳生成 warehouseId: '25072621030107400060', // 可选,使用stockPointId转换 shipper: {