fix: track查询更换后产品

src/pages/Logistics/List/index.tsx

@@ -1,6 +1,6 @@
-import { logisticscontrollerGetlist, logisticscontrollerGetShipmentLabel,
+import { logisticscontrollerGetlist, logisticscontrollerGetshipmentlabel,
-  logisticscontrollerDeleteShipment,
+  logisticscontrollerDeleteshipment,
-  logisticscontrollerGetShipmentState
+  logisticscontrollerUpdateshipmentstate
  } from '@/servers/api/logistics';
 import { stockcontrollerGetallstockpoints } from '@/servers/api/stock';
 import { formatUniuniShipmentState } from '@/utils/format';
@@ -106,7 +106,7 @@ const ListPage: React.FC = () => {
               disabled={isLoading}
               onClick={async () => {
                 setIsLoading(true);
-                const { data } = await logisticscontrollerGetShipmentLabel(record.id);
+                const { data } = await logisticscontrollerGetshipmentlabel(record.id);
                 const content = data.content;
                 printPDF([content]);
                 setIsLoading(false);
@@ -120,7 +120,7 @@ const ListPage: React.FC = () => {
               disabled={isLoading}
               onClick={async () => {
                 setIsLoading(true);
-                const res = await logisticscontrollerGetShipmentState(record.id);
+                const res = await logisticscontrollerUpdateshipmentstate(record.id);
                 console.log('res', res);
 
                 setIsLoading(false);
@@ -137,7 +137,7 @@ const ListPage: React.FC = () => {
                 try {
                   setIsLoading(true);
                   const { success, message: errMsg } =
-                  await logisticscontrollerDeleteShipment(record.id);
+                  await logisticscontrollerDeleteshipment(record.id);
                   if (!success) {
                     throw new Error(errMsg);
                   }

src/pages/Order/List/index.tsx

@@ -5,12 +5,12 @@ import { HistoryOrder } from '@/pages/Statistics/Order';
 import { ORDER_STATUS_ENUM } from '@/constants';
 import {
   logisticscontrollerCreateshipment,
-  logisticscontrollerGetShipmentFee,
+  logisticscontrollerGetshipmentfee,
   logisticscontrollerDelshipment,
   logisticscontrollerGetpaymentmethods,
   logisticscontrollerGetratelist,
   logisticscontrollerGetshippingaddresslist,
-  logisticscontrollerGetShipmentLabel,
+  // logisticscontrollerGetshipmentlabel,
 } from '@/servers/api/logistics';
 import {
   ordercontrollerCancelorder,
@@ -24,7 +24,7 @@ import {
   ordercontrollerRefundorder,
   ordercontrollerSyncorder,
   ordercontrollerSyncorderbyid,
-  ordercontrollerUpdateOrderItems,
+  ordercontrollerUpdateorderitems,
 } from '@/servers/api/order';
 import { productcontrollerSearchproducts } from '@/servers/api/product';
 import { sitecontrollerAll } from '@/servers/api/site';
@@ -1801,7 +1801,7 @@ const Shipping: React.FC<{
               details.destination.phone_number.phone;
             details.origin.phone_number.number = details.origin.phone_number.phone;
             const res =
-              await logisticscontrollerGetShipmentFee(
+              await logisticscontrollerGetshipmentfee(
                 {
                   stockPointId: data.stockPointId,
 
@@ -1907,7 +1907,7 @@ const SalesChange: React.FC<{
       }}
       onFinish={async (formData: any) => {
         const { sales } = formData;
-        const res = await ordercontrollerUpdateOrderItems(id, sales);
+        const res = await ordercontrollerUpdateorderitems(id, sales);
         if (!res.success) {
           message.error(`更新货物信息失败: ${res.message}`);
           return false;

src/pages/Track/index.tsx

@@ -1,6 +1,6 @@
 import {
-  logisticscontrollerGetlistbytrackingid,
+  logisticscontrollerGetorderlist,
-  logisticscontrollerGettrackingnumber,
+  logisticscontrollerGetlistbyorderid
 } from '@/servers/api/logistics';
 import { SearchOutlined } from '@ant-design/icons';
 import { PageContainer, ProFormSelect } from '@ant-design/pro-components';
@@ -8,7 +8,7 @@ import { useState } from 'react';
 
 const TrackPage: React.FC = () => {
   const [id, setId] = useState<string>();
-  const [data, setData] = useState([]);
+  const [data, setData] = useState({});
   return (
     <PageContainer>
       <ProFormSelect
@@ -17,7 +17,7 @@ const TrackPage: React.FC = () => {
         request={async ({ keyWords }) => {
           if (!keyWords || keyWords.length < 3) return [];
           const { data: trackList } =
-            await logisticscontrollerGettrackingnumber({ number: keyWords });
+            await logisticscontrollerGetorderlist({ number: keyWords });
           return trackList?.map((v) => {
             return {
               label: v.siteName + ' ' + v.externalOrderId,
@@ -29,7 +29,9 @@ const TrackPage: React.FC = () => {
           prefix: '订单号',
           onChange(value: string) {
             setId(value);
+            setData({})
           },
+          placeholder: '请输入订单号',
           allowClear: false,
           suffixIcon: (
             <SearchOutlined
@@ -37,8 +39,8 @@ const TrackPage: React.FC = () => {
                 if (!id) {
                   return;
                 }
-                const { data } = await logisticscontrollerGetlistbytrackingid({
+                const { data } = await logisticscontrollerGetlistbyorderid({
-                  shipment_id: id,
+                  id,
                 });
                 setData(data);
               }}
@@ -46,22 +48,32 @@ const TrackPage: React.FC = () => {
           ),
         }}
       />
+      {
+        data?.item ?
           <div>
-        {data.map((item) => (
             <div>
-            <h4>
+              <h4>原订单内容</h4>
-              {item.name} * {item.quantity}
+              {data?.item?.map((item) => (
-            </h4>
                 <div style={{ paddingLeft: 20, color: 'blue' }}>
-              {item.constitution.map((v) => (
+                  {item.name} * {item.quantity}
+                </div>
+              ))}
+            </div>
+          </div> : <></>
+      }
+      {
+        data?.saleItem ?
           <div>
-                  {v.name} * {v.quantity * item.quantity}
+            <div>
-                </div>
+              <h4>订单内容</h4>
-              ))}
+              {data?.saleItem?.map((item) => (
-            </div>
+                <div style={{ paddingLeft: 20, color: 'blue' }}>
+                  {item.name} * {item.quantity}
                 </div>
               ))}
             </div>
+          </div> : <></>
+      }
     </PageContainer>
   );
 };

src/servers/api/logistics.ts

@@ -21,61 +21,6 @@ export async function logisticscontrollerCreateshipment(
   });
 }
 
-/** 此处后端没有提供注释 POST /logistics/getShipmentFee */
-export async function logisticscontrollerGetShipmentFee(
-  body: API.ShipmentFeeBookDTO,
-  options?: { [key: string]: any },
-) {
-  return request<API.BooleanRes>(`/logistics/getShipmentFee`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-
-/** 此处后端没有提供注释 POST /logistics/getShipmentLabel/${param0} */
-export async function logisticscontrollerGetShipmentLabel(
-  shipmentId: number
-) {
-  return request<API.BooleanRes>(`/logistics/getShipmentLabel/${shipmentId}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    }
-  });
-}
-
-/** 此处后端没有提供注释 POST /logistics/updateState/${param0}**/
-export async function logisticscontrollerGetShipmentState(
-  shipmentId: number
-) {
-  return request<API.BooleanRes>(`/logistics/updateState/${shipmentId}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    }
-  })
-}
-
-/** 此处后端没有提供注释 DEL /logistics/deleteShipment/${param0} */
-export async function logisticscontrollerDeleteShipment(
-  shipmentId: number
-) {
-  return request<API.BooleanRes>(`/logistics/deleteShipment/${shipmentId}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    }
-  });
-}
-
-
-
-
 /** 此处后端没有提供注释 POST /logistics/createShippingAddress */
 export async function logisticscontrollerCreateshippingaddress(
   body: API.ShippingAddress,
@@ -91,6 +36,20 @@ export async function logisticscontrollerCreateshippingaddress(
   });
 }
 
+/** 此处后端没有提供注释 POST /logistics/deleteShipment/${param0} */
+export async function logisticscontrollerDeleteshipment(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.logisticscontrollerDeleteshipmentParams,
+  options?: { [key: string]: any },
+) {
+  const { id: param0, ...queryParams } = params;
+  return request<API.BooleanRes>(`/logistics/deleteShipment/${param0}`, {
+    method: 'POST',
+    params: { ...queryParams },
+    ...(options || {}),
+  });
+}
+
 /** 此处后端没有提供注释 DELETE /logistics/delShippingAddress/${param0} */
 export async function logisticscontrollerDelshippingaddress(
   // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
@@ -105,13 +64,28 @@ export async function logisticscontrollerDelshippingaddress(
   });
 }
 
-/** 此处后端没有提供注释 POST /logistics/getListByTrackingId */
+/** 此处后端没有提供注释 POST /logistics/getListByOrderId */
-export async function logisticscontrollerGetlistbytrackingid(
+export async function logisticscontrollerGetlistbyorderid(
   // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
-  params: API.logisticscontrollerGetlistbytrackingidParams,
+  params: API.logisticscontrollerGetlistbyorderidParams,
   options?: { [key: string]: any },
 ) {
-  return request<any>('/logistics/getListByTrackingId', {
+  return request<any>('/logistics/getListByOrderId', {
+    method: 'POST',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+/** 此处后端没有提供注释 POST /logistics/getOrderList */
+export async function logisticscontrollerGetorderlist(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.logisticscontrollerGetorderlistParams,
+  options?: { [key: string]: any },
+) {
+  return request<any>('/logistics/getOrderList', {
     method: 'POST',
     params: {
       ...params,
@@ -160,6 +134,35 @@ export async function logisticscontrollerGetservicelist(
   });
 }
 
+/** 此处后端没有提供注释 POST /logistics/getShipmentFee */
+export async function logisticscontrollerGetshipmentfee(
+  body: API.ShipmentFeeBookDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.BooleanRes>('/logistics/getShipmentFee', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 此处后端没有提供注释 POST /logistics/getShipmentLabel/${param0} */
+export async function logisticscontrollerGetshipmentlabel(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.logisticscontrollerGetshipmentlabelParams,
+  options?: { [key: string]: any },
+) {
+  const { shipmentId: param0, ...queryParams } = params;
+  return request<API.BooleanRes>(`/logistics/getShipmentLabel/${param0}`, {
+    method: 'POST',
+    params: { ...queryParams },
+    ...(options || {}),
+  });
+}
+
 /** 此处后端没有提供注释 GET /logistics/getShippingAddressList */
 export async function logisticscontrollerGetshippingaddresslist(options?: {
   [key: string]: any;
@@ -173,21 +176,6 @@ export async function logisticscontrollerGetshippingaddresslist(options?: {
   );
 }
 
-/** 此处后端没有提供注释 POST /logistics/getTrackingNumber */
-export async function logisticscontrollerGettrackingnumber(
-  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
-  params: API.logisticscontrollerGettrackingnumberParams,
-  options?: { [key: string]: any },
-) {
-  return request<any>('/logistics/getTrackingNumber', {
-    method: 'POST',
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
 /** 此处后端没有提供注释 GET /logistics/list */
 export async function logisticscontrollerGetlist(options?: {
   [key: string]: any;
@@ -255,3 +243,17 @@ export async function logisticscontrollerUpdateshippingaddress(
     ...(options || {}),
   });
 }
+
+/** 此处后端没有提供注释 POST /logistics/updateState/${param0} */
+export async function logisticscontrollerUpdateshipmentstate(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.logisticscontrollerUpdateshipmentstateParams,
+  options?: { [key: string]: any },
+) {
+  const { id: param0, ...queryParams } = params;
+  return request<any>(`/logistics/updateState/${param0}`, {
+    method: 'POST',
+    params: { ...queryParams },
+    ...(options || {}),
+  });
+}

src/servers/api/order.ts

@@ -210,16 +210,19 @@ export async function ordercontrollerSyncorderbyid(
 }
 
 /** 此处后端没有提供注释 POST /order/updateOrderItems/${param0} */
-export async function ordercontrollerUpdateOrderItems(
+export async function ordercontrollerUpdateorderitems(
-  orderId: number,
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
-  body: API.ShipmentSkuDTO,
+  params: API.ordercontrollerUpdateorderitemsParams,
+  body: Record<string, any>,
   options?: { [key: string]: any },
 ) {
-  return request<API.BooleanRes>(`/order/updateOrderItems/${orderId}`, {
+  const { orderId: param0, ...queryParams } = params;
+  return request<API.BooleanRes>(`/order/updateOrderItems/${param0}`, {
     method: 'POST',
     headers: {
-      'Content-Type': 'application/json',
+      'Content-Type': 'text/plain',
     },
+    params: { ...queryParams },
     data: body,
     ...(options || {}),
   });

src/servers/api/typings.d.ts

@@ -168,15 +168,19 @@ declare namespace API {
   };
 
   type logisticscontrollerDelshipmentParams = {
-    id: string;
+    id: number;
   };
 
   type logisticscontrollerDelshippingaddressParams = {
     id: number;
   };
 
-  type logisticscontrollerGetlistbytrackingidParams = {
+  type logisticscontrollerGetlistbyorderidParams = {
-    shipment_id?: string;
+    id?: number;
+  };
+
+  type logisticscontrollerGetorderlistParams = {
+    number?: string;
   };
 
   type logisticscontrollerGetservicelistParams = {
@@ -189,11 +193,7 @@ declare namespace API {
   };
 
   type logisticscontrollerGetshipmentlabelParams = {
-    shipmentId: string;
+    shipmentId: number;
-  };
-
-  type logisticscontrollerGettrackingnumberParams = {
-    number?: string;
   };
 
   type logisticscontrollerUpdateshippingaddressParams = {
@@ -216,7 +216,7 @@ declare namespace API {
     externalOrderId?: string;
     status?: any;
     orderStatus?: any;
-    shipmentId?: string;
+    shipmentId?: number;
     currency?: string;
     currency_symbol?: string;
     prices_include_tax?: boolean;
@@ -341,13 +341,17 @@ declare namespace API {
     siteId: string;
   };
 
+  type ordercontrollerUpdateorderitemsParams = {
+    orderId: number;
+  };
+
   type OrderDetail = {
     id?: number;
     siteId?: string;
     externalOrderId?: string;
     status?: any;
     orderStatus?: any;
-    shipmentId?: string;
+    shipmentId?: number;
     currency?: string;
     currency_symbol?: string;
     prices_include_tax?: boolean;
@@ -494,6 +498,10 @@ declare namespace API {
     sku?: string;
     quantity?: number;
     isPackage?: boolean;
+    isYoone?: boolean;
+    isZex?: boolean;
+    size?: number;
+    isYooneNew?: boolean;
     /** 创建时间 */
     createdAt?: string;
     /** 更新时间 */
@@ -511,6 +519,10 @@ declare namespace API {
     sku?: string;
     quantity?: number;
     isPackage?: boolean;
+    isYoone?: boolean;
+    isZex?: boolean;
+    size?: number;
+    isYooneNew?: boolean;
     /** 创建时间 */
     createdAt?: string;
     /** 更新时间 */
@@ -994,35 +1006,28 @@ declare namespace API {
   };
 
   type ShipmentFeeBookDTO = {
-    // 发货点，传id到后端解析
+    stockPointId?: number;
-    stockPointId: number;
+    sender?: string;
-
+    startPhone?: string;
-    sender: string;
+    startPostalCode?: string;
-    startPhone: string;
+    pickupAddress?: string;
-    startPostalCode: string;
+    shipperCountryCode?: string;
-    pickupAddress: string;
+    receiver?: string;
-    // pickupWarehouse: number; // 此处用 stockPointId 到后端解析
+    city?: string;
-    shipperCountryCode: string;
+    province?: string;
-    receiver: string;
+    country?: string;
-    city: string;
+    postalCode?: string;
-    province: string;
+    deliveryAddress?: string;
-    country: string;
+    receiverPhone?: string;
-    postalCode: string;
+    receiverEmail?: string;
-    deliveryAddress: string;
+    length?: number;
-    receiverPhone: string;
+    width?: number;
-    receiverEmail: string;
+    height?: number;
-    length: number;
+    dimensionUom?: string;
-    width: number;
+    weight?: number;
-    height: number;
+    weightUom?: string;
-    dimensionUom: string;
-    weight: number;
-    weightUom: string;
   };
 
-  type ShipmentSkuDTO = {
-    sales?: OrderSale[];
-  }
-
   type ShippingAddress = {
     id?: number;
     name?: string;