优化

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundUnloadCompletedOutboxRelay.java

@@ -1,6 +1,8 @@
 package com.baiyue.lastleg.inboundplan.pda.service;
 
 import com.baiyue.common.event.EventEnvelope;
+import com.baiyue.common.web.EventDeliveryFailure;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.baiyue.common.core.retry.BoundedRetryPolicy;
 import com.baiyue.common.event.DeliveryAck;
 import com.baiyue.common.event.EventEnvelopeValidator;
@@ -51,29 +53,29 @@ public class InboundUnloadCompletedOutboxRelay {
                 repository.dead(row.getId(), workerId, failures, "自动投递次数已耗尽（含租约超时）");
                 continue;
             }
+            boolean requestStarted = false;
             try {
                 EventEnvelope event = objectMapper.readValue(row.getPayloadJson(), EventEnvelope.class);
                 EventEnvelopeValidator.requireValid(event);
+                requestStarted = true;
                 var response = client.receive(internalToken, event);
                 requireAcknowledgement(event, response);
                 repository.published(row.getId(), workerId, LocalDateTime.now());
             } catch (Exception exception) {
-                if (policy.exhausted(failures + 1)) repository.dead(row.getId(), workerId, failures + 1, exception.getMessage());
+                String error = EventDeliveryFailure.diagnostic(exception, internalToken);
+                boolean permanent = EventDeliveryFailure.isPermanent(exception)
+                    || (!requestStarted && (exception instanceof JsonProcessingException || exception instanceof IllegalArgumentException));
+                if (permanent || policy.exhausted(failures + 1)) repository.dead(row.getId(), workerId, failures + 1, error);
                 else repository.retry(row.getId(), workerId, LocalDateTime.now().plus(policy.delayAfterFailure(failures + 1)),
-                    exception.getMessage());
-                log.warn("海外到国内事件投递失败: eventKey={}, reason={}", row.getEventKey(), exception.getMessage());
+                    error);
+                log.warn("海外到国内事件投递失败: eventKey={}, reason={}", row.getEventKey(), error);
             }
         }
     }
 
     private void requireAcknowledgement(EventEnvelope event,
                                         com.baiyue.common.core.api.ApiResponse<DeliveryAck> 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("消费服务成功响应缺少确认数据");
+        EventDeliveryFailure.requireSuccessful(response);
         response.data().requireMatches(event);
     }
 }