优化

src/modules/loading-lists/api/containerFees.ts

@@ -1,4 +1,5 @@
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { listSuppliers, type SupplierCategory } from '@/modules/suppliers'
 
 export type ContainerFeeDirection = 'RECEIVABLE' | 'PAYABLE'
 export type ContainerFeeReviewStatus = 'PENDING' | 'APPROVED' | 'REJECTED'
@@ -11,12 +12,12 @@ export interface ContainerFeeResource {
   feeItemId: string
   feeItemName: string
   direction: ContainerFeeDirection
-  partnerId: string | null
-  partnerName: string | null
+  supplierId: string | null
+  supplierName: string | null
+  supplierCategory: SupplierCategory | null
   businessDate: string
   amount: number
   currency: 'CNY'
-  settlementIncluded: boolean
   reviewStatus: ContainerFeeReviewStatus
   sourceStatus: 'ACTIVE' | 'VOIDED'
   sourceVersion: number
@@ -29,12 +30,10 @@ export interface ContainerFeeResource {
 export interface ContainerFeeSaveRequest {
   feeItemId: string
   direction: ContainerFeeDirection
-  partnerId: string | null
-  partnerName: string | null
+  supplierId: string | null
   businessDate: string
   amount: number
   currency: 'CNY'
-  settlementIncluded: boolean
   remark: string | null
 }
 
@@ -47,15 +46,18 @@ export interface ContainerFeeAdjustRequest {
 export interface ApplicableFeeItem {
   id: string
   name: string
+  feeCode: string
+  supplierCategory: SupplierCategory | null
   warehouseReceivable: boolean
   warehousePayable: boolean
   pickupReceivable: boolean
   pickupPayable: boolean
 }
 
-export interface ContainerFeePartnerOption {
+export interface ContainerFeeSupplierOption {
   id: string
-  partnerName: string
+  supplierName: string
+  category: SupplierCategory
 }
 
 export interface ContainerCostAllocation {
@@ -80,6 +82,8 @@ export interface ContainerCostDetail {
 
 const id = (value: unknown) => value == null ? '' : String(value)
 const numberValue = (value: unknown) => Number.isFinite(Number(value)) ? Number(value) : 0
+const supplierCategories: SupplierCategory[] = ['BOOKING', 'CUSTOMS', 'TRUCKING', 'CERTIFICATE']
+const supplierCategory = (value: unknown): SupplierCategory | null => supplierCategories.includes(value as SupplierCategory) ? value as SupplierCategory : null
 const base = (planId: string) => `/platform/v1/loading-plans/${encodeURIComponent(planId)}/fee-details`
 const params = (accountId: string) => ({ accountId })
 
@@ -88,9 +92,10 @@ function normalizeFee(raw: Record<string, unknown>): ContainerFeeResource {
     id: id(raw.id), loadingPlanId: id(raw.loadingPlanId), containerBookingId: raw.containerBookingId == null ? null : id(raw.containerBookingId),
     containerNo: raw.containerNo == null ? null : String(raw.containerNo), feeItemId: id(raw.feeItemId),
     feeItemName: String(raw.feeItemNameSnapshot || ''), direction: raw.direction as ContainerFeeDirection,
-    partnerId: raw.partnerId == null ? null : id(raw.partnerId), partnerName: raw.partnerName == null ? null : String(raw.partnerName),
+    supplierId: raw.supplierId == null ? null : id(raw.supplierId), supplierName: raw.supplierName == null ? null : String(raw.supplierName),
+    supplierCategory: supplierCategory(raw.supplierCategory),
     businessDate: String(raw.businessDate || ''), amount: numberValue(raw.amount), currency: 'CNY',
-    settlementIncluded: Boolean(raw.settlementIncluded), reviewStatus: raw.reviewStatus as ContainerFeeReviewStatus,
+    reviewStatus: raw.reviewStatus as ContainerFeeReviewStatus,
     sourceStatus: raw.sourceStatus as ContainerFeeResource['sourceStatus'], sourceVersion: numberValue(raw.sourceVersion),
     remark: raw.remark == null ? null : String(raw.remark), reviewerName: raw.reviewerName == null ? null : String(raw.reviewerName),
     reviewedAt: raw.reviewedAt == null ? null : String(raw.reviewedAt), reviewReason: raw.reviewReason == null ? null : String(raw.reviewReason),
@@ -126,12 +131,12 @@ export async function voidContainerFee(planId: string, accountId: string, feeId:
 
 export async function listApplicableFeeItems() {
   const response = await http.get<ApiEnvelope<{ records: Record<string, unknown>[] }>, ApiEnvelope<{ records: Record<string, unknown>[] }>>('/platform/v1/fee-items', { params: { status: 'ACTIVE', page: 1, size: 200 } })
-  return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), name: String(raw.feeTypeName || ''), warehouseReceivable: Boolean(raw.warehouseReceivable), warehousePayable: Boolean(raw.warehousePayable), pickupReceivable: Boolean(raw.pickupReceivable), pickupPayable: Boolean(raw.pickupPayable) }))
+  return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), name: String(raw.feeTypeName || ''), feeCode: String(raw.feeCode || ''), supplierCategory: supplierCategory(raw.supplierCategory), warehouseReceivable: Boolean(raw.warehouseReceivable), warehousePayable: Boolean(raw.warehousePayable), pickupReceivable: Boolean(raw.pickupReceivable), pickupPayable: Boolean(raw.pickupPayable) }))
 }
 
-export async function listContainerFeePartnerOptions(): Promise<ContainerFeePartnerOption[]> {
-  const response = await http.get<ApiEnvelope<{ records: Record<string, unknown>[] }>, ApiEnvelope<{ records: Record<string, unknown>[] }>>('/platform/v1/partners', { params: { status: 'ACTIVE', page: 1, size: 200 } })
-  return (unwrapApiResponse(response).records || []).map((raw) => ({ id: id(raw.id), partnerName: String(raw.partnerName || '') }))
+export async function listContainerFeeSupplierOptions(category: SupplierCategory): Promise<ContainerFeeSupplierOption[]> {
+  const page = await listSuppliers({ status: 'ACTIVE', category, page: 1, size: 200 })
+  return page.records.filter((supplier) => supplier.status === 'ACTIVE' && supplier.category === category).map((supplier) => ({ id: supplier.id, supplierName: supplier.name, category: supplier.category }))
 }
 
 export async function listContainerCostDetails(customerId: string, containerId: string): Promise<ContainerCostDetail[]> {