优化

src/modules/overseas-warehouse/api/deliveryOrders.test.ts

@@ -28,7 +28,7 @@ describe('delivery order API', () => {
     await listDeliveryReturnInboundOptions('DEL/1', '1001')
     expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/return-inbound-options', { params: { customerId: '1001' } })
 
-    const payload = { inboundOrderId: '9', reason: '客户拒收', returnDirection: 'OVERSEAS_WAREHOUSE', packageCount: 2 }
+    const payload = { inboundOrderId: '9', reason: '客户拒收', returnDirection: 'OVERSEAS_WAREHOUSE' as const, items: [{ outboundPalletItemId: '9007199254740995', inventoryPositionId: '9007199254740996', packageCount: 2 }], idempotencyKey: 'return-1' }
     vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', data: { id: '19', exceptionNo: 'EXC-1', status: 'PENDING' } })
     await markDeliveryReturn('DEL/1', '1001', payload)
     expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1/mark-return', payload, { params: { customerId: '1001' } })

src/modules/overseas-warehouse/api/deliveryOrders.ts

@@ -1,7 +1,6 @@
 import { overseasHttp } from '@/shared/api/overseasHttp'
 import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
-import type { ExceptionRelation } from './exceptionOrders'
 import type { DeliveryDocumentSummary } from './deliveryDocuments'
 
 export interface DeliveryOrderQuery {
@@ -63,6 +62,29 @@ export interface DeliveryFeeRow { id: string; feeDirection: string; feeType: str
 export interface DeliveryOperationRow { id: string; operatedAt: string; operationNode: string; operatorName?: string | null; result: string }
 export interface DeliveryOrderDetail { order: DeliveryOrderRow; skus: DeliverySkuRow[]; fees: DeliveryFeeRow[]; operations: DeliveryOperationRow[] }
 
+export interface DeliveryReturnSource {
+  outboundPalletItemId: string
+  inventoryPositionId: string
+  palletNo?: string | null
+  skuCode?: string | null
+  maxReturnPackages: number
+}
+export interface DeliveryReturnRelation {
+  inboundOrderId: string
+  inboundCode?: string | null
+  lastMileOrderNo?: string | null
+  customerId: string
+  returnSources: DeliveryReturnSource[]
+}
+export interface MarkDeliveryReturnPayload {
+  inboundOrderId: string
+  reason: string
+  returnDirection: 'OVERSEAS_WAREHOUSE' | 'CUSTOMER' | 'OTHER'
+  returnLogisticsNo?: string
+  items: Array<{ outboundPalletItemId: string; inventoryPositionId: string; packageCount: number }>
+  idempotencyKey: string
+}
+
 export async function listDeliveryOrders(query: DeliveryOrderQuery) {
   const { customerId, ...params } = query
   const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<DeliveryOrderRow>>, ApiEnvelope<OverseasPagePayload<DeliveryOrderRow>>>(
@@ -79,13 +101,13 @@ export async function getDeliveryOrder(deliveryNo: string, customerId: string) {
 }
 
 export async function listDeliveryReturnInboundOptions(deliveryNo: string, customerId: string) {
-  const response = await overseasHttp.get<ApiEnvelope<ExceptionRelation[]>, ApiEnvelope<ExceptionRelation[]>>(
+  const response = await overseasHttp.get<ApiEnvelope<DeliveryReturnRelation[]>, ApiEnvelope<DeliveryReturnRelation[]>>(
     `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/return-inbound-options`, { params: { customerId } },
   )
   return unwrapApiResponse(response)
 }
 
-export async function markDeliveryReturn(deliveryNo: string, customerId: string, payload: { inboundOrderId: string; reason: string; returnDirection: string; returnLogisticsNo?: string; packageCount?: number; skuCode?: string }) {
+export async function markDeliveryReturn(deliveryNo: string, customerId: string, payload: MarkDeliveryReturnPayload) {
   const response = await overseasHttp.post<ApiEnvelope<{ id: string; exceptionNo: string; status: string }>, ApiEnvelope<{ id: string; exceptionNo: string; status: string }>>(
     `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}/mark-return`, payload, { params: { customerId } },
   )