diff --git a/src/adapter/shopyy.adapter.ts b/src/adapter/shopyy.adapter.ts index e3e0bda..3b6a4df 100644 --- a/src/adapter/shopyy.adapter.ts +++ b/src/adapter/shopyy.adapter.ts @@ -388,15 +388,14 @@ export class ShopyyAdapter implements ISiteAdapter { item.last_modified || (typeof item.updated_at === 'string' ? item.updated_at : ''), fulfillment_status, - fulfillments: item.fulfillments?.map?.((f) => ({ - id: f.id, - tracking_number: f.tracking_number || '', - shipping_provider: f.tracking_company || '', - shipping_method: f.tracking_company || '', - - date_created: typeof f.created_at === 'number' - ? new Date(f.created_at * 1000).toISOString() - : f.created_at || '', + fulfillments: item.fulfillments?.map?.((fulfillment) => ({ + id: fulfillment.id, + tracking_number: fulfillment.tracking_number || '', + shipping_provider: fulfillment.tracking_company || '', + shipping_method: fulfillment.tracking_company || '', + date_created: typeof fulfillment.created_at === 'number' + ? dayjs(fulfillment.created_at * 1000).toISOString() + : dayjs(fulfillment.created_at || '').toISOString(), // status: f.payment_tracking_status })) || [], raw: item, diff --git a/src/adapter/woocommerce.adapter.ts b/src/adapter/woocommerce.adapter.ts index c37ab3c..7faaff7 100644 --- a/src/adapter/woocommerce.adapter.ts +++ b/src/adapter/woocommerce.adapter.ts @@ -407,7 +407,7 @@ export class WooCommerceAdapter implements ISiteAdapter { tracking_number: track.tracking_number, tracking_product_code: track.tracking_product_code, shipping_provider: track.tracking_provider, - date_created: dayjs(track.date_shipped).toString(), + date_created: dayjs(Number(track.date_shipped)*1000).toISOString(), }) }); diff --git a/src/dto/woocommerce.dto.ts b/src/dto/woocommerce.dto.ts index 8fe99b1..e6faa11 100644 --- a/src/dto/woocommerce.dto.ts +++ b/src/dto/woocommerce.dto.ts @@ -373,7 +373,7 @@ export interface WooOrder { export interface MetaDataFulfillment { custom_tracking_link: string; custom_tracking_provider: string; - date_shipped: number; + date_shipped: string; source: string; status_shipped: string; tracking_id: string; diff --git a/src/service/order.service.ts b/src/service/order.service.ts index fb3baf1..7ce49da 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -1055,13 +1055,6 @@ export class OrderService { // 删除原始 ID delete item.id; - // 转换时间戳为日期格式 - if (item.date_created && typeof item.date_created === 'number') { - item.date_created = new Date(item.date_created * 1000); - } else if (item.date_created && typeof item.date_created === 'string') { - item.date_created = new Date(item.date_created); - } - // 创建履约实体 const fulfillment = plainToClass(OrderFulfillment, item);