diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java index 2713800..27bc859 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java @@ -43,7 +43,14 @@ public final class FeeQuery { return new Builder(); } - /** 销售订单号(运去哪的 {@code orderNo})。 */ + /** + * 销售订单号。 + * + *

注意口径:运去哪(结算明细 API 133)要的是数字单号, + * 也就是创建出库单返回的 {@code providerOrderId}(如 {@code 200171697}), + * 不是我们下发的来源单号 {@code outboundRequestNo}。 + * 传非数字会被适配器直接拒绝。

+ */ public String saleOrderNo() { return saleOrderNo; } @@ -97,6 +104,7 @@ public final class FeeQuery { private LocalDate snapshotStartDate; private LocalDate snapshotEndDate; + /** 销售订单号;运去哪要求数字单号({@code providerOrderId}),非来源单号。 */ public Builder saleOrderNo(String v) { this.saleOrderNo = v; return this; diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java index a9902ab..ddc31fc 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java @@ -89,7 +89,8 @@ public final class YqnFeeMapper { } catch (NumberFormatException e) { throw new IllegalArgumentException( "yqn saleOrderNo must be numeric, got: " + raw - + " (use the warehouse order id, not your own order number)"); + + " (use the providerOrderId returned by saleOrder/create," + + " not your own outboundRequestNo)"); } } diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java index e2ecf17..41e23fb 100644 --- a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java @@ -52,7 +52,7 @@ class YqnLogisticsProductTest { String url = transport.lastDataRequest().url(); assertTrue(url.startsWith(YqnConstants.PR_BASE_URL), url); assertTrue(url.contains("/v2/sysCarrierGroup/getCarrierGroupList"), url); - assertTrue(url.contains("query.warehouseCode=RF_NY_US"), url); + assertTrue(url.contains("warehouseCode=RF_NY_US"), url); assertEquals("GET", transport.lastDataRequest().method()); } @@ -62,7 +62,7 @@ class YqnLogisticsProductTest { .route(YqnConstants.PATH_LOGISTICS_PRODUCTS, req -> Responses.ok(OK_BODY)); new YqnAdapter(transport, new JacksonJsonCodec()).products(ctx(), null); - assertTrue(transport.lastDataRequest().url().contains("query.warehouseCode=RF_NY_US")); + assertTrue(transport.lastDataRequest().url().contains("warehouseCode=RF_NY_US")); } /** 两个来源都没有仓 code 时拒绝:空 warehouseCode 拿不到有意义的清单。 */ diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java index 4a72c0a..3d3191e 100644 --- a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java @@ -36,7 +36,7 @@ class YqnWarehouseDirectoryTest { } private static final String DOC_SHAPE_BODY = - "{\"status\":1,\"message\":\"ok\",\"data\":[" + "{\"status\":200,\"message\":\"success\",\"data\":[" + "{\"warehouseCode\":\"RF_NY_US\",\"name\":\"润丰纽约仓\",\"country\":\"US\"," + "\"state\":\"NY\",\"city\":\"Newark\",\"address1\":\"1 Main St\"," + "\"address2\":\"Suite 200\",\"postal\":\"07102\",\"linkman\":\"张三\"," @@ -121,7 +121,7 @@ class YqnWarehouseDirectoryTest { void emptyListIsNotAnError() { RecordingTransport transport = RecordingTransport.create() .route(YqnConstants.PATH_WAREHOUSE_FIND_ALL, req -> Responses.ok( - "{\"status\":1,\"message\":\"ok\",\"data\":[]}")); + "{\"status\":200,\"message\":\"success\",\"data\":[]}")); assertTrue(new YqnAdapter(transport, new JacksonJsonCodec()).warehouses(ctx()).isEmpty()); } diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java index 0971dcc..1b7eb40 100644 --- a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java @@ -188,15 +188,21 @@ class YqnFullFlowProbeTest { }); } + /** + * 结算明细:运去哪的 {@code saleOrderNo} 要的是数字单号(创建出库单返回的 + * providerOrderId),不是我们下发的来源单号。 + */ @Test @Order(6) void queryFeeDetail() { assumeToken(); - Assumptions.assumeTrue(outboundNo != null, "出库单未创建成功,跳过结算明细"); + String saleOrderNo = opt("yqn.probe.saleOrderNo", ""); + Assumptions.assumeTrue(!saleOrderNo.isEmpty(), + "未提供 -Dyqn.probe.saleOrderNo(数字单号,即创建返回的 providerOrderId),跳过"); run("POST /v1/warehouse/operation/costs/detail", () -> { java.util.List list = adapter().settlements(ctx(), common.ecommerce.warehouse.model.FeeQuery.builder() - .saleOrderNo(outboundNo).build()); + .saleOrderNo(saleOrderNo).build()); System.out.println("[fees] " + list.size() + " 条"); for (common.ecommerce.warehouse.model.BillingDocument d : list) { System.out.println(" name=" + d.feeName() + " type=" + d.feeType()