merge admin changes into release/test

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

@@ -1,5 +1,5 @@
-import { overseasHttp } from '@/shared/api/overseasHttp'
-import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
 import { listSharedReceivingOverseasWarehouseOptions } from '@/modules/iam'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'
 
@@ -9,12 +9,6 @@ export interface RelabelOrderQuery {
   relabelNo?: string
   skuCode?: string
   status?: string
-  reviewedFrom?: string
-  reviewedTo?: string
-  measuredFrom?: string
-  measuredTo?: string
-  outboundFrom?: string
-  outboundTo?: string
 }
 
 export interface CreateRelabelItemPayload {
@@ -88,9 +82,6 @@ export interface RelabelSummaryDto {
   customerConfirmedAt?: string | null
   reviewChannel?: 'TAIL_ORDER' | 'RELABEL_ORDER' | null
   reviewRemark?: string | null
-  reviewedAt?: string | null
-  measuredAt?: string | null
-  outboundAt?: string | null
   createdAt?: string | null
 }
 
@@ -159,21 +150,21 @@ export interface ReturnPackingPlanDto extends ReturnPackingPlanPayload {
 }
 
 export async function createReturnPackingPlan(payload: ReturnPackingPlanPayload) {
-  const response = await overseasHttp.post<ApiEnvelope<ReturnPackingPlanDto>, ApiEnvelope<ReturnPackingPlanDto>>(
+  const response = await http.post<ApiEnvelope<ReturnPackingPlanDto>, ApiEnvelope<ReturnPackingPlanDto>>(
     '/platform/v1/last-leg/return-packing-plans', payload,
   )
-  return unwrapApiResponse(response)
+  return unwrapApiResponse(response) as ReturnPackingPlanDto
 }
 
 export async function listRelabelOrders(query: RelabelOrderQuery) {
-  const response = await overseasHttp.get<ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>, ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>>(
+  const response = await http.get<ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>, ApiEnvelope<OverseasPagePayload<RelabelSummaryDto>>>(
     '/platform/v1/last-leg/relabel-applications', { params: query },
   )
   return normalizeOverseasPage(unwrapApiResponse(response))
 }
 
 export async function getRelabelOrder(relabelNo: string) {
-  const response = await overseasHttp.get<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
+  const response = await http.get<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`,
   )
   return unwrapApiResponse(response)
@@ -192,14 +183,14 @@ export async function listRelabelWarehouseOptions() {
 }
 
 export async function createRelabelOrder(customerId: string, payload: CreateRelabelPayload) {
-  const response = await overseasHttp.post<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
+  const response = await http.post<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
     '/platform/v1/last-leg/relabel-applications', payload, { params: { customerId } },
   )
   return unwrapApiResponse(response)
 }
 
 export async function changeRelabelOrderStatus(relabelNo: string, status: string, remark?: string) {
-  const response = await overseasHttp.put<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
+  const response = await http.put<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/status`,
     { status, remark },
   )
@@ -207,17 +198,17 @@ export async function changeRelabelOrderStatus(relabelNo: string, status: string
 }
 
 export async function getRelabelReviewTask(relabelNo: string) {
-  const response = await overseasHttp.get<ApiEnvelope<{ version: number; taskStatus: string }>, ApiEnvelope<{ version: number; taskStatus: string }>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/review-task`)
+  const response = await http.get<ApiEnvelope<{ version: number; taskStatus: string }>, ApiEnvelope<{ version: number; taskStatus: string }>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/review-task`)
   return unwrapApiResponse(response)
 }
 
 export async function returnRelabelForRework(relabelNo: string, expectedVersion: number, remark: string, idempotencyKey: string) {
-  const response = await overseasHttp.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/rework`, { decision: 'REWORK', expectedVersion, remark, idempotencyKey })
+  const response = await http.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/rework`, { decision: 'REWORK', expectedVersion, remark, idempotencyKey })
   return unwrapApiResponse(response)
 }
 
 export async function confirmRelabelCompletion(relabelNo: string, remark?: string) {
-  const response = await overseasHttp.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(
+  const response = await http.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/confirm-completion`,
     { idempotencyKey: crypto.randomUUID(), remark },
   )
@@ -227,7 +218,7 @@ export async function confirmRelabelCompletion(relabelNo: string, remark?: strin
 export async function uploadRelabelPdf(relabelNo: string, file: File, scope: 'TOTAL' | 'ITEM', itemId?: string) {
   const body = new FormData()
   body.append('file', file)
-  const response = await overseasHttp.post<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
+  const response = await http.post<ApiEnvelope<RelabelDetailDto>, ApiEnvelope<RelabelDetailDto>>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, body,
     { params: { scope, itemId }, headers: { 'Content-Type': 'multipart/form-data' } },
   )
@@ -235,14 +226,14 @@ export async function uploadRelabelPdf(relabelNo: string, file: File, scope: 'TO
 }
 
 export async function downloadRelabelPdf(relabelNo: string, fileId: string, scope: 'TOTAL' | 'ITEM', itemId?: string) {
-  return overseasHttp.get<Blob, Blob>(
+  return http.get<Blob, Blob>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files/${encodeURIComponent(fileId)}/download`,
     { params: { scope, itemId }, responseType: 'blob' },
   )
 }
 
 export async function downloadRelabelCompletionPhoto(relabelNo: string, fileId: string) {
-  return overseasHttp.get<Blob, Blob>(
+  return http.get<Blob, Blob>(
     `/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/completion-photos/${encodeURIComponent(fileId)}/download`,
     { responseType: 'blob' },
   )