diff --git a/src/adapter/shopyy.adapter.ts b/src/adapter/shopyy.adapter.ts index 1e1af3b..aa515f8 100644 --- a/src/adapter/shopyy.adapter.ts +++ b/src/adapter/shopyy.adapter.ts @@ -574,8 +574,8 @@ export class ShopyyAdapter implements ISiteAdapter { } mapGetAllOrdersParams(params: UnifiedSearchParamsDTO) :ShopyyGetAllOrdersParams{ - const pay_at_min = dayjs(params.after || '').unix().toString(); - const pay_at_max = dayjs(params.before || '').unix().toString(); + const pay_at_min = dayjs(params.after || '').valueOf().toString(); + const pay_at_max = dayjs(params.before || '').valueOf().toString(); return { per_page: params.per_page || 100, diff --git a/src/dto/api.dto.ts b/src/dto/api.dto.ts index b681336..93de5f8 100644 --- a/src/dto/api.dto.ts +++ b/src/dto/api.dto.ts @@ -76,6 +76,23 @@ export class ShopyyGetAllOrdersParams { order_field?: string;//排序字段(默认id) id=订单ID updated_at=最后更新时间 pay_at=支付时间 } +/** + * Shopyy获取所有订单参数DTO + */ +export class ShopyyGetAllOrdersParams { + @ApiProperty({ description: '页码', example: 1, required: false }) + page?: number; + + @ApiProperty({ description: '每页数量', example: 20, required: false }) + per_page?: number; + + @ApiProperty({ description: '支付时间范围开始', example: '2023-01-01T00:00:00Z', required: false }) + pay_at_min?: string; + + @ApiProperty({ description: '支付时间范围结束', example: '2023-01-01T23:59:59Z', required: false }) + pay_at_max?: string; +} + /** * 批量操作错误项 */ diff --git a/src/service/freightwaves.service.ts b/src/service/freightwaves.service.ts index 10900ef..bcd6ca5 100644 --- a/src/service/freightwaves.service.ts +++ b/src/service/freightwaves.service.ts @@ -423,7 +423,7 @@ export class FreightwavesService { // 设置必要的配置 this.setConfig({ appSecret: 'gELCHguGmdTLo!zfihfM91hae8G@9Sz23Mh6pHrt', - apiBaseUrl: 'https://tms.freightwaves.ca', + apiBaseUrl: 'https://console-mock.apipost.cn/mock/0', partner: '25072621035200000060' });