优化

lastleg-service/src/main/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardService.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.looseboard.service;
 
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -203,7 +205,9 @@ public class LocalLooseboardService {
         order.setOriginAddress(trim(originAddress));
         order.setDestination(destination.trim());
         order.setDestinationAddress(trim(destinationAddress));
-        order.setContainerType(trim(containerType));
+        order.setContainerType(StringUtils.hasText(containerType)
+            ? ContainerSpecificationCatalog.require(containerType).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPackageCount(packageCount);
         order.setTotalWeightKg(totalWeightKg);
         order.setTotalVolumeCbm(totalVolumeCbm);

lastleg-service/src/main/java/com/baiyue/lastleg/trucking/service/UsTruckOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderResponses;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrder;
@@ -84,7 +85,9 @@ public class UsTruckOrderService {
         order.setTransportType(StringUtils.hasText(request.transportType()) ? norm(request.transportType()) : null);
         order.setOrigin(trim(request.origin())); order.setOriginAddress(trim(request.originAddress()));
         order.setDestination(trim(request.destination())); order.setDestinationAddress(trim(request.destinationAddress()));
-        order.setContainerType(StringUtils.hasText(request.containerType()) ? norm(request.containerType()) : null);
+        order.setContainerType(StringUtils.hasText(request.containerType())
+            ? ContainerSpecificationCatalog.require(request.containerType()).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPalletCount(request.palletCount()); order.setPackageCount(value(request.packageCount()));
         order.setReceivedPalletCount(0); order.setAllocatedPalletCount(0);
         order.setTotalWeightKg(request.totalWeightKg()); order.setTotalVolumeCbm(request.totalVolumeCbm());
@@ -138,7 +141,8 @@ public class UsTruckOrderService {
         if (request.transportType() != null) { validateTransport(request.transportType()); order.setTransportType(norm(request.transportType())); }
         setText(request.origin(), order::setOrigin); setPresent(request.originAddress(), order::setOriginAddress);
         setText(request.destination(), order::setDestination); setPresent(request.destinationAddress(), order::setDestinationAddress);
-        setText(request.containerType(), v -> order.setContainerType(norm(v)));
+        setText(request.containerType(), v -> order.setContainerType(
+            ContainerSpecificationCatalog.require(v).containerType()));
         if (request.palletCount() != null) order.setPalletCount(request.palletCount());
         if (request.packageCount() != null) order.setPackageCount(request.packageCount());
         if (request.totalWeightKg() != null) order.setTotalWeightKg(request.totalWeightKg()); if (request.totalVolumeCbm() != null) order.setTotalVolumeCbm(request.totalVolumeCbm());

lastleg-service/src/main/resources/db/lastleg.sql

@@ -2005,7 +2005,7 @@ CREATE TABLE IF NOT EXISTS ll_us_truck_order (
   origin_address VARCHAR(500) NULL COMMENT '起运地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地',
   destination_address VARCHAR(500) NULL COMMENT '目的地址',
-  container_type VARCHAR(32) NULL COMMENT '历史兼容设备类型，零担托盘业务不采集',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ',
   pallet_count INT NOT NULL DEFAULT 1 COMMENT '客户申报托盘数',
   package_count INT NULL COMMENT '可选箱数，零或空值均有效',
   received_pallet_count INT NOT NULL DEFAULT 0 COMMENT 'PDA实收托盘数',
@@ -2083,7 +2083,7 @@ CREATE TABLE IF NOT EXISTS ll_local_looseboard_order (
   pallet_required VARCHAR(8) NOT NULL COMMENT '是否需要打盘：YES或NO', transport_type VARCHAR(32) NOT NULL COMMENT '运输类型',
   origin VARCHAR(255) NOT NULL COMMENT '起运地', origin_address VARCHAR(500) NULL COMMENT '起运详细地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地', destination_address VARCHAR(500) NULL COMMENT '目的详细地址、码头或仓号',
-  container_type VARCHAR(32) NULL COMMENT '柜型', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
   total_weight_kg DECIMAL(18,3) NOT NULL DEFAULT 0 COMMENT '总重量（千克）',
   total_volume_cbm DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '总体积（立方米）',
   budget_amount DECIMAL(18,2) NULL COMMENT '预算总价', currency CHAR(3) NOT NULL DEFAULT 'USD' COMMENT '预算币种',

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -2704,7 +2704,7 @@ components:
         transportType: { type: string, nullable: true }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         palletCount: { type: integer }
         packageCount: { type: integer }
         receivedPalletCount: { type: integer }
@@ -2760,7 +2760,7 @@ components:
         transportType: { type: string }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         packageCount: { type: integer }
         totalWeightKg: { type: number }
         totalVolumeCbm: { type: number }
@@ -3101,7 +3101,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, nullable: true, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3123,7 +3123,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3154,7 +3154,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }
@@ -3177,7 +3177,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }

lastleg-service/src/test/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardServiceTest.java

@@ -1,6 +1,7 @@
 package com.baiyue.lastleg.looseboard.service;
 
 import com.baiyue.lastleg.looseboard.dto.LocalLooseboardRequests;
+import com.baiyue.common.core.exception.BizException;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardHistory;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOrder;
 import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOperation;
@@ -85,6 +86,7 @@ class LocalLooseboardServiceTest {
         assertEquals("100", detail.summary().customerId());
         assertEquals(LocalLooseboardService.PENDING_ACCEPTANCE, detail.summary().status());
         assertEquals("SHARED_TRUCK", detail.summary().transportMode());
+        assertEquals("40HQ", detail.summary().containerType());
         verify(lastlegOrders).insert(org.mockito.ArgumentMatchers.<LastlegOrder>argThat(value ->
             "LOCAL_LOOSEBOARD".equals(value.getOrderType())
                 && value.getSourceOrderNo().equals("LB-WH-20260901-000001")
@@ -94,6 +96,22 @@ class LocalLooseboardServiceTest {
             "CREATE".equals(value.getOperationType())));
     }
 
+    @Test
+    void createDefaultsTheContainerTypeAndRejectsRemovedTypes() {
+        AtomicReference<LocalLooseboardOrder> saved = new AtomicReference<>();
+        when(orders.insert(any(LocalLooseboardOrder.class))).thenAnswer(call -> {
+            saved.set(call.getArgument(0));
+            return 1;
+        });
+        when(orders.findNo(anyString(), anyString())).thenAnswer(call -> saved.get());
+        when(histories.listOrder(anyString(), any())).thenReturn(List.of());
+
+        var detail = service.create("100", "7", create("default-type", null));
+
+        assertEquals("40HQ", detail.summary().containerType());
+        assertThrows(BizException.class, () -> service.create("100", "7", create("retired-type", "40HC")));
+    }
+
     @Test
     void ordinaryUpdateCannotChangeAcceptedOrder() {
         LocalLooseboardOrder order = order(LocalLooseboardService.DISPATCHED, 0L);
@@ -174,8 +192,12 @@ class LocalLooseboardServiceTest {
     }
 
     private LocalLooseboardRequests.Create create(String key) {
+        return create(key, "40HQ");
+    }
+
+    private LocalLooseboardRequests.Create create(String key, String containerType) {
         return new LocalLooseboardRequests.Create("SHARED_TRUCK", "YES", "WAREHOUSE_TO_WAREHOUSE",
-            "Los Angeles", "Address A", "Ontario", "Address B", "40HQ", 12,
+            "Los Angeles", "Address A", "Ontario", "Address B", containerType, 12,
             new BigDecimal("100.000"), new BigDecimal("2.500000"), new BigDecimal("500.00"),
             "USD", "Alice", "+1-555-0100", LocalDate.now().plusDays(2), null, key);
     }

lastleg-service/src/test/java/com/baiyue/lastleg/trucking/service/UsTruckOrderServiceTest.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.trucking.service;
 
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrder;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrderOperation;
@@ -18,6 +20,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +35,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 @ExtendWith(MockitoExtension.class)
 class UsTruckOrderServiceTest {
@@ -38,6 +43,7 @@ class UsTruckOrderServiceTest {
     @Mock UsTruckOrderPalletMapper pallets;
     @Mock UsTruckOrderStatusHistoryMapper histories;
     @Mock UsTruckOrderOperationMapper operations;
+    @Mock LastlegOrderNoGenerator orderNoGenerator;
     private final List<UsTruckOrderPallet> palletRows = new ArrayList<>();
     private final List<UsTruckOrderStatusHistory> historyRows = new ArrayList<>();
     private final Map<String, UsTruckOrderOperation> operationRows = new HashMap<>();
@@ -52,20 +58,21 @@ class UsTruckOrderServiceTest {
         ReflectionTestUtils.setField(service, "histories", histories);
         ReflectionTestUtils.setField(service, "operations", operations);
         ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper().findAndRegisterModules());
+        ReflectionTestUtils.setField(service, "orderNoGenerator", orderNoGenerator);
         order = order(UsTruckOrderService.PENDING_REVIEW, 0L, 2);
-        when(orders.lockNo("100", "TK1")).thenAnswer(call -> order);
+        lenient().when(orders.lockNo("100", "TK1")).thenAnswer(call -> order);
         when(orders.findNo("100", "TK1")).thenAnswer(call -> order);
-        when(pallets.listOrder("100", 1L)).thenAnswer(call -> palletRows);
-        when(histories.listOrder("100", 1L)).thenAnswer(call -> historyRows);
+        when(pallets.listOrder(anyString(), anyLong())).thenAnswer(call -> palletRows);
+        lenient().when(histories.listOrder("100", 1L)).thenAnswer(call -> historyRows);
         when(histories.insert(any(UsTruckOrderStatusHistory.class))).thenAnswer(call -> {
             historyRows.add(call.getArgument(0)); return 1;
         });
-        when(pallets.insert(any(UsTruckOrderPallet.class))).thenAnswer(call -> {
+        lenient().when(pallets.insert(any(UsTruckOrderPallet.class))).thenAnswer(call -> {
             UsTruckOrderPallet row = call.getArgument(0); palletRows.add(row); return 1;
         });
-        when(operations.findKey(anyString(), anyLong(), anyString()))
+        lenient().when(operations.findKey(anyString(), anyLong(), anyString()))
             .thenAnswer(call -> operationRows.get(call.getArgument(2)));
-        when(operations.insert(any(UsTruckOrderOperation.class))).thenAnswer(call -> {
+        lenient().when(operations.insert(any(UsTruckOrderOperation.class))).thenAnswer(call -> {
             UsTruckOrderOperation row = call.getArgument(0); operationRows.put(row.getIdempotencyKey(), row); return 1;
         });
         UsTruckOrderStatusHistory created = new UsTruckOrderStatusHistory();
@@ -73,6 +80,21 @@ class UsTruckOrderServiceTest {
         created.setToStatus(UsTruckOrderService.PENDING_REVIEW); historyRows.add(created);
     }
 
+    @Test
+    void createDefaultsTheContainerTypeAndRejectsRemovedTypes() {
+        when(orderNoGenerator.next(anyString(), anyString(), anyLong())).thenReturn("TK1");
+        when(histories.listOrder(anyString(), anyLong())).thenReturn(historyRows);
+        when(orders.insert(any(UsTruckOrder.class))).thenAnswer(call -> {
+            order = call.getArgument(0);
+            return 1;
+        });
+
+        var detail = service.create("100", "operator", create(null, "default-type"));
+
+        assertEquals("40HQ", detail.summary().containerType());
+        assertThrows(BizException.class, () -> service.create("100", "operator", create("40HC", "retired-type")));
+    }
+
     @Test
     void completeLifecycleUsesFactsIdempotencyOperatorsAndCannotReverseTerminal() {
         var review = new UsTruckOrderRequests.Review(0L, "APPROVE", "review-1", "approve");
@@ -165,6 +187,12 @@ class UsTruckOrderServiceTest {
         return new UsTruckOrderRequests.Command(version, key, key);
     }
 
+    private UsTruckOrderRequests.Create create(String containerType, String key) {
+        return new UsTruckOrderRequests.Create("PORT_PICKUP", "Los Angeles", null, "Ontario", null,
+            containerType, 1, 0, BigDecimal.ZERO, BigDecimal.ZERO, null, "USD", "Alice",
+            "+1-555-0100", LocalDate.now().plusDays(1), null, key);
+    }
+
     private UsTruckOrder order(String status, long version, int pallets) {
         UsTruckOrder value = new UsTruckOrder();
         value.setId(1L); value.setCustomerId("100"); value.setOrderNo("TK1");