优化

event-bridge-service/src/main/java/com/baiyue/eventbridge/service/EventInboxService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * 入站事件校验与幂等落库服务。
@@ -58,9 +59,24 @@ public class EventInboxService {
         if (!existing.getPayloadHash().equalsIgnoreCase(envelope.payloadHash())) {
             throw new IllegalArgumentException("相同 eventId 对应的 payloadHash 不一致，拒绝覆盖既有事件");
         }
+        if (!hasSameEnvelopeIdentity(existing, envelope)) {
+            throw new IllegalArgumentException("相同 eventId 对应的客户或事件信封身份不一致，拒绝覆盖既有事件");
+        }
         return new EventReceiveResult(envelope.eventId(), "重复", existing.getReceivedAt());
     }
 
+    private boolean hasSameEnvelopeIdentity(BridgeInbox existing, EventEnvelope envelope) {
+        return Objects.equals(existing.getTenantId(), envelope.tenantId())
+                && Objects.equals(existing.getEventType(), envelope.eventType())
+                && Objects.equals(existing.getEventVersion(), envelope.eventVersion())
+                && Objects.equals(existing.getSourceRegion(), envelope.sourceRegion().name())
+                && Objects.equals(existing.getTargetRegion(), envelope.targetRegion().name())
+                && Objects.equals(existing.getAggregateType(), envelope.aggregateType())
+                && Objects.equals(existing.getAggregateId(), envelope.aggregateId())
+                && Objects.equals(existing.getAggregateVersion(), envelope.aggregateVersion())
+                && Objects.equals(existing.getHandoverVersion(), envelope.handoverVersion());
+    }
+
     private BridgeInbox toInbox(EventEnvelope envelope) {
         BridgeInbox inbox = new BridgeInbox();
         inbox.setEventId(envelope.eventId());