From af1cebe29de44ed5cc67c6ff9acaff5e550f5feb Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Tue, 13 Jan 2026 19:26:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复订单同步接口调用参数错误
在同步表单中添加日期范围选择器
调整订单来源统计接口名称拼写错误
---
 src/components/SyncForm.tsx                | 28 ++++++++++++++++++++--
 src/pages/Order/List/index.tsx             | 23 +++++++++---------
 src/pages/Statistics/OrderSource/index.tsx |  4 ++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/components/SyncForm.tsx b/src/components/SyncForm.tsx
index dadb23a..334e90e 100644
--- a/src/components/SyncForm.tsx
+++ b/src/components/SyncForm.tsx
@@ -5,8 +5,10 @@ import {
   DrawerForm,
   ProForm,
   ProFormSelect,
+  ProFormDateRangePicker,
 } from '@ant-design/pro-components';
 import { Button } from 'antd';
+import dayjs from 'dayjs';
 import React from 'react';
 
 // 定义SyncForm组件的props类型
@@ -14,6 +16,7 @@ interface SyncFormProps {
   tableRef: React.MutableRefObject<ActionType | undefined>;
   onFinish: (values: any) => Promise<void>;
   siteId?: string;
+  dateRange?: [dayjs.Dayjs, dayjs.Dayjs];
 }
 
 /**
@@ -21,7 +24,7 @@ interface SyncFormProps {
  * @param {SyncFormProps} props 组件属性
  * @returns {React.ReactElement} 抽屉表单
  */
-const SyncForm: React.FC<SyncFormProps> = ({ tableRef, onFinish, siteId }) => {
+const SyncForm: React.FC<SyncFormProps> = ({ tableRef, onFinish, siteId, dateRange }) => {
   // 使用 antd 的 App 组件提供的 message API
   const [loading, setLoading] = React.useState(false);
 
@@ -49,7 +52,11 @@ const SyncForm: React.FC<SyncFormProps> = ({ tableRef, onFinish, siteId }) => {
   // 返回一个抽屉表单
   return (
     <DrawerForm<API.ordercontrollerSyncorderParams>
-      title="同步订单"
+     initialValues={{
+    dateRange: [dayjs().subtract(1, 'week'), dayjs()],
+  }}
+
+    title="同步订单"
       // 表单的触发器,一个带图标的按钮
       trigger={
         <Button key="syncSite" type="primary">
@@ -67,6 +74,7 @@ const SyncForm: React.FC<SyncFormProps> = ({ tableRef, onFinish, siteId }) => {
       onFinish={onFinish}
     >
       <ProForm.Group>
+        
         {/* 站点选择框 */}
         <ProFormSelect
           name="siteId"
@@ -83,6 +91,22 @@ const SyncForm: React.FC<SyncFormProps> = ({ tableRef, onFinish, siteId }) => {
             }));
           }}
         />
+
+        <ProFormDateRangePicker
+        name="dateRange"
+        label="同步日期范围"
+        placeholder={['开始日期', '结束日期']}
+        
+        transform={(value) => {
+          return {
+            dateRange: value,
+          };
+        }}
+        fieldProps={{
+          showTime: false,
+          style: { width: '100%' },
+        }}
+      />
       </ProForm.Group>
     </DrawerForm>
   );
diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx
index 88cd085..20a534e 100644
--- a/src/pages/Order/List/index.tsx
+++ b/src/pages/Order/List/index.tsx
@@ -502,7 +502,7 @@ const ListPage: React.FC = () => {
                   success,
                   message: errMsg,
                   data,
-                } = await ordercontrollerSyncorders(values);
+                } = await ordercontrollerSyncorders(values,{after:values.dateRange?.[0]+'T00:00:00Z',before:values.dateRange?.[1]+'T23:59:59Z'});
                 if (!success) {
                   throw new Error(errMsg);
                 }
@@ -997,6 +997,7 @@ const Detail: React.FC<{
               );
             }}
           />
+
           {/* 显示 related order */}
           <ProDescriptions.Item
             label="关联"
@@ -1506,16 +1507,16 @@ const Shipping: React.FC<{
           <ProFormList
             label="发货产品"
             name="sales"
-            // rules={[
-            //   {
-            //     required: true,
-            //     message: '至少需要一个商品',
-            //     validator: (_, value) =>
-            //       value && value.length > 0
-            //         ? Promise.resolve()
-            //         : Promise.reject('至少需要一个商品'),
-            //   },
-            // ]}
+         //  rules={[
+         //    {
+          //     required: true,
+          //     message: '至少需要一个商品',
+          //     validator: (_, value) =>
+          //       value && value.length > 0
+           //</Col>        ? Promise.resolve()
+           //        : Promise.reject('至少需要一个商品'),
+           //  },
+          // ]}
           >
             <ProForm.Group>
               <ProFormSelect
diff --git a/src/pages/Statistics/OrderSource/index.tsx b/src/pages/Statistics/OrderSource/index.tsx
index 54d9829..83b4b15 100644
--- a/src/pages/Statistics/OrderSource/index.tsx
+++ b/src/pages/Statistics/OrderSource/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import {
   statisticscontrollerGetinativeusersbymonth,
-  statisticscontrollerGetordersorce,
+  statisticscontrollerGetordersource,
 } from '@/servers/api/statistics';
 import {
   ActionType,
@@ -25,7 +25,7 @@ const ListPage: React.FC = () => {
     country: ['CA'],
   };
   function handleSubmit(values: typeof initialValues) {
-    statisticscontrollerGetordersorce({params: values}).then(({ data, success }) => {
+    statisticscontrollerGetordersource({params: values}).then(({ data, success }) => {
       if (success) setData(data);
     });
   }