diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java index db32abe..c2429f0 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java @@ -1,5 +1,8 @@ package common.ecommerce.lingxing.adapter; +import common.ecommerce.audit.CallObserver; +import common.ecommerce.audit.CallOutcome; +import common.ecommerce.audit.CallRecord; import common.ecommerce.error.ChannelException; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.LingxingApi; @@ -25,6 +28,8 @@ import org.junit.jupiter.api.Test; import java.time.Instant; import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; import static common.ecommerce.lingxing.support.LingxingTestSupport.ENDPOINT; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; @@ -38,6 +43,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** 领星入库能力:按子平台收窄 + 门面路由。 */ class LingxingInboundCapabilityTest { + /** 收集门面产生的调用记录,用来断言 operation / 结果条数等审计字段。 */ + private static final class CollectingObserver implements CallObserver { + + private final List records = new ArrayList(); + + @Override + public void onCall(CallRecord record) { + records.add(record); + } + } + private static ChannelConnection connection() { return ChannelConnection.of(ENDPOINT, ChannelSecret.builder() .appKey(LingxingTestSupport.APP_KEY) @@ -51,10 +67,16 @@ class LingxingInboundCapabilityTest { } private static ChannelSdk sdk(RecordingTransport transport, ChannelAccount account) { + return sdk(transport, account, CallObserver.NOOP); + } + + private static ChannelSdk sdk(RecordingTransport transport, ChannelAccount account, + CallObserver observer) { return ChannelSdk.builder() .accountRepository(new InMemoryAccounts().put(account)) .clock(LingxingTestSupport.CLOCK) .register(adapter(transport)) + .callObserver(observer) .build(); } @@ -85,8 +107,9 @@ class LingxingInboundCapabilityTest { .route(LingxingApi.INBOUND_SHIPMENT_AWD.path(), r -> Responses.ok( JsonFixture.load("fixtures/lingxing/inbound/awdShipment/success.json"))); ChannelAccount amazon = account(Platform.AMAZON_SC, 10001, "123456789"); + CollectingObserver observer = new CollectingObserver(); - Page page = sdk(transport, amazon).inbounds(amazon.key(), connection()) + Page page = sdk(transport, amazon, observer).inbounds(amazon.key(), connection()) .shipments(InboundShipmentQuery.builder() .storeIds("123456789") .after(Instant.parse("2026-04-01T00:00:00Z")) @@ -96,6 +119,15 @@ class LingxingInboundCapabilityTest { assertEquals(1, page.size()); assertEquals("AWD20230715001", page.items().get(0).shipmentNo()); assertUrlStartsWith(lastUrl(transport), ENDPOINT + LingxingApi.INBOUND_SHIPMENT_AWD.path()); + + // 门面审计:入库货件走独立 operation,失败/成功与条数都要能对账。 + assertEquals(1, observer.records.size()); + CallRecord record = observer.records.get(0); + assertEquals("inbounds.shipments", record.operation()); + assertEquals(CallOutcome.SUCCESS, record.outcome()); + assertEquals(Platform.AMAZON_SC, record.platform()); + assertEquals("123456789", record.externalStoreId()); + assertEquals(1, record.resultCount()); } @Test @@ -105,8 +137,9 @@ class LingxingInboundCapabilityTest { JsonFixture.load( "fixtures/lingxing/inbound/fbaReceivedInventory/success.json"))); ChannelAccount amazon = account(Platform.AMAZON_SC, 10001, "101"); + CollectingObserver observer = new CollectingObserver(); - Page page = sdk(transport, amazon).inbounds(amazon.key(), connection()) + Page page = sdk(transport, amazon, observer).inbounds(amazon.key(), connection()) .receipts(InboundReceiptQuery.builder() .eventDate(LocalDate.parse("2026-04-01")) .build()); @@ -114,6 +147,14 @@ class LingxingInboundCapabilityTest { assertEquals(1, page.size()); assertEquals("FBA1Y4ZJFZ", page.items().get(0).shipmentId()); assertUrlStartsWith(lastUrl(transport), ENDPOINT + LingxingApi.INBOUND_RECEIPT_FBA.path()); + + assertEquals(1, observer.records.size()); + CallRecord record = observer.records.get(0); + assertEquals("inbounds.receipts", record.operation()); + assertEquals(CallOutcome.SUCCESS, record.outcome()); + assertEquals(Platform.AMAZON_SC, record.platform()); + assertEquals("101", record.externalStoreId()); + assertEquals(1, record.resultCount()); } @Test diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java index 0197d7b..869af89 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java @@ -9,6 +9,7 @@ import common.ecommerce.http.OkHttpTransport; import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.auth.LingxingTokenClient; import common.ecommerce.model.ChannelProvider; +import common.ecommerce.model.Capability; import common.ecommerce.model.Platform; import common.ecommerce.model.account.AccountKey; import common.ecommerce.model.account.ChannelAccount; @@ -17,6 +18,10 @@ import common.ecommerce.model.fulfillment.OutboundOrder; import common.ecommerce.model.fulfillment.OutboundOrderLine; import common.ecommerce.model.fulfillment.OutboundOrderQuery; import common.ecommerce.model.fulfillment.ShippingLabel; +import common.ecommerce.model.inbound.InboundReceipt; +import common.ecommerce.model.inbound.InboundReceiptQuery; +import common.ecommerce.model.inbound.InboundShipment; +import common.ecommerce.model.inbound.InboundShipmentQuery; import common.ecommerce.model.order.OrderLine; import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrderQuery; @@ -26,6 +31,7 @@ import common.ecommerce.model.product.ProductQuery; import common.ecommerce.model.settlement.SettlementQuery; import common.ecommerce.model.settlement.SettlementTransaction; import common.ecommerce.model.support.Page; +import common.ecommerce.model.support.PlatformTime; import common.ecommerce.sdk.ChannelConnection; import common.ecommerce.sdk.ChannelContext; import common.ecommerce.spi.AccessToken; @@ -481,6 +487,79 @@ class LingxingLiveSmokeTest { } } + /** + * 第 9 步(入库):按当前店铺所属子平台拉一页入库货件;亚马逊 SC 再拉一页 FBA 接收明细。 + * + *

只读。FBT / WFS / AWD 的时间字段与日期口径不同,这里统一用最近 7 天先看字段映射; + * 各接口的时间窗上限与「待核对」参数由 {@code InboundProbeTest} 另行核对。

+ */ + @Test + void pullsInboundShipmentsAndReceipts() { + requireCredentials(); + LingxingAdapter adapter = adapter(); + + List shops = listShops(adapter); + String storeId = resolveStoreId(shops); + if (storeId == null) { + return; + } + + ChannelAccount account = account(storeId); + ChannelContext ctx = context(account, "smoke-inbound-"); + if (!adapter.supports(account, Capability.INBOUND_SHIPMENT)) { + System.out.println("[inbound] " + account.key().platform() + " 未装配入库货件查询,跳过"); + return; + } + + Instant to = Instant.now(); + Instant from = to.minus(Duration.ofDays(7)); + Page page = adapter.pull(ctx, InboundShipmentQuery.builder() + .storeIds(storeId) + .after(from) + .before(to) + .pageSize(20) + .build()); + + System.out.println("[inbound shipments] platform=" + account.key().platform() + + " store=" + storeId + " items=" + page.size() + + " nextCursor=" + page.nextCursor()); + for (InboundShipment s : page.items()) { + System.out.println(" shipmentNo=" + s.shipmentNo() + + " shipmentId=" + s.shipmentId() + + " inboundOrderNo=" + s.inboundOrderNo() + + " status=" + s.status() + "/" + s.statusName() + + " storeIds=" + s.storeIds() + + " warehouse=" + s.warehouseName() + + " createdAt=" + (s.createdAt() == null ? null : s.createdAt().utc()) + + " lines=" + s.lines().size() + + " shippingRefs=" + s.shippingRefs().size()); + } + + if (!adapter.supports(account, Capability.INBOUND_RECEIPT)) { + return; + } + + // FBA 到货接收明细按签收日期取数,日期用平台口径(北京时间)。 + LocalDate eventDate = LocalDate.now(PlatformTime.BEIJING_ZONE).minusDays(1); + Page receipts = adapter.pull(context(account, "smoke-inbound-receipts-"), + InboundReceiptQuery.builder() + .sid(storeId) + .eventDate(eventDate) + .pageSize(20) + .build()); + System.out.println("[inbound receipts] sid=" + storeId + " eventDate=" + eventDate + + " items=" + receipts.size() + " nextCursor=" + receipts.nextCursor()); + for (InboundReceipt r : receipts.items()) { + System.out.println(" shipmentId=" + r.shipmentId() + + " fnsku=" + r.fnsku() + + " sku=" + r.sku() + + " qty=" + r.quantity() + + " fc=" + r.fulfillmentCenterId() + + " receivedAt=" + (r.receivedAt() == null ? null : r.receivedAt().utc()) + + " uniqueIndex=" + r.uniqueIndex()); + } + } + // ---------------------------------------------------------------- helpers /** diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java new file mode 100644 index 0000000..5120a92 --- /dev/null +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java @@ -0,0 +1,275 @@ +package common.ecommerce.lingxing.probe; + +import common.ecommerce.http.HttpRequest; +import common.ecommerce.http.HttpResponse; +import common.ecommerce.http.HttpTransport; +import common.ecommerce.http.JacksonJsonCodec; +import common.ecommerce.http.OkHttpTransport; +import common.ecommerce.lingxing.LingxingConstants; +import common.ecommerce.lingxing.adapter.LingxingAdapter; +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.inbound.InboundReceipt; +import common.ecommerce.model.inbound.InboundReceiptQuery; +import common.ecommerce.model.inbound.InboundShipment; +import common.ecommerce.model.inbound.InboundShipmentQuery; +import common.ecommerce.model.inbound.InboundShipmentTimeType; +import common.ecommerce.model.support.Page; +import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.sdk.ChannelConnection; +import common.ecommerce.sdk.ChannelSdk; +import common.ecommerce.spi.ChannelSecret; +import common.ecommerce.testkit.InMemoryAccounts; +import common.ecommerce.testkit.InMemoryLockProvider; +import common.ecommerce.testkit.InMemoryTokenStore; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +import java.time.Clock; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneId; + +/** + * 入库查询的只读探针:FBT / WFS / AWD 货件与 FBA 接收明细各拉一页,核对出入参。 + * + *

默认跳过;显式开启:

+ * + *
+ * mvn -q -pl lingxing -am -DfailIfNoTests=false \
+ *     -Dlingxing.probe=true \
+ *     -Dlingxing.probe.appKey=... -Dlingxing.probe.appSecret=... \
+ *     -Dlingxing.probe.tiktokStoreId=... -Dlingxing.probe.walmartStoreId=... \
+ *     -Dlingxing.probe.amazonSid=... \
+ *     -Dtest=InboundProbeTest test
+ * 
+ * + *

只做查询,不调用任何写接口。异常只打印不抛出,一次跑完四个接口, + * 方便对照 {@code 待核对} 字段({@code queryType/queryValue}、{@code cargo_status_list}、 + * {@code sidList}、{@code event_date})的真实报文。

+ */ +@EnabledIfSystemProperty(named = "lingxing.probe", matches = "true") +class InboundProbeTest { + + // 真实凭据不入库:本地跑探针时用 -D 传入。 + private static final String APP_KEY = System.getProperty("lingxing.probe.appKey", ""); + private static final String APP_SECRET = System.getProperty("lingxing.probe.appSecret", ""); + private static final String TIKTOK_STORE_ID = System.getProperty("lingxing.probe.tiktokStoreId", ""); + private static final String WALMART_STORE_ID = System.getProperty("lingxing.probe.walmartStoreId", ""); + private static final String AMAZON_SID = System.getProperty("lingxing.probe.amazonSid", ""); + + private static final String BASE_URL = LingxingConstants.PRODUCTION_BASE_URL; + + private static final JacksonJsonCodec JSON = new JacksonJsonCodec(); + private final LoggingTransport transport = + new LoggingTransport(new OkHttpTransport("common-ecommerce-inbound-probe")); + private final InMemoryTokenStore tokens = new InMemoryTokenStore(); + + /** FBT 货件必须传 TikTok 店铺;没有该店铺 id 时跳过。 */ + @Test + void probeFbtCargo() { + requireCredentials(); + Assumptions.assumeTrue(!TIKTOK_STORE_ID.trim().isEmpty(), + "缺少 -Dlingxing.probe.tiktokStoreId,跳过 FBT 探针"); + + System.out.println("\n================ FBT cargo / TikTok ================"); + try { + ChannelAccount account = account(Platform.TIKTOK, 10011, TIKTOK_STORE_ID); + InboundShipmentQuery query = InboundShipmentQuery.builder() + .storeIds(TIKTOK_STORE_ID) + .timeType(InboundShipmentTimeType.CREATED) + .after(Instant.now().minus(Duration.ofDays(7))) + .before(Instant.now()) + .pageSize(3) + .build(); + Page page = sdk(account).inbounds(account.key(), connection()).shipments(query); + printShipments("FBT", page); + } catch (RuntimeException e) { + printError(e); + } + } + + /** WFS 货件必须传沃尔玛店铺。 */ + @Test + void probeWfsCargo() { + requireCredentials(); + Assumptions.assumeTrue(!WALMART_STORE_ID.trim().isEmpty(), + "缺少 -Dlingxing.probe.walmartStoreId,跳过 WFS 探针"); + + System.out.println("\n================ WFS cargo / Walmart ================"); + try { + ChannelAccount account = account(Platform.WALMART_SC, 10008, WALMART_STORE_ID); + InboundShipmentQuery query = InboundShipmentQuery.builder() + .storeIds(WALMART_STORE_ID) + .timeType(InboundShipmentTimeType.CREATED) + .after(Instant.now().minus(Duration.ofDays(7))) + .before(Instant.now()) + .pageSize(3) + .build(); + Page page = sdk(account).inbounds(account.key(), connection()).shipments(query); + printShipments("WFS", page); + } catch (RuntimeException e) { + printError(e); + } + } + + /** AWD 货件走亚马逊 SC;sid 必须是数值。 */ + @Test + void probeAwdCargo() { + requireCredentials(); + Assumptions.assumeTrue(!AMAZON_SID.trim().isEmpty(), + "缺少 -Dlingxing.probe.amazonSid,跳过 AWD 探针"); + + System.out.println("\n================ AWD cargo / Amazon SC ================"); + try { + ChannelAccount account = account(Platform.AMAZON_SC, 10001, AMAZON_SID); + InboundShipmentQuery query = InboundShipmentQuery.builder() + .storeIds(AMAZON_SID) + .timeType(InboundShipmentTimeType.CREATED) + .after(Instant.now().minus(Duration.ofDays(30))) + .before(Instant.now()) + .pageSize(3) + .build(); + Page page = sdk(account).inbounds(account.key(), connection()).shipments(query); + printShipments("AWD", page); + } catch (RuntimeException e) { + printError(e); + } + } + + /** FBA 接收明细按签收日期取一页;日期使用平台时间(北京时间)。 */ + @Test + void probeFbaReceivedInventory() { + requireCredentials(); + Assumptions.assumeTrue(!AMAZON_SID.trim().isEmpty(), + "缺少 -Dlingxing.probe.amazonSid,跳过 FBA 接收明细探针"); + + System.out.println("\n================ FBA received inventory / Amazon SC ================"); + try { + ChannelAccount account = account(Platform.AMAZON_SC, 10001, AMAZON_SID); + InboundReceiptQuery query = InboundReceiptQuery.builder() + .sid(AMAZON_SID) + .eventDate(yesterdayInBeijing()) + .pageSize(3) + .build(); + Page page = sdk(account).inbounds(account.key(), connection()).receipts(query); + System.out.println("[result] items=" + page.size() + " nextCursor=" + page.nextCursor() + + " eventDate=" + query.eventDate()); + for (InboundReceipt r : page.items()) { + System.out.println(" shipmentId=" + r.shipmentId() + + " fnsku=" + r.fnsku() + + " sku=" + r.sku() + + " qty=" + r.quantity() + + " fc=" + r.fulfillmentCenterId() + + " receivedAt=" + (r.receivedAt() == null ? null : r.receivedAt().utc()) + + " uniqueIndex=" + r.uniqueIndex()); + } + } catch (RuntimeException e) { + printError(e); + } + } + + private static void printShipments(String label, Page page) { + System.out.println("[result] " + label + " items=" + page.size() + " nextCursor=" + page.nextCursor()); + for (InboundShipment s : page.items()) { + System.out.println(" shipmentNo=" + s.shipmentNo() + + " shipmentId=" + s.shipmentId() + + " inboundOrderNo=" + s.inboundOrderNo() + + " status=" + s.status() + + " statusName=" + s.statusName() + + " storeIds=" + s.storeIds() + + " warehouse=" + s.warehouseName() + + " createdAt=" + (s.createdAt() == null ? null : s.createdAt().utc()) + + " lines=" + s.lines().size() + + " shippingRefs=" + s.shippingRefs().size()); + } + } + + private static void printError(RuntimeException e) { + String msg = e.getMessage() == null ? "" : e.getMessage(); + System.out.println("[ERROR] " + e.getClass().getSimpleName() + ": " + shorten(msg)); + } + + private ChannelSdk sdk(ChannelAccount account) { + LingxingAdapter adapter = new LingxingAdapter(transport, JSON, tokens, + new InMemoryLockProvider(), Clock.systemUTC()); + return ChannelSdk.builder() + .accountRepository(new InMemoryAccounts().put(account)) + .clock(Clock.systemUTC()) + .register(adapter) + .build(); + } + + private static ChannelAccount account(Platform platform, int code, String storeId) { + return ChannelAccount.builder() + .key(AccountKey.of(ChannelProvider.LINGXING, platform, + "oms-" + platform.name().toLowerCase())) + .externalStoreId(storeId == null || storeId.trim().isEmpty() ? "probe" : storeId) + .platformCode(code == 0 ? null : code) + .credentialRef("probe") + .marketplaceZone("America/Los_Angeles") + .currency("USD") + .build(); + } + + private static ChannelConnection connection() { + return ChannelConnection.of(BASE_URL, ChannelSecret.builder() + .appKey(APP_KEY).appSecret(APP_SECRET).build()); + } + + private static void requireCredentials() { + Assumptions.assumeTrue(!APP_KEY.trim().isEmpty() && !APP_SECRET.trim().isEmpty(), + "未提供 -Dlingxing.probe.appKey / -Dlingxing.probe.appSecret,跳过探针"); + } + + /** 签收日期按北京时间算「昨天」,与领星报表口径一致。 */ + private static LocalDate yesterdayInBeijing() { + ZoneId zone = PlatformTime.BEIJING_ZONE; + return LocalDate.now(zone).minusDays(1); + } + + private static String shorten(String s) { + if (s == null) { + return "null"; + } + return s.length() <= 200 ? s : s.substring(0, 200) + "…"; + } + + /** 打印请求/响应(截断),只读排查用。 */ + static final class LoggingTransport implements HttpTransport { + + private static final int MAX_BODY = 2000; + + private final HttpTransport delegate; + + LoggingTransport(HttpTransport delegate) { + this.delegate = delegate; + } + + @Override + public HttpResponse execute(HttpRequest request) { + System.out.println(" --> " + request.method() + " " + pathOf(request.url())); + System.out.println(" body " + truncate(request.body())); + HttpResponse response = delegate.execute(request); + System.out.println(" <-- " + response.statusCode() + " " + truncate(response.body())); + return response; + } + + private static String pathOf(String url) { + int i = url.indexOf('/', url.indexOf("://") + 3); + return i < 0 ? url : url.substring(i); + } + + private static String truncate(String body) { + if (body == null) { + return "null"; + } + return body.length() <= MAX_BODY ? body + : body.substring(0, MAX_BODY) + "...(" + body.length() + " chars)"; + } + } +} diff --git a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java index 147cc48..69dcd40 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java +++ b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java @@ -1,6 +1,8 @@ package common.ecommerce.testkit; import common.ecommerce.capability.AfterSaleCapable; +import common.ecommerce.capability.InboundReceiptCapable; +import common.ecommerce.capability.InboundShipmentCapable; import common.ecommerce.capability.ProductCapable; import common.ecommerce.capability.SalesOrderCapable; import common.ecommerce.error.ChannelException; @@ -11,6 +13,10 @@ import common.ecommerce.model.aftersale.AfterSaleQuery; import common.ecommerce.model.aftersale.AfterSaleType; import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.ChannelProvider; +import common.ecommerce.model.inbound.InboundReceipt; +import common.ecommerce.model.inbound.InboundReceiptQuery; +import common.ecommerce.model.inbound.InboundShipment; +import common.ecommerce.model.inbound.InboundShipmentQuery; import common.ecommerce.model.support.Money; import common.ecommerce.model.order.OrderLine; import common.ecommerce.model.support.Page; @@ -48,7 +54,8 @@ import java.util.Set; * .build(); * */ -public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapable, AfterSaleCapable { +public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapable, AfterSaleCapable, + InboundShipmentCapable, InboundReceiptCapable { /** 游标格式:{@code item:序号},仅用于测试分页。 */ private static final String CURSOR_PREFIX = "item:"; @@ -59,6 +66,8 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl private final List orders; private final List products; private final List afterSales; + private final List inboundShipments; + private final List inboundReceipts; private final int pageSize; private final List orderQueries = new ArrayList(); private final List productQueries = new ArrayList(); @@ -71,6 +80,8 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl this.orders = b.orders; this.products = b.products; this.afterSales = b.afterSales; + this.inboundShipments = b.inboundShipments; + this.inboundReceipts = b.inboundReceipts; this.pageSize = b.pageSize; } @@ -162,6 +173,18 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl return slice(afterSales, query.cursor()); } + @Override + public Page pull(ChannelContext ctx, InboundShipmentQuery query) { + requireCapability(Capability.INBOUND_SHIPMENT); + return slice(inboundShipments, query.cursor()); + } + + @Override + public Page pull(ChannelContext ctx, InboundReceiptQuery query) { + requireCapability(Capability.INBOUND_RECEIPT); + return slice(inboundReceipts, query.cursor()); + } + /** 模拟一次写操作,如标发;带 IdempotencyGuard 的测试用它确认平台只被真正调用一次。 */ public String markShipped(String packageId, String trackingNumber) { writeCalls.add(packageId + ':' + trackingNumber); @@ -235,6 +258,35 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl .build(); } + /** 生成一条最小可用的入库货件,单号形如 {@code SHIP-1}。 */ + private static InboundShipment sampleInboundShipment(Platform platform, String shipmentNo) { + return InboundShipment.builder() + .omsStoreId("oms-test-001") + .sourceProvider(ChannelProvider.DIRECT) + .sourceAccountId("fake-seller-01") + .shipmentId("ID-" + shipmentNo) + .shipmentNo(shipmentNo) + .storeId("store-1") + .status("WORKING") + .statusName("处理中") + .createdAt(PlatformTime.of(Instant.parse("2026-10-26T00:00:00Z"), "America/Los_Angeles")) + .build(); + } + + /** 生成一条最小可用的 FBA 接收明细,货件号形如 {@code SHIP-1}。 */ + private static InboundReceipt sampleInboundReceipt(Platform platform, String shipmentNo) { + return InboundReceipt.builder() + .omsStoreId("oms-test-001") + .sourceProvider(ChannelProvider.DIRECT) + .sourceAccountId("fake-seller-01") + .shipmentId(shipmentNo) + .fnsku("FNSKU-1") + .sku("SKU-1") + .quantity(1) + .fulfillmentCenterId("FC1") + .build(); + } + // ---------------------------------------------------------------- builder public static final class Builder { @@ -242,10 +294,12 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl private String adapterId = "fake-direct"; private Platform platform = Platform.WALMART_SC; private EnumSet capabilities = EnumSet.of(Capability.SALES_ORDER, Capability.PRODUCT, - Capability.RETURNS); + Capability.RETURNS, Capability.INBOUND_SHIPMENT, Capability.INBOUND_RECEIPT); private List orders = new ArrayList(); private List products = new ArrayList(); private List afterSales = new ArrayList(); + private List inboundShipments = new ArrayList(); + private List inboundReceipts = new ArrayList(); private int pageSize = 100; public Builder adapterId(String adapterId) { @@ -258,7 +312,7 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl return this; } - /** 能力并集必须与实现的接口一致;默认订单 + 商品。 */ + /** 能力并集必须与实现的接口一致;默认订单 + 商品 + 售后 + 两类入库。 */ public Builder capabilities(Capability... capabilities) { this.capabilities = capabilities.length == 0 ? EnumSet.noneOf(Capability.class) : EnumSet.copyOf(Arrays.asList(capabilities)); @@ -311,6 +365,24 @@ public final class FakeDirectAdapter implements SalesOrderCapable, ProductCapabl return this; } + /** 生成 count 条入库货件,单号形如 {@code SHIP-1..count}。 */ + public Builder inboundShipments(int count) { + this.inboundShipments = new ArrayList(count); + for (int i = 1; i <= count; i++) { + this.inboundShipments.add(sampleInboundShipment(platform, "SHIP-" + i)); + } + return this; + } + + /** 生成 count 条 FBA 接收明细,货件号形如 {@code SHIP-1..count}。 */ + public Builder inboundReceipts(int count) { + this.inboundReceipts = new ArrayList(count); + for (int i = 1; i <= count; i++) { + this.inboundReceipts.add(sampleInboundReceipt(platform, "SHIP-" + i)); + } + return this; + } + public Builder pageSize(int pageSize) { if (pageSize <= 0) { throw new IllegalArgumentException("pageSize must be positive"); diff --git a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java b/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java index ffdbcc8..cd1d71b 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java +++ b/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java @@ -10,6 +10,10 @@ import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.aftersale.AfterSale; import common.ecommerce.model.aftersale.AfterSaleQuery; import common.ecommerce.model.aftersale.AfterSaleType; +import common.ecommerce.model.inbound.InboundReceipt; +import common.ecommerce.model.inbound.InboundReceiptQuery; +import common.ecommerce.model.inbound.InboundShipment; +import common.ecommerce.model.inbound.InboundShipmentQuery; import common.ecommerce.model.order.SalesOrder; import common.ecommerce.model.order.SalesOrderQuery; import common.ecommerce.model.product.ProductListing; @@ -33,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; /** - * 从 ChannelSdk 门面调用的完整示例,覆盖商品与售后两条主链路。 + * 从 ChannelSdk 门面调用的完整示例,覆盖商品、售后与入库三条主链路。 * *

用 {@link FakeDirectAdapter} 代替真实平台:它实现了同样的能力接口, * 因此这里验证的是门面契约——参数怎么传、能检查什么、失败时抛什么。

@@ -59,6 +63,8 @@ class SdkFacadeCallTest { .orders(3) .products(3) .afterSales(3) + .inboundShipments(3) + .inboundReceipts(3) .pageSize(2) .build()) .build(); @@ -144,12 +150,90 @@ class SdkFacadeCallTest { .build()); } + // ---------------------------------------------------------------- 入库 + + @Test + void pullInboundShipmentsThroughFacade() { + Page page = sdk.inbounds(KEY, CONNECTION).shipments( + InboundShipmentQuery.builder().pageSize(2).build()); + + assertEquals(2, page.size()); + InboundShipment first = page.items().get(0); + assertEquals("SHIP-1", first.shipmentNo()); + assertEquals("oms-test-001", first.omsStoreId()); + assertEquals(ChannelProvider.DIRECT, first.sourceProvider()); + assertTrue(page.nextCursor() != null, "3 条数据 pageSize=2,应有下一页"); + } + + @Test + void inboundShipmentPagingByCursor() { + InboundShipmentQuery query = InboundShipmentQuery.builder().pageSize(2).build(); + Page first = sdk.inbounds(KEY, CONNECTION).shipments(query); + Page second = sdk.inbounds(KEY, CONNECTION).shipments( + query.toBuilder().cursor(first.nextCursor()).build()); + + assertEquals(1, second.size()); + assertEquals("SHIP-3", second.items().get(0).shipmentNo()); + assertNull(second.nextCursor()); + } + + @Test + void pullInboundReceiptsThroughFacade() { + Page page = sdk.inbounds(KEY, CONNECTION).receipts( + InboundReceiptQuery.builder() + .eventDate(LocalDate.parse("2026-10-26")) + .pageSize(2) + .build()); + + assertEquals(2, page.size()); + InboundReceipt first = page.items().get(0); + assertEquals("SHIP-1", first.shipmentId()); + assertEquals("oms-test-001", first.omsStoreId()); + assertEquals(ChannelProvider.DIRECT, first.sourceProvider()); + assertTrue(page.nextCursor() != null); + } + + @Test + void inboundReceiptQueryRequiresEventDateOrShipmentIds() { + // 两者都不传时在构造阶段就失败,避免把「全店铺全量」的请求发到平台。 + assertThrows(IllegalArgumentException.class, + () -> InboundReceiptQuery.builder().build()); + } + + @Test + void inboundShipmentQueryRejectsInvertedWindow() { + assertThrows(IllegalArgumentException.class, + () -> InboundShipmentQuery.builder() + .after(Instant.parse("2026-11-01T00:00:00Z")) + .before(Instant.parse("2026-10-01T00:00:00Z")) + .build()); + } + + @Test + void missingInboundCapabilityThrowsOnCall() { + // 适配器只声明订单能力:视图能取到,调用入库查询时必须报不支持。 + ChannelSdk ordersOnly = ChannelSdk.builder() + .accountRepository(new InMemoryAccounts() + .put(FakeDirectAdapter.account(Platform.WALMART_SC, "oms-test-001"))) + .clock(Clock.fixed(Instant.parse("2026-11-04T00:00:00Z"), ZoneOffset.UTC)) + .register(FakeDirectAdapter.builder() + .capabilities(Capability.SALES_ORDER) + .build()) + .build(); + + assertThrows(ChannelException.UnsupportedCapabilityException.class, + () -> ordersOnly.inbounds(KEY, CONNECTION).shipments( + InboundShipmentQuery.builder().build())); + } + @Test void capabilityReportReflectsAdapter() { CapabilityReport caps = sdk.capabilities(KEY); assertTrue(caps.supports(Capability.SALES_ORDER)); assertTrue(caps.supports(Capability.PRODUCT)); assertTrue(caps.supports(Capability.RETURNS)); + assertTrue(caps.supports(Capability.INBOUND_SHIPMENT)); + assertTrue(caps.supports(Capability.INBOUND_RECEIPT)); assertEquals(false, caps.supports(Capability.BILLING)); }