优化

firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java

@@ -16,7 +16,7 @@ public interface LoadingCompletedEventMapper {
     @Select("""
         SELECT p.id AS loading_plan_id, p.plan_no, p.container_booking_id, p.version AS aggregate_version,
                b.container_no, b.cabinet_no, b.warehouse_id, b.warehouse_name,
-               b.customer_id AS booking_customer_id, b.customer_name,
+               i.customer_name,
                b.estimated_port_arrival_at, b.actual_port_arrival_at,
                b.estimated_warehouse_arrival_at,
                i.account_id, i.inbound_id AS source_inbound_id,
@@ -84,8 +84,8 @@ public interface LoadingCompletedEventMapper {
     class Row {
         private Long loadingPlanId; private String planNo; private Long containerBookingId;
         private Integer aggregateVersion; private String containerNo; private String cabinetNo;
-        private Long warehouseId; private String warehouseName; private Long bookingCustomerId;
-        private String customerName; private Long accountId;
+        private Long warehouseId; private String warehouseName; private String customerName;
+        private Long accountId;
         private LocalDateTime estimatedPortArrivalAt; private LocalDateTime actualPortArrivalAt;
         private LocalDateTime estimatedWarehouseArrivalAt;
         private Long sourceInboundId; private Long rootInboundId; private Long sourceOrderId;

firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java

@@ -120,11 +120,11 @@ public class LoadingCompletedOutboxService {
 
     private void validateCustomerSnapshots(List<Row> rows) {
         for (Row row : rows) {
-            if (row.getAccountId() == null || !Objects.equals(row.getAccountId(), row.getBookingCustomerId())) {
-                throw new BizException(ResultCode.CONFLICT, "装柜计划客户与柜次客户快照不一致，不能生成尾程交接事件");
+            if (row.getAccountId() == null || row.getAccountId() <= 0) {
+                throw new BizException(ResultCode.CONFLICT, "装柜明细缺少有效客户标识，不能生成尾程交接事件");
             }
             if (row.getCustomerName() == null || row.getCustomerName().isBlank()) {
-                throw new BizException(ResultCode.CONFLICT, "柜次缺少客户名称快照，不能生成尾程交接事件");
+                throw new BizException(ResultCode.CONFLICT, "装柜明细缺少客户名称快照，不能生成尾程交接事件");
             }
         }
         rows.stream().collect(java.util.stream.Collectors.groupingBy(Row::getAccountId)).forEach((accountId, values) -> {

firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletionWorker.java

@@ -50,7 +50,7 @@ public class LoadingCompletionWorker {
         String traceId = cause instanceof PdaPickSettlementService.SettlementFailure remote
             ? remote.traceId() : null;
         int attempt = command.getAttemptCount() == null ? 1 : command.getAttemptCount() + 1;
-        boolean terminal = attempt >= MAX_ATTEMPTS;
+        boolean terminal = isDeterministicLocalBusinessFailure(stage, cause) || attempt >= MAX_ATTEMPTS;
         LocalDateTime retryAt = LocalDateTime.now().plusSeconds(Math.min(300L, 15L << Math.min(attempt - 1, 4)));
         boolean recorded = commands.fail(command.getId(), workerId, terminal ? "FAILED" : "RETRYABLE", retryAt,
             stage, code, requestId, traceId);
@@ -61,4 +61,10 @@ public class LoadingCompletionWorker {
                 + "requestId={} traceId={} attempt={} terminal={}", command.getId(), command.getPickTaskId(),
             command.getOperationId(), stage, code, requestId, traceId, attempt, terminal, cause);
     }
+
+    private static boolean isDeterministicLocalBusinessFailure(String stage, Throwable cause) {
+        return cause instanceof BizException && java.util.Set.of(
+            "OWNER_DISCOVERY", "OWNER_READY", "PLAN_GATE", "TASK_REVIEW",
+            "PLAN_COMPLETE", "COMPLETED_EVENT").contains(stage);
+    }
 }