From ac948ac0f4f5a883de15dd3fe6a4e316eed41d07 Mon Sep 17 00:00:00 2001 From: cll <931958862@qq.com> Date: Mon, 1 Sep 2025 11:52:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20track=E6=9F=A5=E8=AF=A2=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E5=90=8E=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Logistics/List/index.tsx | 12 +-- src/pages/Order/List/index.tsx | 10 +- src/pages/Track/index.tsx | 48 +++++---- src/servers/api/logistics.ts | 150 +++++++++++++++-------------- src/servers/api/order.ts | 13 ++- src/servers/api/typings.d.ts | 79 ++++++++------- 6 files changed, 167 insertions(+), 145 deletions(-) diff --git a/src/pages/Logistics/List/index.tsx b/src/pages/Logistics/List/index.tsx index 8a6adb0..c6bee4e 100644 --- a/src/pages/Logistics/List/index.tsx +++ b/src/pages/Logistics/List/index.tsx @@ -1,6 +1,6 @@ -import { logisticscontrollerGetlist, logisticscontrollerGetShipmentLabel, - logisticscontrollerDeleteShipment, - logisticscontrollerGetShipmentState +import { logisticscontrollerGetlist, logisticscontrollerGetshipmentlabel, + logisticscontrollerDeleteshipment, + 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); } diff --git a/src/pages/Order/List/index.tsx b/src/pages/Order/List/index.tsx index 2cb9d67..32266af 100644 --- a/src/pages/Order/List/index.tsx +++ b/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; diff --git a/src/pages/Track/index.tsx b/src/pages/Track/index.tsx index aad3e4a..c9d5ab0 100644 --- a/src/pages/Track/index.tsx +++ b/src/pages/Track/index.tsx @@ -1,6 +1,6 @@ import { - logisticscontrollerGetlistbytrackingid, - logisticscontrollerGettrackingnumber, + logisticscontrollerGetorderlist, + 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(); - const [data, setData] = useState([]); + const [data, setData] = useState({}); return ( { 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: ( { if (!id) { return; } - const { data } = await logisticscontrollerGetlistbytrackingid({ - shipment_id: id, + const { data } = await logisticscontrollerGetlistbyorderid({ + id, }); setData(data); }} @@ -46,22 +48,32 @@ const TrackPage: React.FC = () => { ), }} /> -
- {data.map((item) => ( + { + data?.item ?
-

- {item.name} * {item.quantity} -

-
- {item.constitution.map((v) => ( -
- {v.name} * {v.quantity * item.quantity} +
+

原订单内容

+ {data?.item?.map((item) => ( +
+ {item.name} * {item.quantity}
))}
-
- ))} -
+
: <> + } + { + data?.saleItem ? +
+
+

订单内容

+ {data?.saleItem?.map((item) => ( +
+ {item.name} * {item.quantity} +
+ ))} +
+
: <> + } ); }; diff --git a/src/servers/api/logistics.ts b/src/servers/api/logistics.ts index 3b772f1..471d338 100644 --- a/src/servers/api/logistics.ts +++ b/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(`/logistics/getShipmentFee`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - data: body, - ...(options || {}), - }); -} - - -/** 此处后端没有提供注释 POST /logistics/getShipmentLabel/${param0} */ -export async function logisticscontrollerGetShipmentLabel( - shipmentId: number -) { - return request(`/logistics/getShipmentLabel/${shipmentId}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - } - }); -} - -/** 此处后端没有提供注释 POST /logistics/updateState/${param0}**/ -export async function logisticscontrollerGetShipmentState( - shipmentId: number -) { - return request(`/logistics/updateState/${shipmentId}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - } - }) -} - -/** 此处后端没有提供注释 DEL /logistics/deleteShipment/${param0} */ -export async function logisticscontrollerDeleteShipment( - shipmentId: number -) { - return request(`/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(`/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 */ -export async function logisticscontrollerGetlistbytrackingid( +/** 此处后端没有提供注释 POST /logistics/getListByOrderId */ +export async function logisticscontrollerGetlistbyorderid( // 叠加生成的Param类型 (非body参数swagger默认没有生成对象) - params: API.logisticscontrollerGetlistbytrackingidParams, + params: API.logisticscontrollerGetlistbyorderidParams, options?: { [key: string]: any }, ) { - return request('/logistics/getListByTrackingId', { + return request('/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('/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('/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(`/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('/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(`/logistics/updateState/${param0}`, { + method: 'POST', + params: { ...queryParams }, + ...(options || {}), + }); +} diff --git a/src/servers/api/order.ts b/src/servers/api/order.ts index 92268b8..4d7d5a2 100644 --- a/src/servers/api/order.ts +++ b/src/servers/api/order.ts @@ -210,16 +210,19 @@ export async function ordercontrollerSyncorderbyid( } /** 此处后端没有提供注释 POST /order/updateOrderItems/${param0} */ -export async function ordercontrollerUpdateOrderItems( - orderId: number, - body: API.ShipmentSkuDTO, +export async function ordercontrollerUpdateorderitems( + // 叠加生成的Param类型 (非body参数swagger默认没有生成对象) + params: API.ordercontrollerUpdateorderitemsParams, + body: Record, options?: { [key: string]: any }, ) { - return request(`/order/updateOrderItems/${orderId}`, { + const { orderId: param0, ...queryParams } = params; + return request(`/order/updateOrderItems/${param0}`, { method: 'POST', headers: { - 'Content-Type': 'application/json', + 'Content-Type': 'text/plain', }, + params: { ...queryParams }, data: body, ...(options || {}), }); diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts index 7b79d20..1c044ea 100644 --- a/src/servers/api/typings.d.ts +++ b/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 = { - shipment_id?: string; + type logisticscontrollerGetlistbyorderidParams = { + id?: number; + }; + + type logisticscontrollerGetorderlistParams = { + number?: string; }; type logisticscontrollerGetservicelistParams = { @@ -189,11 +193,7 @@ declare namespace API { }; type logisticscontrollerGetshipmentlabelParams = { - shipmentId: string; - }; - - type logisticscontrollerGettrackingnumberParams = { - number?: string; + shipmentId: number; }; 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; - - sender: string; - startPhone: string; - startPostalCode: string; - pickupAddress: string; - // pickupWarehouse: number; // 此处用 stockPointId 到后端解析 - shipperCountryCode: string; - receiver: string; - city: string; - province: string; - country: string; - postalCode: string; - deliveryAddress: string; - receiverPhone: string; - receiverEmail: string; - length: number; - width: number; - height: number; - dimensionUom: string; - weight: number; - weightUom: string; + stockPointId?: number; + sender?: string; + startPhone?: string; + startPostalCode?: string; + pickupAddress?: string; + shipperCountryCode?: string; + receiver?: string; + city?: string; + province?: string; + country?: string; + postalCode?: string; + deliveryAddress?: string; + receiverPhone?: string; + receiverEmail?: string; + length?: number; + width?: number; + height?: number; + dimensionUom?: string; + weight?: number; + weightUom?: string; }; - type ShipmentSkuDTO = { - sales?: OrderSale[]; - } - type ShippingAddress = { id?: number; name?: string;