diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java index a7e2464..c1da05d 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java @@ -13,7 +13,7 @@ public final class OutboundQuery { private final Instant after; private final Instant before; private final List statuses; - private final String providerOrderId; + private final String outboundRequestNo; private final String orderRef; private final int pageSize; private final String cursor; @@ -25,7 +25,7 @@ public final class OutboundQuery { this.after = b.after; this.before = b.before; this.statuses = Collections.unmodifiableList(new ArrayList(b.statuses)); - this.providerOrderId = b.providerOrderId; + this.outboundRequestNo = b.outboundRequestNo; this.orderRef = b.orderRef; this.pageSize = b.pageSize; this.cursor = b.cursor; @@ -50,9 +50,15 @@ public final class OutboundQuery { return statuses; } - /** 按仓出库单号精确查。 */ - public String providerOrderId() { - return providerOrderId; + /** + * 按来源单号(我们下发的 {@code outboundRequestNo})精确查。 + * + *

原名 {@code providerOrderId} 有误导:它装的从来不是仓内部 id。 + * 运去哪创建订单(API 123)返回的 {@code orderId} 是内部数字 id, + * 只能用于列表/关联;详情查询(API 128)只认来源单号。

+ */ + public String outboundRequestNo() { + return outboundRequestNo; } /** @@ -80,7 +86,7 @@ public final class OutboundQuery { .after(after) .before(before) .statuses(statuses) - .providerOrderId(providerOrderId) + .outboundRequestNo(outboundRequestNo) .orderRef(orderRef) .pageSize(pageSize) .cursor(cursor); @@ -91,7 +97,7 @@ public final class OutboundQuery { private Instant after; private Instant before; private final List statuses = new ArrayList(); - private String providerOrderId; + private String outboundRequestNo; private String orderRef; private int pageSize = 100; private String cursor; @@ -120,8 +126,8 @@ public final class OutboundQuery { return this; } - public Builder providerOrderId(String providerOrderId) { - this.providerOrderId = providerOrderId; + public Builder outboundRequestNo(String outboundRequestNo) { + this.outboundRequestNo = outboundRequestNo; return this; } diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java index 2a0fe47..d2a5676 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java @@ -215,11 +215,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl public Page query(WarehouseContext ctx, OutboundQuery query) { // API 128 只能按「来源单号」查:仓内部 id 与平台单号都查不了。 // orderRef 是平台单号,拿它当来源单号查会查不到或查错单,因此不参与查询。 - String orderNo = firstNonBlank(query.providerOrderId(), null); + String orderNo = firstNonBlank(query.outboundRequestNo(), null); if (orderNo == null) { throw new common.ecommerce.shared.error.ValidationException( WarehouseException.builder() - .message("yqn has no order list API; query requires providerOrderId " + .message("yqn has no order list API; query requires outboundRequestNo " + "(orderRef is a platform order number and is not queryable here)") .operation("warehouse.outbound.query") .warehouseCode(ctx.warehouseCode()) diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java index 8825b12..433f2c7 100644 --- a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java @@ -148,7 +148,7 @@ class YqnOutboundPayloadTest { RuntimeException ex = assertThrows(RuntimeException.class, () -> adapter.query(ctx(), common.ecommerce.warehouse.model.OutboundQuery.builder().orderRef("AMZ-1").build())); - assertTrue(ex.getMessage().contains("providerOrderId"), ex.getMessage()); + assertTrue(ex.getMessage().contains("outboundRequestNo"), ex.getMessage()); } @Test @@ -160,7 +160,7 @@ class YqnOutboundPayloadTest { YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); assertEquals(1, adapter.query(ctx(), common.ecommerce.warehouse.model.OutboundQuery.builder() - .providerOrderId("OB-1").build()).size()); + .outboundRequestNo("OB-1").build()).size()); } /** 运去哪下单接口没有拆单字段,能力位不能再声明 SPLIT。 */