优化

src/modules/first-leg/store/firstLegOrders.test.mjs

@@ -19,6 +19,8 @@ test('declares the documented merchant warehouse and first-leg endpoints', () =>
 
 test('maps transport and status fields instead of treating container mode as transport mode', () => {
   assert.match(storeSource, /order\.transportMode === 'SEA'.*order\.containerMode === 'FULL_CONTAINER' \? 'FCL' : 'LCL'/s)
+  assert.match(storeSource, /order\.id \?\? order\.orderId \?\? ''/)
+  assert.match(storeSource, /order\.transportMode \? clientTransport\(order\) : null/)
   assert.match(storeSource, /draft\.transportMode === 'ROAD'\) return 'TRUCK'/)
   assert.match(storeSource, /status === 'SUBMITTED'\) return 'PENDING_REVIEW'/)
   assert.match(storeSource, /status === 'REJECTED'\) return 'PENDING_REVIEW'/)
@@ -88,6 +90,16 @@ test('sends backend-required channel, pricing, customs, destination and cargo fi
   assert.match(storeSource, /destinationWarehouseId: draft\.destinationType === 'PRIVATE' \? undefined : draft\.destinationWarehouseId/)
   assert.match(storeSource, /draft\.pickupMethod === 'PICKUP'.*draft\.shipperPartySnapshot/s)
   assert.match(storeSource, /draft\.destinationType === 'PRIVATE'.*draft\.consigneePartySnapshot/s)
+  for (const field of [
+    'customsHsCode', 'lengthCm', 'widthCm', 'heightCm', 'unitsPerPackage', 'totalQuantity',
+    'netWeightKg', 'unitDeclaredValue', 'material', 'usage', 'model', 'brand',
+    'productLengthCm', 'productWidthCm', 'productHeightCm', 'shipmentId', 'referenceId',
+    'productImageFileId',
+  ]) {
+    assert.match(storeSource, new RegExp(`${field}: item\\.`))
+  }
+  assert.match(apiSource, /POST[^\n]*product-images|method: 'POST', url: '\/merchant\/v1\/files\/product-images'/)
+  assert.match(apiSource, /GET[^\n]*product-images|method: 'GET', url: `\/merchant\/v1\/files\/product-images\/\$\{fileId\}`/)
 })
 
 test('separates domestic receiving warehouses from public destinations', () => {

src/modules/first-leg/store/firstLegOrders.ts

@@ -279,8 +279,9 @@ function mapOrder(order: MerchantFirstLegOrder, warehouses: PlatformReceivingWar
   const shipper = detail ? partySnapshot(detail, 'SENDER') : null
   const consignee = detail ? partySnapshot(detail, 'RECEIVER') : null
   return {
-    id: String(order.id), orderNo: order.orderNo, referenceNo: order.referenceId ?? '', transportMode: clientTransport(order),
-    businessType: 'EXPORT', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode,
+    id: String(order.id ?? order.orderId ?? ''), orderNo: order.orderNo, referenceNo: order.referenceId ?? '',
+    transportMode: order.transportMode ? clientTransport(order) : null,
+    businessType: 'EXPORT', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode || '',
     receivingWarehouseId: String(order.receivingWarehouseId), receivingWarehouseName: order.receivingWarehouseName,
     receivingWarehouseSnapshot: orderWarehouseSnapshot(order, warehouse), expectedDepartureDate: order.expectedShipDate ?? '', etd: '', eta: '',
     shipperPartyId: shipper?.id ?? '', shipperPartySnapshot: shipper, shipper: shipper?.name ?? '',
@@ -294,11 +295,11 @@ function mapOrder(order: MerchantFirstLegOrder, warehouses: PlatformReceivingWar
       customsHsCode: item.customsHsCode ?? '', lengthCm: item.lengthCm ?? 0, widthCm: item.widthCm ?? 0,
       heightCm: item.heightCm ?? 0, unitsPerPackage: item.unitsPerPackage ?? 1,
       pieces: item.totalQuantity ?? item.packageCount, packageCount: item.packageCount, grossWeightKg: item.grossWeightKg,
-      volumeCbm: item.volumeCbm, containerType: '', containerCount: 0, remark: item.cargoRemark ?? '',
+      volumeCbm: item.volumeCbm, remark: item.cargoRemark ?? '',
       packageType: item.packageType, hsCode: item.hsCode ?? '', declaredValue: item.declaredValue ?? 0,
       currency: item.currency ?? 'USD', dangerousGoods: item.dangerousGoods ?? false,
       netWeightKg: item.netWeightKg ?? 0, unitDeclaredValue: item.unitDeclaredValue ?? 0,
-      material: item.material ?? '', usage: item.usage ?? '', model: item.model ?? '', brand: item.brand ?? '',
+      material: item.material ?? '', usage: item.usage ?? item.productUsage ?? '', model: item.model ?? '', brand: item.brand ?? '',
       productLengthCm: item.productLengthCm ?? 0, productWidthCm: item.productWidthCm ?? 0,
       productHeightCm: item.productHeightCm ?? 0, shipmentId: item.shipmentId ?? order.shipmentId ?? '',
       referenceId: item.referenceId ?? order.referenceId ?? '',