桥接事件

2026-08-20 16:45:47 +08:00
parent 1f0c0f7751
commit c9a05b108b
6 changed files with 100 additions and 6 deletions
@@ -19,7 +19,9 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Objects;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import com.fasterxml.jackson.databind.JsonNode;

@Service
@@ -48,6 +50,7 @@ public class LoadingCompletedConsumer {
        if(payload.containerNo()==null||payload.containerNo().isBlank())
            throw new IllegalArgumentException("事件没有实际集装箱号 containerNo");
        if(payload.orders()==null||payload.orders().isEmpty()) throw new IllegalArgumentException("事件没有入仓单");
+        if (envelope.eventVersion() == 2) validateCartonSkuMappings(payload);
        LastlegEventInbox existing=inboxMapper.selectById(envelope.eventId());
        if(existing!=null) {
            if(!existing.getPayloadHash().equalsIgnoreCase(envelope.payloadHash())) throw new IllegalArgumentException("事件摘要冲突");
@@ -88,6 +91,39 @@ public class LoadingCompletedConsumer {
        return Math.toIntExact(orderMapper.countContainer(envelope.tenantId(),containerNo));
    }

+    private void validateCartonSkuMappings(FirstLegLoadingPlanCompletedV1 payload) {
+        for (FirstLegLoadingPlanCompletedV1.Order order : payload.orders()) {
+            Set<String> orderCartonMarks = new HashSet<>();
+            if ("ONE_CLICK_DROPSHIP".equals(order.orderType())) {
+                for (FirstLegLoadingPlanCompletedV1.PalletSnapshot pallet : order.pallets()) {
+                    for (FirstLegLoadingPlanCompletedV1.SkuPackageSnapshot sku : pallet.skuPackages()) {
+                        requireSkuCartonMapping(sku.skuCode(), sku.packageCount(), sku.cartonMarks(), orderCartonMarks);
+                    }
+                }
+                continue;
+            }
+            for (FirstLegLoadingPlanCompletedV1.Item item : order.items()) {
+                requireSkuCartonMapping(item.skuCode(), item.packageCount(), item.cartonMarks(), orderCartonMarks);
+            }
+        }
+    }
+
+    private void requireSkuCartonMapping(String skuCode, int loadedPackages, List<String> cartonMarks,
+                                         Set<String> orderCartonMarks) {
+        if (skuCode == null || skuCode.isBlank()) {
+            throw new IllegalArgumentException("V2 尾程交接事件的箱唛映射缺少 SKU");
+        }
+        List<String> marks = cartonMarks == null ? List.of() : cartonMarks;
+        if (marks.size() < loadedPackages) {
+            throw new IllegalArgumentException("V2 尾程交接事件的 SKU 箱唛数量少于实装箱数: " + skuCode);
+        }
+        for (String mark : marks) {
+            if (mark == null || mark.isBlank() || !orderCartonMarks.add(mark)) {
+                throw new IllegalArgumentException("V2 尾程交接事件包含空值或重复箱唛: " + skuCode);
+            }
+        }
+    }
+
    private void createOrder(EventEnvelope event,FirstLegLoadingPlanCompletedV1 payload,
                             FirstLegLoadingPlanCompletedV1.Order source,String orderNo, JsonNode rawSource) {
        String orderHash=EventPayloadHash.sha256(EventPayloadCanonicalizer.canonicalize(rawSource));