From 0ea834218de9d92497d0c6fd28cadf9ae78d0a03 Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 13 Jan 2026 19:25:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(shopyy):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正shopyy服务中获取所有订单的参数映射逻辑，添加支付时间范围支持
统一处理日期格式转换，确保参数正确传递
同时清理合并冲突标记和冗余代码
---
 src/adapter/shopyy.adapter.ts       |  4 ++--
 src/dto/api.dto.ts                  | 17 +++++++++++++++++
 src/service/freightwaves.service.ts |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

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'
       });