优化

lastleg-service/src/main/java/com/baiyue/lastleg/financefee/service/OverseasFeeOutboxRelay.java

@@ -1,6 +1,8 @@
 package com.baiyue.lastleg.financefee.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.lastleg.client.DirectEventClient;
 import com.baiyue.lastleg.entity.LastlegEventOutbox;
@@ -46,17 +48,21 @@ public class OverseasFeeOutboxRelay {
                 repository.dead(row.getId(), worker, failures, "自动投递次数已耗尽（含租约超时）");
                 continue;
             }
+            boolean requestStarted = false;
             try {
                 EventEnvelope envelope = objectMapper.readValue(row.getPayloadJson(), EventEnvelope.class).requireValid();
+                requestStarted = true;
                 var response = client.receive(token, envelope);
-                if (response == null || !response.successful() || response.data() == null)
-                    throw new IllegalStateException("Finance未确认费用事件");
+                EventDeliveryFailure.requireSuccessful(response);
                 response.data().requireMatches(envelope);
                 repository.published(row.getId(), worker, LocalDateTime.now(ZoneOffset.UTC));
             } catch (Exception exception) {
+                String error = EventDeliveryFailure.diagnostic(exception, token);
+                boolean permanent = EventDeliveryFailure.isPermanent(exception)
+                    || (!requestStarted && (exception instanceof JsonProcessingException || exception instanceof IllegalArgumentException));
                 int retries = failures + 1;
-                if (policy.exhausted(retries)) repository.dead(row.getId(), worker, retries, exception.getMessage());
-                else repository.retry(row.getId(), worker, retries, LocalDateTime.now(ZoneOffset.UTC).plus(policy.delayAfterFailure(retries)), exception.getMessage());
+                if (permanent || policy.exhausted(retries)) repository.dead(row.getId(), worker, retries, error);
+                else repository.retry(row.getId(), worker, retries, LocalDateTime.now(ZoneOffset.UTC).plus(policy.delayAfterFailure(retries)), error);
             }
         }
     }