zhuotianyuan
/
WEB
forked from yoone/WEB
1
0
Fork 0
Code Pull Requests Activity

Fix: 获取运费增加正确提示

This commit is contained in:
黄珑 2025-08-23 17:43:01 +08:00 committed by longbot
parent d54782f742
commit 68a7b02d21
4 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages/Order/List/index.tsx
View File

@ -1787,11 +1787,30 @@ const Shipping: React.FC<{
const res =
await logisticscontrollerGetShipmentFee(
{
details,
...data
stockPointId: data.stockPointId,
sender: details.origin.contact_name,
startPhone: details.origin.phone_number,
startPostalCode: details.origin.address.postal_code.replace(/\s/g, ''),
pickupAddress: details.origin.address.address_line_1,
shipperCountryCode: details.origin.address.country,
receiver: details.destination.contact_name,
city: details.destination.address.city,
province: details.destination.address.region,
country: details.destination.address.country,
postalCode: details.destination.address.postal_code.replace(/\s/g, ''),
deliveryAddress: details.destination.address.address_line_1,
receiverPhone: details.destination.phone_number.number,
receiverEmail: details.destination.email_addresses,
length: details.packaging_properties.packages[0].measurements.cuboid.l,
width: details.packaging_properties.packages[0].measurements.cuboid.w,
height: details.packaging_properties.packages[0].measurements.cuboid.h,
dimensionUom: details.packaging_properties.packages[0].measurements.cuboid.unit,
weight: details.packaging_properties.packages[0].measurements.weight.value,
weightUom: details.packaging_properties.packages[0].measurements.weight.unit,
},
);
if (!res?.success) throw new Error(res?.errMsg);
if (!res?.success) throw new Error(res?.message);
const fee = res.data;
setShipmentFee(fee);
details.origin.email_addresses = originEmail;
@ -1800,6 +1819,7 @@ const Shipping: React.FC<{
...details,
shipmentFee: fee
});
message.success('获取运费成功');
} catch (error) {
message.error(error?.message || '获取运费失败');
}

1
src/pages/Stock/PurchaseOrder/index.tsx
View File

@ -525,6 +525,7 @@ const DetailForm: React.FC<{
id: number;
};
}> = ({ tableRef, values }) => {
const detailsActionRef = useRef<ActionType>();
const { message } = App.useApp();
const [form] = Form.useForm();
const initialValues = {

2
src/servers/api/logistics.ts
View File

@ -23,7 +23,7 @@ export async function logisticscontrollerCreateshipment(
/** 此处后端没有提供注释 POST /logistics/getShipmentFee */
export async function logisticscontrollerGetShipmentFee(
body: API.ShipmentBookDTO,
body: API.ShipmentFeeBookDTO,
options?: { [key: string]: any },
) {
return request<API.BooleanRes>(`/logistics/getShipmentFee`, {

26
src/servers/api/typings.d.ts vendored
View File

@ -993,6 +993,32 @@ declare namespace API {
orderIds?: number[];
};
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;
};
type ShipmentSkuDTO = {
sales?: OrderSale[];
}