fix: retain event bridge rejection evidence

2026-08-24 23:56:52 +08:00
parent 1c40548986
commit e94f8629d2
2 changed files with 34 additions and 4 deletions
@@ -39,10 +39,7 @@ public class InboundUnloadCompletedOutboxRelay {
                EventEnvelope event = objectMapper.readValue(row.getPayloadJson(), EventEnvelope.class);
                EventEnvelopeValidator.requireValid(event);
                var response = client.receive(internalToken, event);
-                if (response == null || !response.successful() || response.data() == null
-                    || !event.eventId().equals(response.data().eventId())) {
-                    throw new IllegalStateException("国内事件桥未确认海外卸柜完成事件");
-                }
+                requireAcknowledgement(event, response);
                repository.published(row.getId(), workerId, LocalDateTime.now());
            } catch (Exception exception) {
                repository.retry(row.getId(), workerId, LocalDateTime.now().plusSeconds(Math.max(retrySeconds, 1)),
@@ -51,4 +48,18 @@ public class InboundUnloadCompletedOutboxRelay {
            }
        }
    }
+
+    private void requireAcknowledgement(EventEnvelope event,
+                                        com.baiyue.common.core.api.ApiResponse<EventBridgeClient.Acknowledgement> response) {
+        if (response == null) throw new IllegalStateException("国内事件桥返回空响应");
+        if (!response.successful()) {
+            throw new IllegalStateException("国内事件桥拒绝海外卸柜完成事件: code=" + response.code()
+                + ", message=" + response.message() + ", requestId=" + response.requestId());
+        }
+        if (response.data() == null) throw new IllegalStateException("国内事件桥成功响应缺少确认数据");
+        if (!event.eventId().equals(response.data().eventId())) {
+            throw new IllegalStateException("国内事件桥确认eventId不一致: expected=" + event.eventId()
+                + ", actual=" + response.data().eventId());
+        }
+    }
 }