From f1d6d80dd8129e1eaa6a18ad96270c8cfc90e3ae Mon Sep 17 00:00:00 2001 From: lml <1297555865@qq.com> Date: Thu, 5 Nov 2026 15:50:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(observability):=20=E6=89=B9=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E5=A4=B1=E8=B4=A5=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=AE=B0=E4=B8=BA=20SUCCESS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CallOutcome 增加 PARTIAL;CallRecord 增加 failedCount / resultCode - CallSupport 增加 ResultSummary/ResultMapper 与 observeSummary,支持成功/部分成功/失败三态 - 审核发货、编辑订单按逐单结果记录 PARTIAL 与失败数 - 审核发货全部失败、编辑订单 code=10000 时抛 PlatformBusinessException, 避免 sdk.writes() 把业务键记成 SUCCEEDED 后阻断重试 - outbounds.submit 返回 false 时记 FAILURE - 新增 PartialFailureAuditTest 覆盖四种场景 验证:mvn -q -pl core -am -Dtest='PartialFailureAuditTest,CallObserverTest' -DfailIfNoTests=false test --- .../java/common/ecommerce/audit/CallOutcome.java | 3 + .../java/common/ecommerce/audit/CallRecord.java | 28 +++ .../common/ecommerce/audit/Slf4jCallObserver.java | 10 +- .../common/ecommerce/capability/Outbounds.java | 58 +++++- .../common/ecommerce/capability/SalesOrders.java | 52 +++++- .../java/common/ecommerce/sdk/CallSupport.java | 126 +++++++++++-- .../capability/PartialFailureAuditTest.java | 205 +++++++++++++++++++++ 7 files changed, 450 insertions(+), 32 deletions(-) create mode 100644 core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java diff --git a/core/src/main/java/common/ecommerce/audit/CallOutcome.java b/core/src/main/java/common/ecommerce/audit/CallOutcome.java index 005e1e2..7b91771 100644 --- a/core/src/main/java/common/ecommerce/audit/CallOutcome.java +++ b/core/src/main/java/common/ecommerce/audit/CallOutcome.java @@ -8,6 +8,9 @@ public enum CallOutcome { /** 调用成功(适配器没有抛异常)。 */ SUCCESS, + /** 批处理部分成功:有失败明细,但调用方拿到了结果。 */ + PARTIAL, + /** 调用失败(能力不支持、参数校验、平台返回错误、网络异常等)。 */ FAILURE } diff --git a/core/src/main/java/common/ecommerce/audit/CallRecord.java b/core/src/main/java/common/ecommerce/audit/CallRecord.java index 7357257..8bd5a12 100644 --- a/core/src/main/java/common/ecommerce/audit/CallRecord.java +++ b/core/src/main/java/common/ecommerce/audit/CallRecord.java @@ -33,6 +33,8 @@ public final class CallRecord { private final CallOutcome outcome; private final long durationMillis; private final int resultCount; + private final int failedCount; + private final String resultCode; private final Map params; private final String errorType; private final String errorMessage; @@ -51,6 +53,8 @@ public final class CallRecord { this.outcome = Objects.requireNonNull(b.outcome, "outcome"); this.durationMillis = b.durationMillis; this.resultCount = b.resultCount; + this.failedCount = b.failedCount; + this.resultCode = b.resultCode; this.params = Collections.unmodifiableMap( new LinkedHashMap<>(b.params)); this.errorType = b.errorType; @@ -132,6 +136,16 @@ public final class CallRecord { return resultCount; } + /** 失败条数;仅批处理结果(审核发货、编辑订单)有值,其余为 -1。 */ + public int failedCount() { + return failedCount; + } + + /** 平台业务结果码,如编辑订单的 {@code 10000} / {@code 10001};无则为 null。 */ + public String resultCode() { + return resultCode; + } + /** 参数摘要,只读;见类注释里的敏感信息约定。 */ public Map params() { return params; @@ -189,6 +203,8 @@ public final class CallRecord { + " requestId=" + requestId + " cost=" + durationMillis + "ms" + " result=" + resultCount + + " failed=" + failedCount + + " code=" + resultCode + " params=" + params + (failed() ? " error=" + errorType + ": " + errorMessage + " retryable=" + retryable @@ -210,6 +226,8 @@ public final class CallRecord { private CallOutcome outcome = CallOutcome.SUCCESS; private long durationMillis; private int resultCount = -1; + private int failedCount = -1; + private String resultCode; private Map params = Collections.emptyMap(); private String errorType; private String errorMessage; @@ -267,6 +285,16 @@ public final class CallRecord { return this; } + public Builder failedCount(int failedCount) { + this.failedCount = failedCount; + return this; + } + + public Builder resultCode(String resultCode) { + this.resultCode = resultCode; + return this; + } + public Builder params(Map params) { this.params = params == null ? Collections.emptyMap() : params; return this; diff --git a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java b/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java index a0a0596..e20bdef 100644 --- a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java +++ b/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java @@ -80,21 +80,23 @@ public final class Slf4jCallObserver implements CallObserver { public void onCall(CallRecord record) { if (record.failed()) { LOG.warn("sdk-call-failed at={} op={} provider={} platform={} omsStoreId={} storeId={} " - + "requestId={} cost={}ms result={} params={} retryable={} platformCode={} " + + "requestId={} cost={}ms result={} failed={} code={} params={} retryable={} platformCode={} " + "platformRequestId={} error={}: {}", at(record.occurredAt()), record.operation(), record.provider(), record.platform(), record.omsStoreId(), record.externalStoreId(), record.requestId(), - record.durationMillis(), record.resultCount(), record.params(), + record.durationMillis(), record.resultCount(), record.failedCount(), + record.resultCode(), record.params(), record.retryable(), record.platformCode(), record.platformRequestId(), record.errorType(), safe(record.errorMessage())); } else { LOG.info("sdk-call at={} op={} provider={} platform={} omsStoreId={} storeId={} " - + "requestId={} cost={}ms result={} params={}", + + "requestId={} cost={}ms result={} failed={} code={} params={}", at(record.occurredAt()), record.operation(), record.provider(), record.platform(), record.omsStoreId(), record.externalStoreId(), record.requestId(), - record.durationMillis(), record.resultCount(), record.params()); + record.durationMillis(), record.resultCount(), record.failedCount(), + record.resultCode(), record.params()); } } diff --git a/core/src/main/java/common/ecommerce/capability/Outbounds.java b/core/src/main/java/common/ecommerce/capability/Outbounds.java index 8ceba1a..5b63ea6 100644 --- a/core/src/main/java/common/ecommerce/capability/Outbounds.java +++ b/core/src/main/java/common/ecommerce/capability/Outbounds.java @@ -2,6 +2,7 @@ package common.ecommerce.capability; import common.ecommerce.audit.CallObserver; import common.ecommerce.error.ChannelException; +import common.ecommerce.error.PlatformBusinessException; import common.ecommerce.model.Capability; import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.fulfillment.LabelQuery; @@ -43,9 +44,11 @@ public final class Outbounds { } public boolean submit(final List packages) { - return CallSupport.observe(observer, ctx, "outbounds.submit", + return CallSupport.observeSummary(observer, ctx, "outbounds.submit", CallSupport.params("packageCount", packages == null ? 0 : packages.size()), - result -> CallSupport.NO_COUNT, + result -> result + ? CallSupport.ResultSummary.success(CallSupport.NO_COUNT) + : CallSupport.ResultSummary.failure(CallSupport.NO_COUNT, 1, null), () -> { requireOutboundCapable(); return ((OutboundCapable) adapter).submit(ctx, packages); @@ -96,15 +99,60 @@ public final class Outbounds { /** 审核发货(写操作,调用方需包在 {@code sdk.writes()} 里)。 */ public ShipmentReviewResult review(final List globalOrderNos) { - return CallSupport.observe(observer, ctx, "outbounds.review", + return CallSupport.observeSummary(observer, ctx, "outbounds.review", CallSupport.params("orderCount", globalOrderNos == null ? 0 : globalOrderNos.size()), - result -> CallSupport.NO_COUNT, + result -> reviewSummary(result), () -> { require(Capability.SHIPMENT_REVIEW, ShipmentReviewCapable.class); - return ((ShipmentReviewCapable) adapter).review(ctx, globalOrderNos); + ShipmentReviewResult result = + ((ShipmentReviewCapable) adapter).review(ctx, globalOrderNos); + if (result.successNum() == 0 && result.failNum() > 0) { + // 全部失败不能当成功返回,否则 sdk.writes() 会把业务键记成 SUCCEEDED + throw new PlatformBusinessException(ChannelException.builder() + .message("shipment review failed for all orders, failNum=" + + result.failNum() + ", failures=" + failureSummary(result)) + .operation("outbounds.review") + .provider(account.provider().name()) + .omsStoreId(account.omsStoreId()) + .platform(account.platform()) + .requestId(ctx.requestId()) + .retryable(true)); + } + return result; }); } + private static CallSupport.ResultSummary reviewSummary(ShipmentReviewResult result) { + if (result == null) { + return CallSupport.ResultSummary.success(CallSupport.NO_COUNT); + } + if (result.allSucceeded()) { + return CallSupport.ResultSummary.success(result.successNum()); + } + if (result.successNum() == 0) { + return CallSupport.ResultSummary.failure(0, result.failNum(), null); + } + return CallSupport.ResultSummary.partial(result.successNum(), result.failNum(), null); + } + + private static String failureSummary(ShipmentReviewResult result) { + if (result.failures() == null || result.failures().isEmpty()) { + return "none"; + } + StringBuilder sb = new StringBuilder(); + for (ShipmentReviewResult.Failure failure : result.failures()) { + if (sb.length() > 0) { + sb.append("; "); + } + sb.append(failure.globalOrderNo()).append('=').append(failure.message()); + if (sb.length() > 300) { + sb.append("..."); + break; + } + } + return sb.toString(); + } + private void requireOutboundCapable() { if (!adapter.supports(account, Capability.MARK_SHIPPED) || !(adapter instanceof OutboundCapable)) { throw new ChannelException.UnsupportedCapabilityException(Capability.MARK_SHIPPED); diff --git a/core/src/main/java/common/ecommerce/capability/SalesOrders.java b/core/src/main/java/common/ecommerce/capability/SalesOrders.java index 5fcb3d3..d80542e 100644 --- a/core/src/main/java/common/ecommerce/capability/SalesOrders.java +++ b/core/src/main/java/common/ecommerce/capability/SalesOrders.java @@ -2,6 +2,7 @@ package common.ecommerce.capability; import common.ecommerce.audit.CallObserver; import common.ecommerce.error.ChannelException; +import common.ecommerce.error.PlatformBusinessException; import common.ecommerce.model.Capability; import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.fulfillment.OrderEditRequest; @@ -66,18 +67,63 @@ public final class SalesOrders { /** 批量编辑订单(写操作,调用方需包在 {@code sdk.writes()} 里)。 */ public OrderEditResult edit(final List requests) { - return CallSupport.observe(observer, ctx, "salesOrders.edit", + return CallSupport.observeSummary(observer, ctx, "salesOrders.edit", CallSupport.params("requestCount", requests == null ? 0 : requests.size()), - result -> CallSupport.NO_COUNT, + result -> editSummary(result), () -> { if (!adapter.supports(account, Capability.ORDER_EDIT) || !(adapter instanceof OrderEditCapable)) { throw new ChannelException.UnsupportedCapabilityException(Capability.ORDER_EDIT); } - return ((OrderEditCapable) adapter).edit(ctx, requests); + OrderEditResult result = ((OrderEditCapable) adapter).edit(ctx, requests); + if (OrderEditResult.CODE_ALL_FAILED.equals(result.code())) { + // 全部失败不能当成功返回,否则 sdk.writes() 会把业务键记成 SUCCEEDED + throw new PlatformBusinessException(ChannelException.builder() + .message("order edit failed for all orders, code=" + result.code() + + ", failures=" + failureSummary(result)) + .operation("salesOrders.edit") + .provider(account.provider().name()) + .omsStoreId(account.omsStoreId()) + .platform(account.platform()) + .requestId(ctx.requestId()) + .retryable(true)); + } + return result; }); } + private static CallSupport.ResultSummary editSummary(OrderEditResult result) { + if (result == null) { + return CallSupport.ResultSummary.success(CallSupport.NO_COUNT); + } + int failed = result.failures() == null ? 0 : result.failures().size(); + if (result.allSucceeded()) { + return CallSupport.ResultSummary.success(CallSupport.NO_COUNT); + } + if (OrderEditResult.CODE_ALL_FAILED.equals(result.code())) { + return CallSupport.ResultSummary.failure(CallSupport.NO_COUNT, failed, result.code()); + } + return CallSupport.ResultSummary.partial(CallSupport.NO_COUNT, failed, result.code()); + } + + private static String failureSummary(OrderEditResult result) { + if (result.failures() == null || result.failures().isEmpty()) { + return "none"; + } + StringBuilder sb = new StringBuilder(); + for (OrderEditResult.Failure failure : result.failures()) { + if (sb.length() > 0) { + sb.append("; "); + } + sb.append(failure.globalOrderNo()).append('=').append(failure.errorMessage()); + if (sb.length() > 300) { + sb.append("..."); + break; + } + } + return sb.toString(); + } + private void requireSalesOrderCapable() { if (!adapter.supports(account, Capability.SALES_ORDER) || !(adapter instanceof SalesOrderCapable)) { throw new ChannelException.UnsupportedCapabilityException(Capability.SALES_ORDER); diff --git a/core/src/main/java/common/ecommerce/sdk/CallSupport.java b/core/src/main/java/common/ecommerce/sdk/CallSupport.java index 8300416..7acab46 100644 --- a/core/src/main/java/common/ecommerce/sdk/CallSupport.java +++ b/core/src/main/java/common/ecommerce/sdk/CallSupport.java @@ -67,7 +67,63 @@ public final class CallSupport { } /** - * 执行一次门面调用并记录日志。 + * 结果摘要:数量 + 失败数 + 业务码 + 结论。 + * + *

批处理能力(审核发货、编辑订单)平台会逐单返回成败, + * 只要没有异常,旧实现就会记成 {@code SUCCESS};用本类型可以标出 + * {@link CallOutcome#PARTIAL} 或 {@link CallOutcome#FAILURE}。

+ */ + public static final class ResultSummary { + + private final CallOutcome outcome; + private final int resultCount; + private final int failedCount; + private final String resultCode; + + private ResultSummary(CallOutcome outcome, int resultCount, int failedCount, String resultCode) { + this.outcome = outcome; + this.resultCount = resultCount; + this.failedCount = failedCount; + this.resultCode = resultCode; + } + + public static ResultSummary success(int resultCount) { + return new ResultSummary(CallOutcome.SUCCESS, resultCount, 0, null); + } + + public static ResultSummary partial(int resultCount, int failedCount, String resultCode) { + return new ResultSummary(CallOutcome.PARTIAL, resultCount, failedCount, resultCode); + } + + public static ResultSummary failure(int resultCount, int failedCount, String resultCode) { + return new ResultSummary(CallOutcome.FAILURE, resultCount, failedCount, resultCode); + } + + public CallOutcome outcome() { + return outcome; + } + + public int resultCount() { + return resultCount; + } + + public int failedCount() { + return failedCount; + } + + public String resultCode() { + return resultCode; + } + } + + /** 从返回值里提取 {@link ResultSummary}。 */ + public interface ResultMapper { + + ResultSummary summarize(T result); + } + + /** + * 执行一次门面调用并记录日志(只关心数量)。 * * @param observer 观察者;null 等价于 {@link CallObserver#NOOP} * @param ctx 本次调用上下文(提供账户、链路 ID、时钟) @@ -79,35 +135,60 @@ public final class CallSupport { public static T observe(CallObserver observer, ChannelContext ctx, String operation, Map params, ResultSize resultSize, Supplier action) { + return observeSummary(observer, ctx, operation, params, + new ResultMapper() { + @Override + public ResultSummary summarize(T result) { + if (result == null || resultSize == null) { + return ResultSummary.success(NO_COUNT); + } + return ResultSummary.success(resultSize.sizeOf(result)); + } + }, + action); + } + + /** + * 执行一次门面调用并记录日志(可区分成功 / 部分成功 / 失败)。 + * + * @param mapper 结果摘要提取器;抛异常时按 {@code SUCCESS + NO_COUNT} 兜底, + * 不影响业务返回值 + */ + public static T observeSummary(CallObserver observer, ChannelContext ctx, String operation, + Map params, ResultMapper mapper, + Supplier action) { CallObserver effective = observer == null ? CallObserver.NOOP : observer; Instant startedAt = Instant.now(ctx.clock()); long startedMillis = ctx.clock().millis(); try { T result = action.get(); - notifyObserver(effective, ctx, operation, params, resultSize, - result, null, startedAt, startedMillis); + notifyObserver(effective, ctx, operation, params, + summarize(mapper, result), null, startedAt, startedMillis); return result; } catch (RuntimeException e) { - notifyObserver(effective, ctx, operation, params, resultSize, + notifyObserver(effective, ctx, operation, params, null, e, startedAt, startedMillis); throw e; } } - private static void notifyObserver(CallObserver observer, ChannelContext ctx, String operation, - Map params, ResultSize resultSize, - T result, RuntimeException error, - Instant startedAt, long startedMillis) { - int count = NO_COUNT; - if (error == null && result != null && resultSize != null) { - try { - count = resultSize.sizeOf(result); - } catch (RuntimeException e) { - // 提取数量失败不应该影响业务结果,按“不适用”处理 - count = NO_COUNT; - } + private static ResultSummary summarize(ResultMapper mapper, T result) { + if (mapper == null) { + return ResultSummary.success(NO_COUNT); } + try { + ResultSummary summary = mapper.summarize(result); + return summary == null ? ResultSummary.success(NO_COUNT) : summary; + } catch (RuntimeException e) { + // 摘要提取失败不应该影响业务结果 + return ResultSummary.success(NO_COUNT); + } + } + private static void notifyObserver(CallObserver observer, ChannelContext ctx, String operation, + Map params, ResultSummary summary, + RuntimeException error, + Instant startedAt, long startedMillis) { CallRecord.Builder record = CallRecord.builder() .occurredAt(startedAt) .requestId(ctx.requestId()) @@ -117,12 +198,17 @@ public final class CallSupport { .externalStoreId(ctx.account().externalStoreId()) .operation(operation) .durationMillis(Math.max(0L, ctx.clock().millis() - startedMillis)) - .resultCount(count) .params(params); - if (error == null) { - record.outcome(CallOutcome.SUCCESS); - } else { + + if (error != null) { record.outcome(CallOutcome.FAILURE).error(error); + } else if (summary != null) { + record.outcome(summary.outcome()) + .resultCount(summary.resultCount()) + .failedCount(summary.failedCount()) + .resultCode(summary.resultCode()); + } else { + record.outcome(CallOutcome.SUCCESS); } try { diff --git a/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java b/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java new file mode 100644 index 0000000..3c7491e --- /dev/null +++ b/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java @@ -0,0 +1,205 @@ +package common.ecommerce.capability; + +import common.ecommerce.audit.CallObserver; +import common.ecommerce.audit.CallOutcome; +import common.ecommerce.audit.CallRecord; +import common.ecommerce.error.PlatformBusinessException; +import common.ecommerce.model.Capability; +import common.ecommerce.model.ChannelProvider; +import common.ecommerce.model.Platform; +import common.ecommerce.model.account.AccountKey; +import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.model.fulfillment.OrderEditRequest; +import common.ecommerce.model.fulfillment.OrderEditResult; +import common.ecommerce.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.sdk.ChannelConnection; +import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.spi.ChannelSecret; +import org.junit.jupiter.api.Test; + +import java.time.Clock; +import java.time.Instant; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * 批处理能力的审计语义:部分成功记 PARTIAL,全部失败抛异常。 + */ +class PartialFailureAuditTest { + + private static final AccountKey KEY = + AccountKey.of(ChannelProvider.DIRECT, Platform.WALMART_SC, "oms-wm-001"); + + private static final ChannelContext CTX = ChannelContext.of( + account(), + ChannelConnection.of("https://api.example.com", + ChannelSecret.builder().appKey("ak").appSecret("sk").build()), + "req-1", + Clock.fixed(Instant.parse("2026-11-05T00:00:00Z"), ZoneOffset.UTC)); + + private static final class CollectingObserver implements CallObserver { + + private final List records = new ArrayList(); + + @Override + public void onCall(CallRecord record) { + records.add(record); + } + } + + private static ChannelAccount account() { + return ChannelAccount.builder() + .key(KEY) + .externalStoreId("wm-seller-01") + .credentialRef("test") + .marketplaceZone("America/Chicago") + .currency("USD") + .build(); + } + + /** 同时实现审核发货与编辑订单的假适配器。 */ + private static final class BatchAdapter implements PlatformAdapter, ShipmentReviewCapable, + OrderEditCapable { + + private final ShipmentReviewResult reviewResult; + private final OrderEditResult editResult; + + BatchAdapter(ShipmentReviewResult reviewResult, OrderEditResult editResult) { + this.reviewResult = reviewResult; + this.editResult = editResult; + } + + @Override + public String adapterId() { + return "batch-fake"; + } + + @Override + public ChannelProvider provider() { + return ChannelProvider.DIRECT; + } + + @Override + public Set platforms() { + return EnumSet.of(Platform.WALMART_SC); + } + + @Override + public EnumSet capabilities() { + return EnumSet.of(Capability.SHIPMENT_REVIEW, Capability.ORDER_EDIT); + } + + @Override + public ShipmentReviewResult review(ChannelContext ctx, List globalOrderNos) { + return reviewResult; + } + + @Override + public OrderEditResult edit(ChannelContext ctx, List requests) { + return editResult; + } + } + + private static ShipmentReviewResult review(int success, int fail) { + List failures = new ArrayList(); + if (fail > 0) { + failures.add(new ShipmentReviewResult.Failure("SO-2", "未设置仓库")); + } + return ShipmentReviewResult.builder() + .successNum(success) + .failNum(fail) + .successGlobalOrderNos(success > 0 ? Collections.singletonList("SO-1") + : Collections.emptyList()) + .failures(failures) + .build(); + } + + private static OrderEditResult edit(String code, String failedOrderNo) { + List failures = failedOrderNo == null + ? Collections.emptyList() + : Collections.singletonList(new OrderEditResult.Failure(failedOrderNo, "仓库不存在")); + return OrderEditResult.builder() + .code(code) + .message("test") + .failures(failures) + .build(); + } + + @Test + void partialReviewIsRecordedAsPartial() { + CollectingObserver observer = new CollectingObserver(); + BatchAdapter adapter = new BatchAdapter(review(1, 1), edit("0", null)); + + ShipmentReviewResult result = new Outbounds(adapter, account(), CTX, observer) + .review(Arrays.asList("SO-1", "SO-2")); + + assertEquals(1, result.successNum()); + assertEquals(1, result.failNum()); + + CallRecord record = observer.records.get(0); + assertEquals(CallOutcome.PARTIAL, record.outcome()); + assertEquals(1, record.resultCount()); + assertEquals(1, record.failedCount()); + } + + @Test + void allFailedReviewThrowsAndRecordsFailure() { + CollectingObserver observer = new CollectingObserver(); + BatchAdapter adapter = new BatchAdapter(review(0, 1), edit("0", null)); + + assertThrows(PlatformBusinessException.class, + () -> new Outbounds(adapter, account(), CTX, observer) + .review(Collections.singletonList("SO-1"))); + + CallRecord record = observer.records.get(0); + assertEquals(CallOutcome.FAILURE, record.outcome()); + assertTrue(record.errorMessage().contains("failNum=1"), record.errorMessage()); + } + + @Test + void partialEditIsRecordedAsPartialWithCode() { + CollectingObserver observer = new CollectingObserver(); + BatchAdapter adapter = new BatchAdapter(review(1, 0), edit("10001", "SO-2")); + + OrderEditResult result = new SalesOrders(adapter, account(), CTX, observer) + .edit(Collections.singletonList(OrderEditRequest.builder() + .globalOrderNo("SO-1") + .warehouseId(1L) + .logisticsTypeId(2L) + .build())); + + assertEquals(OrderEditResult.CODE_PARTIAL, result.code()); + + CallRecord record = observer.records.get(0); + assertEquals(CallOutcome.PARTIAL, record.outcome()); + assertEquals("10001", record.resultCode()); + assertEquals(1, record.failedCount()); + } + + @Test + void allFailedEditThrowsAndRecordsFailure() { + CollectingObserver observer = new CollectingObserver(); + BatchAdapter adapter = new BatchAdapter(review(1, 0), edit("10000", "SO-1")); + + assertThrows(PlatformBusinessException.class, + () -> new SalesOrders(adapter, account(), CTX, observer) + .edit(Collections.singletonList(OrderEditRequest.builder() + .globalOrderNo("SO-1") + .warehouseId(1L) + .logisticsTypeId(2L) + .build()))); + + CallRecord record = observer.records.get(0); + assertEquals(CallOutcome.FAILURE, record.outcome()); + assertTrue(record.errorMessage().contains("10000"), record.errorMessage()); + } +}