diff --git a/package-lock.json b/package-lock.json index 405c79b..ae4071c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -523,6 +523,23 @@ "node": ">=18" } }, + "node_modules/@faker-js/faker": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-10.2.0.tgz", + "integrity": "sha512-rTXwAsIxpCqzUnZvrxVh3L0QA0NzToqWBLAhV+zDV3MIIwiQhAZHMdPCIaj5n/yADu/tyk12wIPgL6YHGXJP+g==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/fakerjs" + } + ], + "license": "MIT", + "peer": true, + "engines": { + "node": "^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0", + "npm": ">=10" + } + }, "node_modules/@hapi/bourne": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/@hapi/bourne/-/bourne-3.0.0.tgz", diff --git a/src/adapter/woocommerce.adapter.ts b/src/adapter/woocommerce.adapter.ts index e3ffcaa..9fe5549 100644 --- a/src/adapter/woocommerce.adapter.ts +++ b/src/adapter/woocommerce.adapter.ts @@ -408,13 +408,11 @@ export class WooCommerceAdapter implements ISiteAdapter { // 包含账单地址与收货地址以及创建与更新时间 // 映射物流追踪信息,将后端格式转换为前端期望的格式 - const fulfillments = (item.fulfillments || []).map((track: any) => ({ - tracking_number: track.tracking_number || '', - shipping_provider: track.shipping_provider || '', - shipping_method: track.shipping_method || '', - status: track.status || '', - date_created: track.date_created || '', - items: track.items || [], + const fulfillments = (item.fulfillments || []).map((track) => ({ + tracking_id: track.tracking_id, + tracking_number: track.tracking_number, + shipping_provider: track.tracking_provider, + date_created: track.data_sipped, })); return { diff --git a/src/dto/site-api.dto.ts b/src/dto/site-api.dto.ts index b02cd43..a5b2fc7 100644 --- a/src/dto/site-api.dto.ts +++ b/src/dto/site-api.dto.ts @@ -799,14 +799,16 @@ export class UpdateWebhookDTO { export class FulfillmentItemDTO { - @ApiProperty({ description: '订单项ID' }) + @ApiProperty({ description: '订单项ID' ,required: false}) order_item_id: number; - @ApiProperty({ description: '数量' }) + @ApiProperty({ description: '数量' ,required:false}) quantity: number; } export class FulfillmentDTO { + @ApiProperty({ description: '物流id', required: false }) + tracking_id?: string; @ApiProperty({ description: '物流单号', required: false }) tracking_number?: string; diff --git a/src/dto/woocommerce.dto.ts b/src/dto/woocommerce.dto.ts index f042838..1490dba 100644 --- a/src/dto/woocommerce.dto.ts +++ b/src/dto/woocommerce.dto.ts @@ -370,17 +370,15 @@ export interface WooOrder { date_modified?: string; date_modified_gmt?: string; // 物流追踪信息 - fulfillments?: Array<{ - tracking_number?: string; - shipping_provider?: string; - shipping_method?: string; - status?: string; - date_created?: string; - items?: Array<{ - order_item_id?: number; - quantity?: number; - }>; - }>; + fulfillments?: WooFulfillment[]; +} +// 这个是一个插件的物流追踪信息 +export interface WooFulfillment { + data_sipped: string; + tracking_id: string; + tracking_link: string; + tracking_number: string; + tracking_provider: string; } export interface WooOrderRefund { id?: number;