From 128677e9ac8dee5c43de0050a1406b36a811971c Mon Sep 17 00:00:00 2001
From: zhuotianyuan <z13055603049@163.com>
Date: Wed, 28 Jan 2026 19:43:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=80=E4=BD=B3=E7=89=A9=E6=B5=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=B9=B6=E4=BC=98=E5=8C=96=E9=82=AE=E4=BB=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加"最佳物流"到快递公司选项列表
将origin.email_addresses改为直接使用而不分割，保持与destination.email_addresses处理方式一致
---
 src/pages/Order/List/index.tsx |  8 +++++---
 src/servers/api/index.ts       |  2 ++
 src/servers/api/siteProduct.ts | 33 +++++++++++++++++++++++++++++++++
 src/servers/api/typings.d.ts   | 23 +++++++++++++++++++++--
 4 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 src/servers/api/siteProduct.ts

diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx
index 42aecb9..548f61d 100644
--- a/src/pages/Order/List/index.tsx
+++ b/src/pages/Order/List/index.tsx
@@ -1386,6 +1386,7 @@ const Shipping: React.FC<{
     { label: 'tms.freightwaves', value: 'freightwaves' },
   ]);
   const [courierCompany, setCourierCompany] = useState([
+    { label: '最佳物流', value: '最优物流' },
     { label: 'UNIUNI', value: 'UNIUNI' },
     { label: 'PuroYYZ', value: 'PuroYYZ' },
     { label: 'CPYYZ', value: 'CPYYZ' },
@@ -1444,7 +1445,7 @@ const Shipping: React.FC<{
         if (shipmentInfo) shipmentInfo = JSON.parse(shipmentInfo);
         const a = {
           shipmentPlatform: 'uniuni',
-          courierCompany: 'UNIUNI',
+          courierCompany: '最优物流',
           ...data,
           // payment_method_id: shipmentInfo?.payment_method_id,
           stockPointId: shipmentInfo?.stockPointId,
@@ -1514,8 +1515,9 @@ const Shipping: React.FC<{
         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 =
@@ -2165,7 +2167,7 @@ const Shipping: React.FC<{
             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 =
diff --git a/src/servers/api/index.ts b/src/servers/api/index.ts
index 02f2319..da8aee8 100644
--- a/src/servers/api/index.ts
+++ b/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,
diff --git a/src/servers/api/siteProduct.ts b/src/servers/api/siteProduct.ts
new file mode 100644
index 0000000..c8c27d4
--- /dev/null
+++ b/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 || {}),
+  });
+}
diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts
index b034b67..c7c6f18 100644
--- a/src/servers/api/typings.d.ts
+++ b/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;