Browse Source
- 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 testfeature/supplier-lingxing
7 changed files with 450 additions and 32 deletions
@ -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<CallRecord> records = new ArrayList<CallRecord>(); |
||||||
|
|
||||||
|
@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<Platform> platforms() { |
||||||
|
return EnumSet.of(Platform.WALMART_SC); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public EnumSet<Capability> capabilities() { |
||||||
|
return EnumSet.of(Capability.SHIPMENT_REVIEW, Capability.ORDER_EDIT); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public ShipmentReviewResult review(ChannelContext ctx, List<String> globalOrderNos) { |
||||||
|
return reviewResult; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public OrderEditResult edit(ChannelContext ctx, List<OrderEditRequest> requests) { |
||||||
|
return editResult; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
private static ShipmentReviewResult review(int success, int fail) { |
||||||
|
List<ShipmentReviewResult.Failure> failures = new ArrayList<ShipmentReviewResult.Failure>(); |
||||||
|
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.<String>emptyList()) |
||||||
|
.failures(failures) |
||||||
|
.build(); |
||||||
|
} |
||||||
|
|
||||||
|
private static OrderEditResult edit(String code, String failedOrderNo) { |
||||||
|
List<OrderEditResult.Failure> failures = failedOrderNo == null |
||||||
|
? Collections.<OrderEditResult.Failure>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()); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue