feat(订单列表): 添加最佳物流选项并优化邮件地址处理

添加"最佳物流"到快递公司选项列表
将origin.email_addresses改为直接使用而不分割，保持与destination.email_addresses处理方式一致

.trae/documents/加拿大和澳大利亚省级地图实现.md

@@ -1,15 +1,18 @@
 ## 实现计划
 
 ### 1. 地图数据准备
-- 获取加拿大和澳大利亚的省级地图数据（JSON格式）
+
+- 获取加拿大和澳大利亚的省级地图数据（JSON 格式）
 - 将地图数据文件添加到项目的`public`目录下，命名为`canada.json`和`australia.json`
 
 ### 2. 组件实现
+
 - 为加拿大创建地图组件：`/Users/zksu/Developer/work/workcode/WEB/src/pages/Area/Canada/index.tsx`
 - 为澳大利亚创建地图组件：`/Users/zksu/Developer/work/workcode/WEB/src/pages/Area/Australia/index.tsx`
 - 组件将基于现有的`Map/index.tsx`实现，修改地图数据加载和配置
 
 ### 3. 数据结构设计
+
 - 定义省级数据接口，包含：
   - 英文名称（用于匹配地图数据）
   - 中文名称
@@ -17,20 +20,24 @@
   - 人口数据
 
 ### 4. 地图渲染配置
-- 使用ECharts的Map组件渲染省级地图
-- 配置tooltip显示中文名称、简称和人口数据
+
+- 使用 ECharts 的 Map 组件渲染省级地图
+- 配置 tooltip 显示中文名称、简称和人口数据
 - 添加视觉映射组件，根据人口数据显示不同颜色
 
 ### 5. 数据获取与处理
+
 - 定义本地数据结构，包含各个省的中文名称、简称和人口
-- 将数据转换为ECharts需要的格式
+- 将数据转换为 ECharts 需要的格式
 
 ### 6. 组件优化
+
 - 添加加载状态
 - 处理地图数据加载失败的情况
 - 优化地图交互体验，如缩放、拖拽等
 
 ### 7. 实现步骤
+
 1. 准备地图数据文件
 2. 创建加拿大地图组件
 3. 创建澳大利亚地图组件
@@ -39,8 +46,9 @@
 6. 测试地图渲染和交互
 
 ### 技术要点
-- 使用ECharts的MapChart组件
-- 动态加载地图JSON数据
+
+- 使用 ECharts 的 MapChart 组件
+- 动态加载地图 JSON 数据
 - 数据映射和转换
-- Tooltip自定义格式化
-- 视觉映射配置
+- Tooltip 自定义格式化
+- 视觉映射配置

src/pages/Area/Australia/index.tsx

@@ -22,14 +22,54 @@ const AustraliaMap: React.FC = () => {
 
   // 澳大利亚省级数据
   const provinceData: ProvinceData[] = [
-    { name: 'New South Wales', chineseName: '新南威尔士州', shortName: 'NSW', population: 8166369 },
-    { name: 'Victoria', chineseName: '维多利亚州', shortName: 'VIC', population: 6704352 },
-    { name: 'Queensland', chineseName: '昆士兰州', shortName: 'QLD', population: 5265049 },
-    { name: 'Western Australia', chineseName: '西澳大利亚州', shortName: 'WA', population: 2885548 },
-    { name: 'South Australia', chineseName: '南澳大利亚州', shortName: 'SA', population: 1806604 },
-    { name: 'Tasmania', chineseName: '塔斯马尼亚州', shortName: 'TAS', population: 569825 },
-    { name: 'Australian Capital Territory', chineseName: '澳大利亚首都领地', shortName: 'ACT', population: 453349 },
-    { name: 'Northern Territory', chineseName: '北领地', shortName: 'NT', population: 249072 },
+    {
+      name: 'New South Wales',
+      chineseName: '新南威尔士州',
+      shortName: 'NSW',
+      population: 8166369,
+    },
+    {
+      name: 'Victoria',
+      chineseName: '维多利亚州',
+      shortName: 'VIC',
+      population: 6704352,
+    },
+    {
+      name: 'Queensland',
+      chineseName: '昆士兰州',
+      shortName: 'QLD',
+      population: 5265049,
+    },
+    {
+      name: 'Western Australia',
+      chineseName: '西澳大利亚州',
+      shortName: 'WA',
+      population: 2885548,
+    },
+    {
+      name: 'South Australia',
+      chineseName: '南澳大利亚州',
+      shortName: 'SA',
+      population: 1806604,
+    },
+    {
+      name: 'Tasmania',
+      chineseName: '塔斯马尼亚州',
+      shortName: 'TAS',
+      population: 569825,
+    },
+    {
+      name: 'Australian Capital Territory',
+      chineseName: '澳大利亚首都领地',
+      shortName: 'ACT',
+      population: 453349,
+    },
+    {
+      name: 'Northern Territory',
+      chineseName: '北领地',
+      shortName: 'NT',
+      population: 249072,
+    },
   ];
 
   useEffect(() => {
@@ -57,7 +97,9 @@ const AustraliaMap: React.FC = () => {
               if (params.data) {
                 return `
                   <div>
-                    <div><strong>${params.data.chineseName}</strong> (${params.data.shortName})</div>
+                    <div><strong>${params.data.chineseName}</strong> (${
+                  params.data.shortName
+                })</div>
                     <div>人口: ${params.data.population.toLocaleString()}</div>
                   </div>
                 `;
@@ -67,8 +109,8 @@ const AustraliaMap: React.FC = () => {
           },
           visualMap: {
             left: 'left',
-            min: Math.min(...provinceData.map(p => p.population)),
-            max: Math.max(...provinceData.map(p => p.population)),
+            min: Math.min(...provinceData.map((p) => p.population)),
+            max: Math.max(...provinceData.map((p) => p.population)),
             inRange: {
               color: ['#f0f0f0', '#52c41a', '#389e0d'],
             },
@@ -89,7 +131,9 @@ const AustraliaMap: React.FC = () => {
                 show: true,
                 formatter: (params: any) => {
                   if (params.data) {
-                    return `${params.data.shortName}\n${params.data.chineseName}\n${params.data.population.toLocaleString()}`;
+                    return `${params.data.shortName}\n${
+                      params.data.chineseName
+                    }\n${params.data.population.toLocaleString()}`;
                   }
                   return params.name;
                 },
@@ -146,4 +190,4 @@ const AustraliaMap: React.FC = () => {
   );
 };
 
-export default AustraliaMap;
+export default AustraliaMap;

src/pages/Area/Canada/index.tsx

@@ -22,19 +22,84 @@ const CanadaMap: React.FC = () => {
 
   // 加拿大省级数据
   const provinceData: ProvinceData[] = [
-    { name: 'British Columbia', chineseName: '不列颠哥伦比亚省', shortName: 'BC', population: 5147712 },
-    { name: 'Alberta', chineseName: '阿尔伯塔省', shortName: 'AB', population: 4413146 },
-    { name: 'Saskatchewan', chineseName: '萨斯喀彻温省', shortName: 'SK', population: 1181666 },
-    { name: 'Manitoba', chineseName: '曼尼托巴省', shortName: 'MB', population: 1383765 },
-    { name: 'Ontario', chineseName: '安大略省', shortName: 'ON', population: 14711827 },
-    { name: 'Quebec', chineseName: '魁北克省', shortName: 'QC', population: 8501833 },
-    { name: 'New Brunswick', chineseName: '新不伦瑞克省', shortName: 'NB', population: 789225 },
-    { name: 'Nova Scotia', chineseName: '新斯科舍省', shortName: 'NS', population: 971395 },
-    { name: 'Prince Edward Island', chineseName: '爱德华王子岛省', shortName: 'PE', population: 160302 },
-    { name: 'Newfoundland and Labrador', chineseName: '纽芬兰与拉布拉多省', shortName: 'NL', population: 521365 },
-    { name: 'Yukon', chineseName: '育空地区', shortName: 'YT', population: 43985 },
-    { name: 'Northwest Territories', chineseName: '西北地区', shortName: 'NT', population: 45515 },
-    { name: 'Nunavut', chineseName: '努纳武特地区', shortName: 'NU', population: 39430 },
+    {
+      name: 'British Columbia',
+      chineseName: '不列颠哥伦比亚省',
+      shortName: 'BC',
+      population: 5147712,
+    },
+    {
+      name: 'Alberta',
+      chineseName: '阿尔伯塔省',
+      shortName: 'AB',
+      population: 4413146,
+    },
+    {
+      name: 'Saskatchewan',
+      chineseName: '萨斯喀彻温省',
+      shortName: 'SK',
+      population: 1181666,
+    },
+    {
+      name: 'Manitoba',
+      chineseName: '曼尼托巴省',
+      shortName: 'MB',
+      population: 1383765,
+    },
+    {
+      name: 'Ontario',
+      chineseName: '安大略省',
+      shortName: 'ON',
+      population: 14711827,
+    },
+    {
+      name: 'Quebec',
+      chineseName: '魁北克省',
+      shortName: 'QC',
+      population: 8501833,
+    },
+    {
+      name: 'New Brunswick',
+      chineseName: '新不伦瑞克省',
+      shortName: 'NB',
+      population: 789225,
+    },
+    {
+      name: 'Nova Scotia',
+      chineseName: '新斯科舍省',
+      shortName: 'NS',
+      population: 971395,
+    },
+    {
+      name: 'Prince Edward Island',
+      chineseName: '爱德华王子岛省',
+      shortName: 'PE',
+      population: 160302,
+    },
+    {
+      name: 'Newfoundland and Labrador',
+      chineseName: '纽芬兰与拉布拉多省',
+      shortName: 'NL',
+      population: 521365,
+    },
+    {
+      name: 'Yukon',
+      chineseName: '育空地区',
+      shortName: 'YT',
+      population: 43985,
+    },
+    {
+      name: 'Northwest Territories',
+      chineseName: '西北地区',
+      shortName: 'NT',
+      population: 45515,
+    },
+    {
+      name: 'Nunavut',
+      chineseName: '努纳武特地区',
+      shortName: 'NU',
+      population: 39430,
+    },
   ];
 
   useEffect(() => {
@@ -62,7 +127,9 @@ const CanadaMap: React.FC = () => {
               if (params.data) {
                 return `
                   <div>
-                    <div><strong>${params.data.chineseName}</strong> (${params.data.shortName})</div>
+                    <div><strong>${params.data.chineseName}</strong> (${
+                  params.data.shortName
+                })</div>
                     <div>人口: ${params.data.population.toLocaleString()}</div>
                   </div>
                 `;
@@ -72,8 +139,8 @@ const CanadaMap: React.FC = () => {
           },
           visualMap: {
             left: 'left',
-            min: Math.min(...provinceData.map(p => p.population)),
-            max: Math.max(...provinceData.map(p => p.population)),
+            min: Math.min(...provinceData.map((p) => p.population)),
+            max: Math.max(...provinceData.map((p) => p.population)),
             inRange: {
               color: ['#f0f0f0', '#1890ff', '#096dd9'],
             },
@@ -93,7 +160,9 @@ const CanadaMap: React.FC = () => {
                 show: true,
                 formatter: (params: any) => {
                   if (params.data) {
-                    return `${params.data.shortName}\n${params.data.chineseName}\n${params.data.population.toLocaleString()}`;
+                    return `${params.data.shortName}\n${
+                      params.data.chineseName
+                    }\n${params.data.population.toLocaleString()}`;
                   }
                   return params.name;
                 },
@@ -150,4 +219,4 @@ const CanadaMap: React.FC = () => {
   );
 };
 
-export default CanadaMap;
+export default CanadaMap;

src/pages/Customer/Statistic/index.tsx

@@ -4,4 +4,4 @@ export default function Statistic() {
       <h1>客户统计</h1>
     </div>
   );
-}
+}

src/pages/Dict/components/DictItemModal.tsx

@@ -66,6 +66,7 @@ const DictItemModal: React.FC<DictItemModalProps> = ({
           label="名称"
           name="name"
           rules={[{ required: true, message: '请输入名称' }]}
+          normalize={(value) => (value || '').trim()}
         >
           <Input placeholder="名称 (e.g., zyn)" />
         </Form.Item>
@@ -73,19 +74,36 @@ const DictItemModal: React.FC<DictItemModalProps> = ({
           label="标题"
           name="title"
           rules={[{ required: true, message: '请输入标题' }]}
+          normalize={(value) => (value || '').trim()}
         >
           <Input placeholder="标题 (e.g., ZYN)" />
         </Form.Item>
-        <Form.Item label="中文标题" name="titleCN">
+        <Form.Item
+          label="中文标题"
+          name="titleCN"
+          normalize={(value) => (value || '').trim()}
+        >
           <Input placeholder="中文标题 (e.g., 品牌)" />
         </Form.Item>
-        <Form.Item label="简称 (可选)" name="shortName">
+        <Form.Item
+          label="简称 (可选)"
+          name="shortName"
+          normalize={(value) => (value || '').trim()}
+        >
           <Input placeholder="简称 (可选)" />
         </Form.Item>
-        <Form.Item label="图片 (可选)" name="image">
+        <Form.Item
+          label="图片 (可选)"
+          name="image"
+          normalize={(value) => (value || '').trim()}
+        >
           <Input placeholder="图片链接 (可选)" />
         </Form.Item>
-        <Form.Item label="值 (可选)" name="value">
+        <Form.Item
+          label="值 (可选)"
+          name="value"
+          normalize={(value) => (value || '').trim()}
+        >
           <Input placeholder="值 (可选)" />
         </Form.Item>
       </Form>

src/pages/Order/List/index.tsx

@@ -84,8 +84,8 @@ import dayjs from 'dayjs';
 import * as XLSX from 'xlsx';
 const ListPage: React.FC = () => {
   const [file, setFile] = useState<File | null>(null);
-    const [csvData, setCsvData] = useState<any[]>([]);
-    const [processedData, setProcessedData] = useState<any[]>([]);
+  const [csvData, setCsvData] = useState<any[]>([]);
+  const [processedData, setProcessedData] = useState<any[]>([]);
   const actionRef = useRef<ActionType>();
   const [activeKey, setActiveKey] = useState<string>('all');
   const [count, setCount] = useState<any[]>([]);
@@ -476,63 +476,63 @@ const ListPage: React.FC = () => {
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
 
 
-    /**
-     * @description 处理文件上传
-     */
-    const handleFileUpload = (uploadedFile: File) => {
-      // 检查文件类型
-      if (!uploadedFile.name.match(/\.(xlsx)$/)) {
-        message.error('请上传 xlsx 格式的文件!');
-        return false;
+  /**
+   * @description 处理文件上传
+   */
+  const handleFileUpload = (uploadedFile: File) => {
+    // 检查文件类型
+    if (!uploadedFile.name.match(/\.(xlsx)$/)) {
+      message.error('请上传 xlsx 格式的文件!');
+      return false;
+    }
+    setFile(uploadedFile);
+
+    const reader = new FileReader();
+    // 对于Excel文件，继续使用readAsArrayBuffer
+    reader.onload = (e) => {
+      try {
+        const data = e.target?.result;
+        // 如果是ArrayBuffer，使用type: 'array'来处理
+        const workbook = XLSX.read(data, { type: 'array' });
+        const sheetName = workbook.SheetNames[0];
+        const worksheet = workbook.Sheets[sheetName];
+        const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
+
+        if (jsonData.length < 2) {
+          message.error('文件为空或缺少表头!');
+          setCsvData([]);
+          return;
+        }
+        // 将数组转换为对象数组
+        const headers = jsonData[0] as string[];
+        const rows = jsonData.slice(1).map((rowArray: any) => {
+          const rowData: { [key: string]: any } = {};
+          headers.forEach((header, index) => {
+            rowData[header] = rowArray[index];
+          });
+          return rowData;
+        });
+
+        message.success(`成功解析 ${rows.length} 条数据.`);
+        setCsvData(rows);
+        setProcessedData([]); // 清空旧的处理结果
+      } catch (error) {
+        message.error('Excel文件解析失败,请检查文件格式!');
+        console.error('Excel Parse Error:', error);
+        setCsvData([]);
       }
-      setFile(uploadedFile);
-  
-      const reader = new FileReader();      
-        // 对于Excel文件，继续使用readAsArrayBuffer
-        reader.onload = (e) => {
-          try {
-            const data = e.target?.result;
-            // 如果是ArrayBuffer，使用type: 'array'来处理
-            const workbook = XLSX.read(data, { type: 'array' });
-            const sheetName = workbook.SheetNames[0];
-            const worksheet = workbook.Sheets[sheetName];
-            const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
-  
-            if (jsonData.length < 2) {
-              message.error('文件为空或缺少表头!');
-              setCsvData([]);
-              return;
-            }
-            // 将数组转换为对象数组
-            const headers = jsonData[0] as string[];
-            const rows = jsonData.slice(1).map((rowArray: any) => {
-              const rowData: { [key: string]: any } = {};
-              headers.forEach((header, index) => {
-                rowData[header] = rowArray[index];
-              });
-              return rowData;
-            });
-  
-            message.success(`成功解析 ${rows.length} 条数据.`);
-            setCsvData(rows);
-            setProcessedData([]); // 清空旧的处理结果
-          } catch (error) {
-            message.error('Excel文件解析失败,请检查文件格式!');
-            console.error('Excel Parse Error:', error);
-            setCsvData([]);
-          }
-        };
-        reader.readAsArrayBuffer(uploadedFile);
-      
-  
-      reader.onerror = (error) => {
-        message.error('文件读取失败!');
-        console.error('File Read Error:', error);
-      };
-  
-      return false; // 阻止antd Upload组件的默认上传行为
     };
-    
+    reader.readAsArrayBuffer(uploadedFile);
+
+
+    reader.onerror = (error) => {
+      message.error('文件读取失败!');
+      console.error('File Read Error:', error);
+    };
+
+    return false; // 阻止antd Upload组件的默认上传行为
+  };
+
   return (
     <PageContainer ghost>
       <Tabs items={tabs} activeKey={activeKey} onChange={setActiveKey} />
@@ -560,42 +560,42 @@ const ListPage: React.FC = () => {
         }}
         toolBarRender={() => [
           // <CreateOrder tableRef={actionRef} />,
-           <Upload
-          // beforeUpload={handleFileUpload}
-             name="file"
+          <Upload
+            // beforeUpload={handleFileUpload}
+            name="file"
             accept=".xlsx"
             showUploadList={false}
             maxCount={1}
             customRequest={async (options) => {
-                const { file, onSuccess, onError } = options;
-                console.log(file);
-                 const formData = new FormData();
+              const { file, onSuccess, onError } = options;
+              console.log(file);
+              const formData = new FormData();
               formData.append('file', file);
-                try {
+              try {
                 const res = await request('/order/import', {
                   method: 'POST',
                   data: formData,
                   requestType: 'form',
                 });
 
-                 if (res?.success && res.data) {
-                 // 使用xlsx将JSON数据转换为Excel
+                if (res?.success && res.data) {
+                  // 使用xlsx将JSON数据转换为Excel
                   const XLSX = require('xlsx');
                   const worksheet = XLSX.utils.json_to_sheet(res.data);
                   const workbook = XLSX.utils.book_new();
                   XLSX.utils.book_append_sheet(workbook, worksheet, 'Orders');
                   const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
-                    // 否则按原逻辑处理二进制数据
-                    const blob = new Blob([excelBuffer], {
-                      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                    });
-                    const url = URL.createObjectURL(blob);
-                    const a = document.createElement('a');
-                    a.href = url;
-                    a.download = 'orders.xlsx';
-                    a.click();
-                    URL.revokeObjectURL(url);
-                  
+                  // 否则按原逻辑处理二进制数据
+                  const blob = new Blob([excelBuffer], {
+                    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                  });
+                  const url = URL.createObjectURL(blob);
+                  const a = document.createElement('a');
+                  a.href = url;
+                  a.download = 'orders.xlsx';
+                  a.click();
+                  URL.revokeObjectURL(url);
+
                 } else {
                   message.error(res.message || '导出失败');
                 }
@@ -606,9 +606,9 @@ const ListPage: React.FC = () => {
                 onError?.(error);
               }
             }}
-            >
-              <Button icon={<UploadOutlined />}>选择文件</Button>
-            </Upload>,
+          >
+            <Button icon={<UploadOutlined />}>选择文件</Button>
+          </Upload>,
           <SyncForm
             onFinish={async (values: any) => {
               try {
@@ -756,36 +756,36 @@ const Detail: React.FC<{
           )
             ? []
             : [
-                <Divider type="vertical" />,
-                <Button
-                  type="primary"
-                  onClick={async () => {
-                    try {
-                      if (!record.siteId || !record.externalOrderId) {
-                        message.error('站点ID或外部订单ID不存在');
-                        return;
-                      }
-                      const {
-                        success,
-                        message: errMsg,
-                        data,
-                      } = await ordercontrollerSyncorderbyid({
-                        siteId: record.siteId,
-                        orderId: record.externalOrderId,
-                      });
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      showSyncResult(data as SyncResultData, '订单');
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error?.message || '同步失败');
+              <Divider type="vertical" />,
+              <Button
+                type="primary"
+                onClick={async () => {
+                  try {
+                    if (!record.siteId || !record.externalOrderId) {
+                      message.error('站点ID或外部订单ID不存在');
+                      return;
                     }
-                  }}
-                >
-                  同步订单
-                </Button>,
-              ]),
+                    const {
+                      success,
+                      message: errMsg,
+                      data,
+                    } = await ordercontrollerSyncorderbyid({
+                      siteId: record.siteId,
+                      orderId: record.externalOrderId,
+                    });
+                    if (!success) {
+                      throw new Error(errMsg);
+                    }
+                    showSyncResult(data as SyncResultData, '订单');
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error?.message || '同步失败');
+                  }
+                }}
+              >
+                同步订单
+              </Button>,
+            ]),
           // ...(['processing', 'pending_reshipment'].includes(record.orderStatus)
           //   ? [
           //       <Divider type="vertical" />,
@@ -804,152 +804,152 @@ const Detail: React.FC<{
             'pending_refund',
           ].includes(record.orderStatus)
             ? [
-                <Divider type="vertical" />,
-                <Popconfirm
-                  title="转至售后"
-                  description="确认转至售后?"
-                  onConfirm={async () => {
-                    try {
-                      if (!record.id) {
-                        message.error('订单ID不存在');
-                        return;
-                      }
-                      const { success, message: errMsg } =
-                        await ordercontrollerChangestatus(
-                          {
-                            id: record.id,
-                          },
-                          {
-                            status: 'after_sale_pending',
-                          },
-                        );
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error.message);
+              <Divider type="vertical" />,
+              <Popconfirm
+                title="转至售后"
+                description="确认转至售后?"
+                onConfirm={async () => {
+                  try {
+                    if (!record.id) {
+                      message.error('订单ID不存在');
+                      return;
                     }
-                  }}
-                >
-                  <Button type="primary" ghost>
-                    转至售后
-                  </Button>
-                </Popconfirm>,
-              ]
+                    const { success, message: errMsg } =
+                      await ordercontrollerChangestatus(
+                        {
+                          id: record.id,
+                        },
+                        {
+                          status: 'after_sale_pending',
+                        },
+                      );
+                    if (!success) {
+                      throw new Error(errMsg);
+                    }
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error.message);
+                  }
+                }}
+              >
+                <Button type="primary" ghost>
+                  转至售后
+                </Button>
+              </Popconfirm>,
+            ]
             : []),
           ...(record.orderStatus === 'after_sale_pending'
             ? [
-                <Divider type="vertical" />,
-                <Popconfirm
-                  title="转至取消"
-                  description="确认转至取消?"
-                  onConfirm={async () => {
-                    try {
-                      if (!record.id) {
-                        message.error('订单ID不存在');
-                        return;
-                      }
-                      const { success, message: errMsg } =
-                        await ordercontrollerCancelorder({
+              <Divider type="vertical" />,
+              <Popconfirm
+                title="转至取消"
+                description="确认转至取消?"
+                onConfirm={async () => {
+                  try {
+                    if (!record.id) {
+                      message.error('订单ID不存在');
+                      return;
+                    }
+                    const { success, message: errMsg } =
+                      await ordercontrollerCancelorder({
+                        id: record.id,
+                      });
+                    if (!success) {
+                      throw new Error(errMsg);
+                    }
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error.message);
+                  }
+                }}
+              >
+                <Button type="primary" ghost>
+                  转至取消
+                </Button>
+              </Popconfirm>,
+              <Divider type="vertical" />,
+              <Popconfirm
+                title="转至退款"
+                description="确认转至退款?"
+                onConfirm={async () => {
+                  try {
+                    if (!record.id) {
+                      message.error('订单ID不存在');
+                      return;
+                    }
+                    const { success, message: errMsg } =
+                      await ordercontrollerRefundorder({
+                        id: record.id,
+                      });
+                    if (!success) {
+                      throw new Error(errMsg);
+                    }
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error.message);
+                  }
+                }}
+              >
+                <Button type="primary" ghost>
+                  转至退款
+                </Button>
+              </Popconfirm>,
+              <Divider type="vertical" />,
+              <Popconfirm
+                title="转至完成"
+                description="确认转至完成?"
+                onConfirm={async () => {
+                  try {
+                    if (!record.id) {
+                      message.error('订单ID不存在');
+                      return;
+                    }
+                    const { success, message: errMsg } =
+                      await ordercontrollerCompletedorder({
+                        id: record.id,
+                      });
+                    if (!success) {
+                      throw new Error(errMsg);
+                    }
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error.message);
+                  }
+                }}
+              >
+                <Button type="primary" ghost>
+                  转至完成
+                </Button>
+              </Popconfirm>,
+              <Divider type="vertical" />,
+              <Popconfirm
+                title="转至待补发"
+                description="确认转至待补发?"
+                onConfirm={async () => {
+                  try {
+                    const { success, message: errMsg } =
+                      await ordercontrollerChangestatus(
+                        {
                           id: record.id,
-                        });
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error.message);
+                        },
+                        {
+                          status: 'pending_reshipment',
+                        },
+                      );
+                    if (!success) {
+                      throw new Error(errMsg);
                     }
-                  }}
-                >
-                  <Button type="primary" ghost>
-                    转至取消
-                  </Button>
-                </Popconfirm>,
-                <Divider type="vertical" />,
-                <Popconfirm
-                  title="转至退款"
-                  description="确认转至退款?"
-                  onConfirm={async () => {
-                    try {
-                      if (!record.id) {
-                        message.error('订单ID不存在');
-                        return;
-                      }
-                      const { success, message: errMsg } =
-                        await ordercontrollerRefundorder({
-                          id: record.id,
-                        });
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error.message);
-                    }
-                  }}
-                >
-                  <Button type="primary" ghost>
-                    转至退款
-                  </Button>
-                </Popconfirm>,
-                <Divider type="vertical" />,
-                <Popconfirm
-                  title="转至完成"
-                  description="确认转至完成?"
-                  onConfirm={async () => {
-                    try {
-                      if (!record.id) {
-                        message.error('订单ID不存在');
-                        return;
-                      }
-                      const { success, message: errMsg } =
-                        await ordercontrollerCompletedorder({
-                          id: record.id,
-                        });
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error.message);
-                    }
-                  }}
-                >
-                  <Button type="primary" ghost>
-                    转至完成
-                  </Button>
-                </Popconfirm>,
-                <Divider type="vertical" />,
-                <Popconfirm
-                  title="转至待补发"
-                  description="确认转至待补发?"
-                  onConfirm={async () => {
-                    try {
-                      const { success, message: errMsg } =
-                        await ordercontrollerChangestatus(
-                          {
-                            id: record.id,
-                          },
-                          {
-                            status: 'pending_reshipment',
-                          },
-                        );
-                      if (!success) {
-                        throw new Error(errMsg);
-                      }
-                      tableRef.current?.reload();
-                    } catch (error: any) {
-                      message.error(error.message);
-                    }
-                  }}
-                >
-                  <Button type="primary" ghost>
-                    转至待补发
-                  </Button>
-                </Popconfirm>,
-              ]
+                    tableRef.current?.reload();
+                  } catch (error: any) {
+                    message.error(error.message);
+                  }
+                }}
+              >
+                <Button type="primary" ghost>
+                  转至待补发
+                </Button>
+              </Popconfirm>,
+            ]
             : []),
         ]}
       >
@@ -1212,31 +1212,31 @@ const Detail: React.FC<{
                       }
                       actions={
                         v.state === 'waiting-for-scheduling' ||
-                        v.state === 'waiting-for-transit'
+                          v.state === 'waiting-for-transit'
                           ? [
-                              <Popconfirm
-                                title="取消运单"
-                                description="确认取消运单?"
-                                onConfirm={async () => {
-                                  try {
-                                    const { success, message: errMsg } =
-                                      await logisticscontrollerDelshipment({
-                                        id: v.id,
-                                      });
-                                    if (!success) {
-                                      throw new Error(errMsg);
-                                    }
-                                    tableRef.current?.reload();
-                                    initRequest();
-                                  } catch (error: any) {
-                                    message.error(error.message);
+                            <Popconfirm
+                              title="取消运单"
+                              description="确认取消运单?"
+                              onConfirm={async () => {
+                                try {
+                                  const { success, message: errMsg } =
+                                    await logisticscontrollerDelshipment({
+                                      id: v.id,
+                                    });
+                                  if (!success) {
+                                    throw new Error(errMsg);
                                   }
-                                }}
-                              >
-                                <DeleteFilled />
-                                取消运单
-                              </Popconfirm>,
-                            ]
+                                  tableRef.current?.reload();
+                                  initRequest();
+                                } catch (error: any) {
+                                  message.error(error.message);
+                                }
+                              }}
+                            >
+                              <DeleteFilled />
+                              取消运单
+                            </Popconfirm>,
+                          ]
                           : []
                       }
                     >
@@ -1381,10 +1381,17 @@ const Shipping: React.FC<{
   const [rates, setRates] = useState<API.RateDTO[]>([]);
   const [ratesLoading, setRatesLoading] = useState(false);
   const { message } = App.useApp();
-const [shipmentPlatforms, setShipmentPlatforms] = useState([
+  const [shipmentPlatforms, setShipmentPlatforms] = useState([
     { label: 'uniuni', value: 'uniuni' },
     { label: 'tms.freightwaves', value: 'freightwaves' },
-  ]); 
+  ]);
+  const [courierCompany, setCourierCompany] = useState([
+    { label: '最佳物流', value: '最优物流' },
+    { label: 'UNIUNI', value: 'UNIUNI' },
+    { label: 'PuroYYZ', value: 'PuroYYZ' },
+    { label: 'CPYYZ', value: 'CPYYZ' },
+    { label: 'UPSYYZ7000NEW', value: 'UPSYYZ7000NEW' },
+  ]);
   return (
     <ModalForm
       formRef={formRef}
@@ -1413,7 +1420,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
           await ordercontrollerGetorderdetail({
             orderId: id,
           });
-        console.log('success data',success,data)
+        console.log('success data', success, data)
         if (!success || !data) return {};
         data.sales = data.sales?.reduce(
           (acc: API.OrderSale[], cur: API.OrderSale) => {
@@ -1436,8 +1443,9 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         if (reShipping) data.sales = [{}];
         let shipmentInfo = localStorage.getItem('shipmentInfo');
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
-        const a =  {
+        const a = {
           shipmentPlatform: 'uniuni',
+          courierCompany: '最优物流',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1464,7 +1472,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
             origin: {
               name: data?.name,
-              email_addresses: data?.email,
+              email_addresses: shipmentInfo?.email_addresses,
               contact_name: data?.name,
               phone_number: shipmentInfo?.phone_number,
               address: {
@@ -1497,7 +1505,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             },
           },
         };
-        return a 
+        return a
       }}
       onFinish={async ({
         customer_note,
@@ -1507,8 +1515,9 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         externalOrderId,
         ...data
       }) => {
+        debugger
         details.origin.email_addresses =
-          details.origin.email_addresses.split(',');
+          details.origin.email_addresses;
         details.destination.email_addresses =
           details.destination.email_addresses.split(',');
         details.destination.phone_number.number =
@@ -1541,6 +1550,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
               postal_code: details.origin.address.postal_code,
               address_line_1: details.origin.address.address_line_1,
               phone_number: details.origin.phone_number,
+              email_addresses: details.origin.email_addresses,
             }),
           );
 
@@ -1561,17 +1571,25 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
         }
       }}
     >
-       <Row gutter={16}>
+      <Row gutter={16}>
         <Col span={8}>
-     <ProFormSelect
-        name="shipmentPlatform"
-        label="发货平台"
-        options={shipmentPlatforms}
-        placeholder="请选择发货平台"
-        rules={[{ required: true, message: '请选择一个选项' }]}
-      />
-      </Col>
-       </Row>
+          <ProFormSelect
+            name="shipmentPlatform"
+            label="发货平台"
+            options={shipmentPlatforms}
+            placeholder="请选择发货平台"
+            rules={[{ required: true, message: '请选择一个选项' }]}
+          />
+        </Col>
+        <Col span={8}>
+          <ProFormSelect
+            name="courierCompany"
+            label="快递公司"
+            options={courierCompany}
+            placeholder="请选择快递公司"
+          />
+        </Col>
+      </Row>
       <ProFormText label="订单号" readonly name='externalOrderId' />
       <ProFormText label="客户备注" readonly name="customer_note" />
       <ProFormList
@@ -1641,16 +1659,16 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
           <ProFormList
             label="发货产品"
             name="sales"
-            //  rules={[
-            //    {
-            //     required: true,
-            //     message: '至少需要一个商品',
-            //     validator: (_, value) =>
-            //       value && value.length > 0
-            //</Col>        ? Promise.resolve()
-            //        : Promise.reject('至少需要一个商品'),
-            //  },
-            // ]}
+          //  rules={[
+          //    {
+          //     required: true,
+          //     message: '至少需要一个商品',
+          //     validator: (_, value) =>
+          //       value && value.length > 0
+          //</Col>        ? Promise.resolve()
+          //        : Promise.reject('至少需要一个商品'),
+          //  },
+          // ]}
           >
             <ProForm.Group>
               <ProFormSelect
@@ -1718,7 +1736,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
                     //   address_id: row.id,
                     details: {
                       origin: {
-                        email_addresses:email,
+                        email_addresses: email,
                         address,
                         phone_number: {
                           phone: phone_number,
@@ -1731,7 +1749,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
               />
             }
           >
-             {/* <ProFormText
+            {/* <ProFormText
               label="address_id"
               name={'address_id'}
               rules={[{ required: true, message: '请输入ID' }]}
@@ -2084,7 +2102,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
                     name="description"
                     placeholder="请输入描述"
                     width="lg"
-                    // rules={[{ required: true, message: '请输入描述' }]}
+                  // rules={[{ required: true, message: '请输入描述' }]}
                   />
                 </ProForm.Group>
               </ProFormList>
@@ -2149,7 +2167,7 @@ const [shipmentPlatforms, setShipmentPlatforms] = useState([
             const originEmail = details.origin.email_addresses;
             const destinationEmail = details.destination.email_addresses;
             details.origin.email_addresses =
-              details.origin.email_addresses.split(',');
+              details.origin.email_addresses;
             details.destination.email_addresses =
               details.destination.email_addresses.split(',');
             details.destination.phone_number.number =
@@ -2484,7 +2502,7 @@ const CreateOrder: React.FC<{
         <ProFormText
           label="公司名称"
           name={['billing', 'company']}
-          rules={[{  message: '请输入公司名称' }]}
+          rules={[{ message: '请输入公司名称' }]}
         />
         <ProFormItem
           name={['billing', 'country']}
@@ -2571,7 +2589,7 @@ const AddressPicker: React.FC<{
         }));
       },
     },
-     {
+    {
       title: 'id',
       dataIndex: ['id'],
       hideInSearch: true,
@@ -2604,7 +2622,7 @@ const AddressPicker: React.FC<{
     },
     {
       title: '邮箱',
-      dataIndex: [ 'email'],
+      dataIndex: ['email'],
       hideInSearch: true,
     },
   ];

src/pages/Product/CsvTool/index.tsx

@@ -67,6 +67,8 @@ const CsvTool: React.FC = () => {
   const [selectedSites, setSelectedSites] = useState<Site[]>([]); // 现在使用多选
   const [generateBundleSkuForSingle, setGenerateBundleSkuForSingle] =
     useState(true); // 是否为type为single的记录生成包含quantity的bundle SKU
+  const [generateSkuForProducts, setGenerateSkuForProducts] = useState(true); // 是否为产品生成SKU
+  const [generateNameForProducts, setGenerateNameForProducts] = useState(true); // 是否为产品生成名称
   const [config, setConfig] = useState<SkuConfig>({
     brands: [],
     categories: [],
@@ -528,39 +530,43 @@ const CsvTool: React.FC = () => {
         // 获取产品类型
         const type = row.type || '';
 
-        // 生成基础SKU（不包含站点前缀）
-        const baseSku = generateSku(
-          brand,
-          version,
-          category,
-          flavor,
-          strength,
-          humidity,
-          size,
-          quantity,
-          type,
-        );
-        const name = generateName(
-          brand,
-          version,
-          category,
-          flavor,
-          strength,
-          humidity,
-          size,
-          quantity,
-          type,
-        );
-        // 为所有站点生成带前缀的siteSkus
-        const siteSkus = generateSiteSkus(baseSku);
+        // 根据选项决定是否生成SKU
+        let baseSku = row.sku; // 默认为原有SKU
+        if (generateSkuForProducts) {
+          baseSku = generateSku(
+            brand,
+            version,
+            category,
+            flavor,
+            strength,
+            humidity,
+            size,
+            quantity,
+            type,
+          );
+        }
 
-        // 返回包含新SKU和siteSkus的行数据，将SKU直接保存到sku栏
+        // 根据选项决定是否生成名称
+        let generatedName = row.name; // 默认为原有名称
+        if (generateNameForProducts) {
+          generatedName = generateName(
+            brand,
+            version,
+            category,
+            flavor,
+            strength,
+            humidity,
+            size,
+            quantity,
+            type,
+          );
+        }
+
+        // 返回包含新SKU的行数据，将SKU直接保存到sku栏
         return {
           ...row,
-          sku: baseSku, // 直接生成在sku栏
-          generatedName: name,
-          // name: name, // 生成的产品名称
-          siteSkus,
+          sku: baseSku, // 根据选项决定是否更新SKU
+          name: generateNameForProducts ? generatedName : row.name, // 根据选项决定是否更新名称
           attribute_quantity: quantity, // 确保quantity保存到attribute_quantity
         };
       });
@@ -576,63 +582,94 @@ const CsvTool: React.FC = () => {
         );
 
         // Get quantity values from the config (same source as other attributes like brand)
-        const quantityValues = config.quantities.map(
-          (quantity) => quantity.name,
+        const quantityValues = config.quantities
+          .sort((a, b) => Number(a.name) - Number(b.name))
+          .map((quantity) => quantity.name);
+        // 获取源文件中已有的所有 SKU 列表（包括 single 和 bundle），用于检查重复
+        const existingSkus = new Set(
+          csvData.map((row) => row.sku).filter((sku) => sku),
+        );
+
+        // 获取源文件中已有的 bundle 类型记录的 SKU，用于进一步检查
+        const existingBundleSkus = new Set(
+          csvData
+            .filter((row) => row.type === 'bundle')
+            .map((row) => row.sku)
+            .filter((sku) => sku),
         );
 
         // Generate bundle products for each single record and quantity
-        const generatedBundleRecords = singleRecords.flatMap((singleRecord) => {
-          return quantityValues.map((quantity) => {
-            // Extract all necessary attributes from the single record
-            const brand = singleRecord.attribute_brand || '';
-            const version = singleRecord.attribute_version || '';
-            const category = singleRecord.category || '';
-            const flavor = singleRecord.attribute_flavor || '';
-            const strength = singleRecord.attribute_strength || '';
-            const humidity = singleRecord.attribute_humidity || '';
-            const size = singleRecord.attribute_size || singleRecord.size || '';
-            // Generate bundle SKU with the quantity
-            const bundleSku = generateSku(
-              brand,
-              version,
-              category,
-              flavor,
-              strength,
-              humidity,
-              size,
-              quantity,
-              'bundle',
-            );
+        const generatedBundleRecords = singleRecords
+          .flatMap((singleRecord) => {
+            return quantityValues.map((quantity) => {
+              // Extract all necessary attributes from the single record
+              const brand = singleRecord.attribute_brand || '';
+              const version = singleRecord.attribute_version || '';
+              const category = singleRecord.category || '';
+              const flavor = singleRecord.attribute_flavor || '';
+              const strength = singleRecord.attribute_strength || '';
+              const humidity = singleRecord.attribute_humidity || '';
+              const size =
+                singleRecord.attribute_size || singleRecord.size || '';
+              // 根据选项决定是否生成bundle SKU
+              let bundleSku;
+              if (generateSkuForProducts) {
+                bundleSku = generateSku(
+                  brand,
+                  version,
+                  category,
+                  flavor,
+                  strength,
+                  humidity,
+                  size,
+                  quantity,
+                  'bundle',
+                );
+              } else {
+                // 如果不生成SKU，则使用基于原有SKU和数量的组合
+                bundleSku = `${singleRecord.sku}-bundle-${quantity}`;
+              }
 
-            // Generate bundle name with the quantity
-            const bundleName = generateName(
-              brand,
-              version,
-              category,
-              flavor,
-              strength,
-              humidity,
-              size,
-              quantity,
-              'bundle',
-            );
+              // 检查 bundle SKU 是否已存在于源文件中（包括所有类型的记录）
+              if (
+                existingSkus.has(bundleSku) ||
+                existingBundleSkus.has(bundleSku)
+              ) {
+                return null; // 跳过已存在的 SKU
+              }
 
-            // Generate siteSkus for the bundle
-            const bundleSiteSkus = generateSiteSkus(bundleSku);
-
-            // Create the bundle record
-            return {
-              ...singleRecord,
-              type: 'bundle', // Change type to bundle
-              sku: bundleSku, // Use the new bundle SKU
-              name: bundleName, // Use the new bundle name
-              siteSkus: bundleSiteSkus,
-              attribute_quantity: quantity, // Set the attribute_quantity
-              component_1_sku: singleRecord.sku, // Set component_1_sku to the single product's sku
-              component_1_quantity: Number(quantity), // Set component_1_quantity to the same as attribute_quantity
-            };
-          });
-        });
+              // 根据选项决定是否生成bundle名称
+              let bundleName;
+              if (generateNameForProducts) {
+                bundleName = generateName(
+                  brand,
+                  version,
+                  category,
+                  flavor,
+                  strength,
+                  humidity,
+                  size,
+                  quantity,
+                  'bundle',
+                );
+              } else {
+                // 如果不生成名称，则使用基于原有名称和数量的组合
+                bundleName = `${singleRecord.name} Bundle x ${quantity}`;
+              }
+              // Create the bundle record
+              return {
+                ...singleRecord,
+                type: 'bundle', // Change type to bundle
+                sku: bundleSku, // Use the new bundle SKU
+                name: bundleName, // Use the new bundle name
+                // siteSkus: bundleSiteSkus,
+                attribute_quantity: quantity, // Set the attribute_quantity
+                component_1_sku: singleRecord.sku, // Set component_1_sku to the single product's sku
+                component_1_quantity: Number(quantity), // Set component_1_quantity to the same as attribute_quantity
+              };
+            });
+          })
+          .filter(Boolean); // 过滤掉 null 值
 
         // Combine original dataWithSku with generated bundle records
         finalData = [...dataWithSku, ...generatedBundleRecords];
@@ -764,22 +801,6 @@ const CsvTool: React.FC = () => {
                 }))}
                 fieldProps={{ allowClear: true }}
               />
-
-              <ProForm.Item
-                name="generateBundleSkuForSingle"
-                label="为type=single生成bundle产品数据行"
-                tooltip="为类型为single的记录生成包含quantity的bundle SKU"
-                valuePropName="checked"
-                initialValue={true}
-              >
-                <Checkbox
-                  onChange={(e) =>
-                    setGenerateBundleSkuForSingle(e.target.checked)
-                  }
-                >
-                  启用为single类型生成bundle SKU
-                </Checkbox>
-              </ProForm.Item>
             </ProForm>
           </Card>
 
@@ -869,6 +890,50 @@ const CsvTool: React.FC = () => {
               </label>
               <Input value={file ? file.name : '暂未选择文件'} readOnly />
             </div>
+            <ProForm.Item
+              name="generateSkuForProducts"
+              label="为产品生成SKU"
+              tooltip="为所有产品记录生成SKU"
+              valuePropName="checked"
+              initialValue={true}
+            >
+              <Checkbox
+                onChange={(e) => setGenerateSkuForProducts(e.target.checked)}
+              >
+                启用为产品生成SKU
+              </Checkbox>
+            </ProForm.Item>
+
+            <ProForm.Item
+              name="generateNameForProducts"
+              label="为产品生成名称"
+              tooltip="为所有产品记录生成名称"
+              valuePropName="checked"
+              initialValue={true}
+            >
+              <Checkbox
+                onChange={(e) => setGenerateNameForProducts(e.target.checked)}
+              >
+                启用为产品生成名称
+              </Checkbox>
+            </ProForm.Item>
+
+            <ProForm.Item
+              name="generateBundleSkuForSingle"
+              label="为type=single生成bundle产品数据行"
+              tooltip="为类型为single的记录生成包含quantity的bundle SKU"
+              valuePropName="checked"
+              initialValue={true}
+            >
+              <Checkbox
+                onChange={(e) =>
+                  setGenerateBundleSkuForSingle(e.target.checked)
+                }
+              >
+                启用为single类型生成bundle SKU
+              </Checkbox>
+            </ProForm.Item>
+
             <Button
               type="primary"
               onClick={handleProcessData}

src/pages/Product/GroupBy/index.tsx

@@ -1,9 +1,18 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { PageContainer, ProFormSelect } from '@ant-design/pro-components';
-import { Card, Collapse, Divider, Image, Select, Space, Typography, message } from 'antd';
 import { categorycontrollerGetall } from '@/servers/api/category';
-import { productcontrollerGetproductlistgrouped } from '@/servers/api/product';
 import { dictcontrollerGetdictitems } from '@/servers/api/dict';
+import { productcontrollerGetproductlistgrouped } from '@/servers/api/product';
+import { PageContainer, ProFormSelect } from '@ant-design/pro-components';
+import {
+  Card,
+  Collapse,
+  Divider,
+  Image,
+  Select,
+  Space,
+  Typography,
+  message,
+} from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
 
 // Define interfaces
 interface Category {
@@ -55,13 +64,22 @@ const ProductCard: React.FC<{ product: Product }> = ({ product }) => {
         />
       </div> */}
       <div>
-        <Typography.Text type="secondary" style={{ fontSize: 12, display: 'block', marginBottom: '4px' }}>
+        <Typography.Text
+          type="secondary"
+          style={{ fontSize: 12, display: 'block', marginBottom: '4px' }}
+        >
           {product.sku}
         </Typography.Text>
-        <Typography.Text ellipsis style={{ width: '100%', display: 'block', marginBottom: '8px' }}>
+        <Typography.Text
+          ellipsis
+          style={{ width: '100%', display: 'block', marginBottom: '8px' }}
+        >
           {product.name}
         </Typography.Text>
-        <Typography.Text strong style={{ fontSize: 16, color: '#ff4d4f', display: 'block' }}>
+        <Typography.Text
+          strong
+          style={{ fontSize: 16, color: '#ff4d4f', display: 'block' }}
+        >
           ¥{product.price || '--'}
         </Typography.Text>
       </div>
@@ -90,7 +108,11 @@ const ProductGroup: React.FC<{
       )}
       <Typography.Title level={5} style={{ margin: 0 }}>
         <span>
-          {attributeValue?.titleCN || attributeValue?.title || attributeValue?.name || attributeValueId||'未知'}
+          {attributeValue?.titleCN ||
+            attributeValue?.title ||
+            attributeValue?.name ||
+            attributeValueId ||
+            '未知'}
           (共 {groupProducts.length} 个产品)
         </span>
       </Typography.Title>
@@ -108,7 +130,14 @@ const ProductGroup: React.FC<{
           key: attributeValueId,
           label: panelHeader,
           children: (
-            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '16px', paddingTop: '8px' }}>
+            <div
+              style={{
+                display: 'flex',
+                flexWrap: 'wrap',
+                gap: '16px',
+                paddingTop: '8px',
+              }}
+            >
               {groupProducts.map((product) => (
                 <ProductCard key={product.id} product={product} />
               ))}
@@ -126,7 +155,9 @@ const ProductGroupBy: React.FC = () => {
   const [categories, setCategories] = useState<Category[]>([]);
   const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
   // Store selected values for each attribute
-  const [attributeFilters, setAttributeFilters] = useState<{ [key: string]: number | null }>({});
+  const [attributeFilters, setAttributeFilters] = useState<{
+    [key: string]: number | null;
+  }>({});
 
   // Group by attribute
   const [groupByAttribute, setGroupByAttribute] = useState<string | null>(null);
@@ -139,12 +170,16 @@ const ProductGroupBy: React.FC = () => {
   // Extract all unique attributes from categories
   const categoryAttributes = useMemo(() => {
     if (!selectedCategory) return [];
-    const categoryItem = categories.find((category: any) => category.name === selectedCategory);
+    const categoryItem = categories.find(
+      (category: any) => category.name === selectedCategory,
+    );
     if (!categoryItem) return [];
-    const attributesList: Attribute[] = categoryItem.attributes.map((attribute: any, index) => ({
-      ...attribute.attributeDict,
-      id: index + 1,
-    }));
+    const attributesList: Attribute[] = categoryItem.attributes.map(
+      (attribute: any, index) => ({
+        ...attribute.attributeDict,
+        id: index + 1,
+      }),
+    );
     return attributesList;
   }, [selectedCategory]);
 
@@ -152,12 +187,16 @@ const ProductGroupBy: React.FC = () => {
   const fetchCategories = async () => {
     try {
       const response = await categorycontrollerGetall();
-      const rawCategories = Array.isArray(response) ? response : response?.data || [];
+      const rawCategories = Array.isArray(response)
+        ? response
+        : response?.data || [];
       setCategories(rawCategories);
 
       // Set default category
       if (rawCategories.length > 0) {
-        const defaultCategory = rawCategories.find((category: any) => category.name === 'nicotine-pouches');
+        const defaultCategory = rawCategories.find(
+          (category: any) => category.name === 'nicotine-pouches',
+        );
         setSelectedCategory(defaultCategory?.name || rawCategories[0].name);
       }
     } catch (error) {
@@ -170,16 +209,17 @@ const ProductGroupBy: React.FC = () => {
   useEffect(() => {
     if (!selectedCategory) return;
 
-    const category = categories.find(cat => cat.name === selectedCategory);
+    const category = categories.find((cat) => cat.name === selectedCategory);
     if (!category) return;
 
     // Get attributes for this category
-    const attributesForCategory = categoryAttributes.filter(attr =>
-      attr.name === 'brand' || category.attributes.includes(attr.name)
+    const attributesForCategory = categoryAttributes.filter(
+      (attr) =>
+        attr.name === 'brand' || category.attributes.includes(attr.name),
     );
     // Reset attribute filters when category changes
     const newFilters: { [key: string]: number | null } = {};
-    attributesForCategory.forEach(attr => {
+    attributesForCategory.forEach((attr) => {
       newFilters[attr.name] = null;
     });
     setAttributeFilters(newFilters);
@@ -191,8 +231,11 @@ const ProductGroupBy: React.FC = () => {
   }, [selectedCategory, categories, categoryAttributes]);
 
   // Handle attribute filter change
-  const handleAttributeFilterChange = (attributeName: string, value: number | null) => {
-    setAttributeFilters(prev => ({ ...prev, [attributeName]: value }));
+  const handleAttributeFilterChange = (
+    attributeName: string,
+    value: number | null,
+  ) => {
+    setAttributeFilters((prev) => ({ ...prev, [attributeName]: value }));
   };
 
   // Fetch products based on filters
@@ -201,16 +244,15 @@ const ProductGroupBy: React.FC = () => {
 
     setLoading(true);
     try {
-      const params: any = { 
-        category: selectedCategory, 
-        groupBy: groupByAttribute 
+      const params: any = {
+        category: selectedCategory,
+        groupBy: groupByAttribute,
       };
 
-
       const response = await productcontrollerGetproductlistgrouped(params);
       const grouped = response?.data || {};
       setGroupedProducts(grouped);
-      
+
       // Flatten grouped products to get all products
       const allProducts = Object.values(grouped).flat() as Product[];
       setProducts(allProducts);
@@ -242,7 +284,9 @@ const ProductGroupBy: React.FC = () => {
       <div style={{ padding: '16px', background: '#fff' }}>
         {/* Filter Section */}
         <div style={{ marginBottom: '24px' }}>
-          <Title level={4} style={{ marginBottom: '16px' }}>筛选条件</Title>
+          <Title level={4} style={{ marginBottom: '16px' }}>
+            筛选条件
+          </Title>
           <Space direction="vertical" size="large">
             {/* Category Filter */}
             <div>
@@ -256,7 +300,7 @@ const ProductGroupBy: React.FC = () => {
                 showSearch
                 optionFilterProp="children"
               >
-                {categories.map(category => (
+                {categories.map((category) => (
                   <Option key={category.id} value={category.name}>
                     {category.title}
                   </Option>
@@ -268,41 +312,61 @@ const ProductGroupBy: React.FC = () => {
             {categoryAttributes.length > 0 && (
               <div>
                 <Text strong>属性筛选：</Text>
-                <Space direction="vertical" style={{ marginTop: '8px', width: '100%' }}>
-                  {categoryAttributes.map(attr => (
-                      <div key={attr.id} style={{ display: 'flex', alignItems: 'center' }}>
-                        <Text style={{ width: '100px' }}>{attr.title}：</Text>
-                        <ProFormSelect
-                          placeholder={`请选择${attr.title}`}
-                          style={{ width: 300 }}
-                          value={attributeFilters[attr.name] || null}
-                          onChange={value => handleAttributeFilterChange(attr.name, value)}
-                          allowClear
-                          showSearch
-                          optionFilterProp="children"
-                          request={async (params) => {
-                            try {
-                              console.log('params', params,attr);
-                              const response = await dictcontrollerGetdictitems({ dictId: attr.name });
-                              const rawValues = Array.isArray(response) ? response : response?.data?.items || [];
-                              const filteredValues = rawValues.filter((value: any) => 
-                                value.dictId === attr.name || value.dict?.id === attr.name || value.dict?.name === attr.name
-                              );
-                              return {
-                                options: filteredValues.map((value: any) => ({
-                                  label: `${value.name}${value.titleCN || value.title}`,
-                                  value: value.id
-                                }))
-                              };
-                            } catch (error) {
-                              console.error(`Failed to fetch ${attr.title} values:`, error);
-                              message.error(`获取${attr.title}属性值失败`);
-                              return { options: [] };
-                            }
-                          }}
-                        />
-                      </div>
-                    ))}
+                <Space
+                  direction="vertical"
+                  style={{ marginTop: '8px', width: '100%' }}
+                >
+                  {categoryAttributes.map((attr) => (
+                    <div
+                      key={attr.id}
+                      style={{ display: 'flex', alignItems: 'center' }}
+                    >
+                      <Text style={{ width: '100px' }}>{attr.title}：</Text>
+                      <ProFormSelect
+                        placeholder={`请选择${attr.title}`}
+                        style={{ width: 300 }}
+                        value={attributeFilters[attr.name] || null}
+                        onChange={(value) =>
+                          handleAttributeFilterChange(attr.name, value)
+                        }
+                        allowClear
+                        showSearch
+                        optionFilterProp="children"
+                        request={async (params) => {
+                          try {
+                            console.log('params', params, attr);
+                            const response = await dictcontrollerGetdictitems({
+                              dictId: attr.name,
+                            });
+                            const rawValues = Array.isArray(response)
+                              ? response
+                              : response?.data?.items || [];
+                            const filteredValues = rawValues.filter(
+                              (value: any) =>
+                                value.dictId === attr.name ||
+                                value.dict?.id === attr.name ||
+                                value.dict?.name === attr.name,
+                            );
+                            return {
+                              options: filteredValues.map((value: any) => ({
+                                label: `${value.name}${
+                                  value.titleCN || value.title
+                                }`,
+                                value: value.id,
+                              })),
+                            };
+                          } catch (error) {
+                            console.error(
+                              `Failed to fetch ${attr.title} values:`,
+                              error,
+                            );
+                            message.error(`获取${attr.title}属性值失败`);
+                            return { options: [] };
+                          }
+                        }}
+                      />
+                    </div>
+                  ))}
                 </Space>
               </div>
             )}
@@ -319,7 +383,7 @@ const ProductGroupBy: React.FC = () => {
                   showSearch
                   optionFilterProp="children"
                 >
-                  {categoryAttributes.map(attr => (
+                  {categoryAttributes.map((attr) => (
                     <Option key={attr.id} value={attr.name}>
                       {attr.title}
                     </Option>
@@ -334,28 +398,41 @@ const ProductGroupBy: React.FC = () => {
 
         {/* Products Section */}
         <div>
-          <Title level={4} style={{ marginBottom: '16px' }}>产品列表 ({products.length} 个产品)</Title>
+          <Title level={4} style={{ marginBottom: '16px' }}>
+            产品列表 ({products.length} 个产品)
+          </Title>
 
           {loading ? (
             <div style={{ textAlign: 'center', padding: '64px' }}>
               <Text>加载中...</Text>
             </div>
           ) : groupByAttribute && Object.keys(groupedProducts).length > 0 ? (
-            <div style={{ display: 'flex', flexDirection: 'column', gap: '24px' }}>
-              {Object.entries(groupedProducts).map(([attrValueId, groupProducts]) => {
-                return (
-                  <ProductGroup
-                    key={attrValueId}
-                    attributeValueId={attrValueId}
-                    groupProducts={groupProducts}
-                    // attributeValue={}
-                    attributeName={groupByAttribute!}
-                  />
-                );
-              })}
+            <div
+              style={{ display: 'flex', flexDirection: 'column', gap: '24px' }}
+            >
+              {Object.entries(groupedProducts).map(
+                ([attrValueId, groupProducts]) => {
+                  return (
+                    <ProductGroup
+                      key={attrValueId}
+                      attributeValueId={attrValueId}
+                      groupProducts={groupProducts}
+                      // attributeValue={}
+                      attributeName={groupByAttribute!}
+                    />
+                  );
+                },
+              )}
             </div>
           ) : (
-            <div style={{ textAlign: 'center', padding: '64px', background: '#fafafa', borderRadius: 8 }}>
+            <div
+              style={{
+                textAlign: 'center',
+                padding: '64px',
+                background: '#fafafa',
+                borderRadius: 8,
+              }}
+            >
               <Text type="secondary">暂无产品</Text>
             </div>
           )}

src/pages/Product/List/BatchCreateBundleModal.tsx

@@ -0,0 +1,116 @@
+import {
+  productcontrollerCreateproduct,
+  productcontrollerGetproductlist,
+} from '@/servers/api/product';
+import { ModalForm, ProFormSelect } from '@ant-design/pro-components';
+import { App } from 'antd';
+import React from 'react';
+
+const BatchCreateBundleModal: React.FC<{
+  visible: boolean;
+  onClose: () => void;
+  onSuccess: () => void;
+}> = ({ visible, onClose, onSuccess }) => {
+  const { message } = App.useApp();
+
+  // 批量创建数量选项
+  const quantityOptions = [
+    { label: '1', value: 1 },
+    { label: '5', value: 5 },
+    { label: '10', value: 10 },
+    { label: '20', value: 20 },
+    { label: '50', value: 50 },
+    { label: '100', value: 100 },
+  ];
+
+  return (
+    <ModalForm
+      title="批量创建套装产品"
+      open={visible}
+      onOpenChange={(open) => !open && onClose()}
+      modalProps={{ destroyOnClose: true }}
+      onFinish={async (values) => {
+        const { products, quantity } = values;
+
+        if (!products || products.length === 0) {
+          message.error('请选择至少一个单品');
+          return false;
+        }
+
+        // 生成批量创建的 Promise 数组
+        const createPromises = products.flatMap((product: any) => {
+          return quantity.map((q: number) => {
+            const bundleSku = `bundle-${product.sku}-${q}`;
+            return productcontrollerCreateproduct({
+              sku: bundleSku,
+              name: `套装 ${product.name} x ${q}`,
+              type: 'bundle',
+              components: [
+                {
+                  sku: product.sku,
+                  quantity: q,
+                },
+              ],
+              attributes: [],
+            });
+          });
+        });
+
+        try {
+          // 并行执行批量创建
+          const results = await Promise.all(createPromises);
+
+          // 检查是否所有创建都成功
+          const allSuccess = results.every((result) => result.success);
+
+          if (allSuccess) {
+            const totalCreated = createPromises.length;
+            message.success(`成功创建 ${totalCreated} 个套装产品`);
+            onSuccess();
+            return true;
+          } else {
+            message.error('部分产品创建失败，请检查');
+            return false;
+          }
+        } catch (error) {
+          message.error('创建失败，请重试');
+          return false;
+        }
+      }}
+    >
+      <ProFormSelect
+        name="products"
+        label="选择单品"
+        mode="multiple"
+        placeholder="请选择要创建套装的单品"
+        rules={[{ required: true, message: '请选择至少一个单品' }]}
+        request={async ({ keyWords }) => {
+          const params = keyWords
+            ? { sku: keyWords, name: keyWords, type: 'single' }
+            : { pageSize: 9999, type: 'single' };
+          const { data } = await productcontrollerGetproductlist(params as any);
+          if (!data || !data.items) {
+            return [];
+          }
+          // 只返回类型为单品的产品
+          return data.items
+            .filter((item: any) => item.type === 'single' && item.sku)
+            .map((item: any) => ({
+              label: `${item.sku} - ${item.name}`,
+              value: item,
+            }));
+        }}
+      />
+      <ProFormSelect
+        name="quantity"
+        label="选择数量"
+        mode="multiple"
+        options={quantityOptions}
+        placeholder="请选择套装包含的单品数量"
+        rules={[{ required: true, message: '请选择至少一个数量' }]}
+      />
+    </ModalForm>
+  );
+};
+
+export default BatchCreateBundleModal;

src/pages/Product/List/EditForm.tsx

@@ -6,7 +6,6 @@ import {
   productcontrollerGetproductlist,
   productcontrollerUpdateproduct,
 } from '@/servers/api/product';
-import { sitecontrollerAll } from '@/servers/api/site';
 import { stockcontrollerGetstocks as getStocks } from '@/servers/api/stock';
 import {
   ActionType,

src/pages/Product/List/index.tsx

@@ -18,6 +18,7 @@ import {
 import { request } from '@umijs/max';
 import { App, Button, Modal, Popconfirm, Tag, Upload } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
+import BatchCreateBundleModal from './BatchCreateBundleModal';
 import CreateForm from './CreateForm';
 import EditForm from './EditForm';
 import SyncToSiteModal from './SyncToSiteModal';
@@ -188,6 +189,8 @@ const List: React.FC = () => {
   const [batchEditModalVisible, setBatchEditModalVisible] = useState(false);
   const [syncProducts, setSyncProducts] = useState<API.Product[]>([]);
   const [syncModalVisible, setSyncModalVisible] = useState(false);
+  const [batchCreateBundleModalVisible, setBatchCreateBundleModalVisible] =
+    useState(false);
 
   const { message } = App.useApp();
   // 导出产品 CSV(带认证请求)
@@ -463,6 +466,10 @@ const List: React.FC = () => {
           >
             批量修改
           </Button>,
+          // 批量创建 bundle 产品按钮
+          <Button onClick={() => setBatchCreateBundleModalVisible(true)}>
+            批量创建套装
+          </Button>,
           // 批量同步按钮
           <Button
             disabled={selectedRows.length <= 0}
@@ -578,6 +585,14 @@ const List: React.FC = () => {
           actionRef.current?.reload();
         }}
       />
+      <BatchCreateBundleModal
+        visible={batchCreateBundleModalVisible}
+        onClose={() => setBatchCreateBundleModalVisible(false)}
+        onSuccess={() => {
+          setBatchCreateBundleModalVisible(false);
+          actionRef.current?.reload();
+        }}
+      />
     </PageContainer>
   );
 };

src/pages/Site/List/index.tsx

@@ -58,7 +58,9 @@ export interface SiteItem {
 const SiteList: React.FC = () => {
   const actionRef = useRef<ActionType>();
   const [open, setOpen] = useState(false);
-  const [editing, setEditing] = useState<SiteItem & { areas: string[] } | null>(null);
+  const [editing, setEditing] = useState<
+    (SiteItem & { areas: string[] }) | null
+  >(null);
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const [batchEditOpen, setBatchEditOpen] = useState(false);
   const [batchEditForm] = Form.useForm();
@@ -292,11 +294,11 @@ const SiteList: React.FC = () => {
           <Button
             size="small"
             onClick={() => {
-              function normalEditing(row:SiteItem){
+              function normalEditing(row: SiteItem) {
                 return {
                   ...row,
-                  areas: row.areas?.map(area=>area.code) || [],
-                }
+                  areas: row.areas?.map((area) => area.code) || [],
+                };
               }
               setEditing(normalEditing(row));
               setOpen(true);

src/pages/Site/Shop/Layout.tsx

@@ -15,7 +15,9 @@ const ShopLayout: React.FC = () => {
   const location = useLocation();
 
   const [editModalOpen, setEditModalOpen] = useState(false);
-  const [editingSite, setEditingSite] = useState<SiteItem & { areas: string[] } | null>(null);
+  const [editingSite, setEditingSite] = useState<
+    (SiteItem & { areas: string[] }) | null
+  >(null);
 
   const fetchSites = async () => {
     try {
@@ -95,7 +97,12 @@ const ShopLayout: React.FC = () => {
       <Row gutter={16} style={{ height: 'calc(100vh - 100px)' }}>
         <Col span={4} style={{ height: '100%' }}>
           <Sider
-            style={{ background: 'white', height: '100%', overflow: 'hidden', zIndex: 1 }}
+            style={{
+              background: 'white',
+              height: '100%',
+              overflow: 'hidden',
+              zIndex: 1,
+            }}
           >
             <div style={{ padding: '0 10px 16px' }}>
               <div
@@ -103,7 +110,7 @@ const ShopLayout: React.FC = () => {
                   display: 'flex',
                   alignItems: 'center',
                   flexWrap: 'wrap',
-                  gap: '4px'
+                  gap: '4px',
                 }}
               >
                 <Select
@@ -128,8 +135,8 @@ const ShopLayout: React.FC = () => {
                       function normalizeEditing(site: SiteItem) {
                         return {
                           ...site,
-                          areas: site.areas?.map(area => area.code) || [],
-                        }
+                          areas: site.areas?.map((area) => area.code) || [],
+                        };
                       }
                       setEditingSite(normalizeEditing(currentSite));
                       setEditModalOpen(true);

src/pages/Site/Shop/Orders/index.tsx

@@ -238,11 +238,9 @@ const OrdersPage: React.FC = () => {
                     ? `快递方式: ${item.shipping_provider}`
                     : ''}
                 </span>
-                {
-                  item.shipping_method
-                    ? `发货方式: ${item.shipping_method}`
-                    : ''
-                }
+                {item.shipping_method
+                  ? `发货方式: ${item.shipping_method}`
+                  : ''}
                 <span>
                   {item.tracking_number
                     ? `物流单号: ${item.tracking_number}`

src/servers/api/index.ts

@@ -12,6 +12,7 @@ import * as order from './order';
 import * as product from './product';
 import * as site from './site';
 import * as siteApi from './siteApi';
+import * as siteProduct from './siteProduct';
 import * as statistics from './statistics';
 import * as stock from './stock';
 import * as subscription from './subscription';
@@ -28,6 +29,7 @@ export default {
   order,
   product,
   siteApi,
+  siteProduct,
   site,
   statistics,
   stock,

src/servers/api/siteProduct.ts

@@ -0,0 +1,33 @@
+// @ts-ignore
+/* eslint-disable */
+import { request } from 'umi';
+
+/** 此处后端没有提供注释 GET /site-product/list */
+export async function siteproductcontrollerGetsiteproductlist(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.siteproductcontrollerGetsiteproductlistParams,
+  options?: { [key: string]: any },
+) {
+  return request<any>('/site-product/list', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+/** 此处后端没有提供注释 POST /site-product/sync */
+export async function siteproductcontrollerSyncsiteproducts(
+  body: number,
+  options?: { [key: string]: any },
+) {
+  return request<any>('/site-product/sync', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'text/plain',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}

src/servers/api/typings.d.ts

@@ -1103,8 +1103,8 @@ declare namespace API {
     categoryId?: number;
     /** 库存组成 */
     components?: ProductStockComponent[];
-    /** 站点 SKU 列表 */
-    siteSkus?: string[];
+    /** 站点 SKU关联 */
+    siteSkus?: SiteSku[];
     /** 来源 */
     source?: number;
     /** 创建时间 */
@@ -1630,10 +1630,12 @@ declare namespace API {
     stockPointId?: number;
     orderIds?: number[];
     shipmentPlatform?: string;
+    courierCompany?: string;
   };
 
   type ShipmentFeeBookDTO = {
     shipmentPlatform?: string;
+    courierCompany?: string;
     stockPointId?: number;
     sender?: string;
     startPhone?: Record<string, any>;
@@ -2221,6 +2223,23 @@ declare namespace API {
     id: string;
   };
 
+  type siteproductcontrollerGetsiteproductlistParams = {
+    sku?: string;
+    name?: string;
+    siteId?: number;
+    pageSize?: number;
+    current?: number;
+  };
+
+  type SiteSku = {
+    /** sku */
+    sku?: string;
+    /** 商品ID */
+    productId?: number;
+    /** 是否旧版数据 */
+    isOld?: boolean;
+  };
+
   type SitesResponse = {
     /** 状态码 */
     code?: number;