fix(lastleg): unblock inbound plan handoff

2026-08-27 15:56:14 +08:00
parent adabec13d3
commit 0f2e201c38
28 changed files with 378 additions and 103 deletions
@@ -16,10 +16,16 @@ public record FirstLegLoadingPlanCompletedV1(
            String destinationWarehouseCode, String destinationWarehouseName,
            int packageCount, Integer productQuantity, Integer palletCount,
            BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-            List<Item> items, String customerId, String orderType, List<PalletSnapshot> pallets,
+            List<Item> items, String customerId, String customerName, String orderType, List<PalletSnapshot> pallets,
            String destinationType) {
        public Order {
            items = items == null ? List.of() : items;
+            if (customerId == null || customerId.isBlank()) {
+                throw new IllegalArgumentException("customerId is required");
+            }
+            if (customerName == null || customerName.isBlank()) {
+                throw new IllegalArgumentException("customerName is required");
+            }
            orderType = orderType == null || orderType.isBlank() ? "FIRST_LEG" : orderType;
            pallets = pallets == null ? List.of() : pallets;
        }
@@ -29,23 +35,13 @@ public record FirstLegLoadingPlanCompletedV1(
                     String destinationWarehouseCode, String destinationWarehouseName,
                     int packageCount, Integer productQuantity, Integer palletCount,
                     BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-                     List<Item> items, String customerId, String orderType, List<PalletSnapshot> pallets) {
+                     List<Item> items, String customerId, String customerName,
+                     String orderType, List<PalletSnapshot> pallets) {
            this(sourceInboundId, rootInboundId, sourceOrderId, sourceOrderNo, rootOrderId,
                inboundCode, destinationWarehouseId, destinationWarehouseCode,
                destinationWarehouseName, packageCount, productQuantity, palletCount,
-                grossWeightKg, netWeightKg, volumeCbm, items, customerId, orderType, pallets, null);
-        }
-        public Order(String sourceInboundId, String rootInboundId,
-                     String sourceOrderId, String sourceOrderNo, String rootOrderId,
-                     String inboundCode, String destinationWarehouseId,
-                     String destinationWarehouseCode, String destinationWarehouseName,
-                     int packageCount, Integer productQuantity, Integer palletCount,
-                     BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-                     List<Item> items) {
-            this(sourceInboundId, rootInboundId, sourceOrderId, sourceOrderNo, rootOrderId,
-                inboundCode, destinationWarehouseId, destinationWarehouseCode,
-                destinationWarehouseName, packageCount, productQuantity, palletCount,
-                grossWeightKg, netWeightKg, volumeCbm, items, null, "FIRST_LEG", List.of(), null);
+                grossWeightKg, netWeightKg, volumeCbm, items, customerId, customerName,
+                orderType, pallets, null);
        }
    }

@@ -15,11 +15,17 @@ public record FirstLegLoadingPlanCompletedV2(
            String destinationWarehouseCode, String destinationWarehouseName,
            int packageCount, Integer productQuantity, Integer palletCount,
            BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-            List<Item> items, String customerId, String orderType, List<PalletSnapshot> pallets,
+            List<Item> items, String customerId, String customerName, String orderType, List<PalletSnapshot> pallets,
            /** 目的类型：FBA 可按箱数收货，OVERSEAS 必须逐箱扫码。 */
            String destinationType) {
        public Order {
            items = items == null ? List.of() : items;
+            if (customerId == null || customerId.isBlank()) {
+                throw new IllegalArgumentException("customerId is required");
+            }
+            if (customerName == null || customerName.isBlank()) {
+                throw new IllegalArgumentException("customerName is required");
+            }
            orderType = orderType == null || orderType.isBlank() ? "FIRST_LEG" : orderType;
            pallets = pallets == null ? List.of() : pallets;
        }
@@ -30,24 +36,13 @@ public record FirstLegLoadingPlanCompletedV2(
                     String destinationWarehouseCode, String destinationWarehouseName,
                     int packageCount, Integer productQuantity, Integer palletCount,
                     BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-                     List<Item> items, String customerId, String orderType, List<PalletSnapshot> pallets) {
+                     List<Item> items, String customerId, String customerName,
+                     String orderType, List<PalletSnapshot> pallets) {
            this(sourceInboundId, rootInboundId, sourceOrderId, sourceOrderNo, rootOrderId,
                inboundCode, destinationWarehouseId, destinationWarehouseCode,
                destinationWarehouseName, packageCount, productQuantity, palletCount,
-                grossWeightKg, netWeightKg, volumeCbm, items, customerId, orderType, pallets, null);
-        }
-
-        public Order(String sourceInboundId, String rootInboundId,
-                     String sourceOrderId, String sourceOrderNo, String rootOrderId,
-                     String inboundCode, String destinationWarehouseId,
-                     String destinationWarehouseCode, String destinationWarehouseName,
-                     int packageCount, Integer productQuantity, Integer palletCount,
-                     BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
-                     List<Item> items) {
-            this(sourceInboundId, rootInboundId, sourceOrderId, sourceOrderNo, rootOrderId,
-                inboundCode, destinationWarehouseId, destinationWarehouseCode,
-                destinationWarehouseName, packageCount, productQuantity, palletCount,
-                grossWeightKg, netWeightKg, volumeCbm, items, null, "FIRST_LEG", List.of(), null);
+                grossWeightKg, netWeightKg, volumeCbm, items, customerId, customerName,
+                orderType, pallets, null);
        }
    }

@@ -0,0 +1,35 @@
+openapi: 3.1.0
+info:
+  title: Baiyue Cross-region Event Contracts
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    FirstLegLoadingPlanCompletedV2:
+      type: object
+      required: [loadingPlanId, containerBookingId, orders]
+      properties:
+        loadingPlanId: {type: string}
+        containerBookingId: {type: string}
+        containerNo: {type: string}
+        cabinetNo: {type: string}
+        warehouseId: {type: string}
+        warehouseName: {type: string}
+        orders:
+          type: array
+          items: {$ref: '#/components/schemas/FirstLegLoadingPlanCompletedOrderV2'}
+    FirstLegLoadingPlanCompletedOrderV2:
+      type: object
+      required: [sourceInboundId, customerId, customerName, packageCount, items, orderType, pallets, destinationType]
+      properties:
+        sourceInboundId: {type: string}
+        sourceOrderId: {type: string}
+        sourceOrderNo: {type: string}
+        inboundCode: {type: string}
+        customerId: {type: string, minLength: 1, description: Trusted customer identity frozen by Firstleg}
+        customerName: {type: string, minLength: 1, maxLength: 128, description: Immutable trusted container/customer name snapshot; consumers must not query domestic IAM}
+        packageCount: {type: integer, minimum: 1}
+        items: {type: array, items: {type: object}}
+        orderType: {type: string, enum: [FIRST_LEG, ONE_CLICK_DROPSHIP]}
+        pallets: {type: array, items: {type: object}}
+        destinationType: {type: string, enum: [FBA, OVERSEAS]}