Browse Source

fix(yqn): 结算明细单号口径 + 测试跟随真机行为

结算明细(costs/detail)的 saleOrderNo 要的是<b>数字单号</b>,即创建出库单
返回的 providerOrderId(实测 200171697),不是我们下发的来源单号。真机用
PROBE-xxx-OUT 去查会被适配器拦下。

- FeeQuery.saleOrderNo 的 Javadoc 写清口径,并说明传非数字会被拒绝
- 适配器报错信息补上出处(providerOrderId returned by saleOrder/create)
- 探针的结算明细改为读 -Dyqn.probe.saleOrderNo,不再复用出库单号

真机验证:用 200171697 查询返回 0 条(该单刚创建,还没产生费用),
接口本身通。

测试跟随真机行为更新:
- 物流产品:URL 参数名从 query.warehouseCode 改为 warehouseCode
- 仓库目录:成功 status 从 1 改为 200

全量 488 个测试通过(yqn 163 个)。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 1 week ago
parent
commit
30758c7acb
  1. 10
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java
  2. 3
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java
  3. 4
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java
  4. 4
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java
  5. 10
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java

10
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/FeeQuery.java

@ -43,7 +43,14 @@ public final class FeeQuery { @@ -43,7 +43,14 @@ public final class FeeQuery {
return new Builder();
}
/** 销售订单号(运去哪的 {@code orderNo})。 */
/**
* 销售订单号。
*
* <p><b>注意口径</b>:运去哪(结算明细 API 133)要的是<b>数字单号</b>,
* 也就是创建出库单返回的 {@code providerOrderId}(如 {@code 200171697}),
* <b>不是</b>我们下发的来源单号 {@code outboundRequestNo}。
* 传非数字会被适配器直接拒绝。</p>
*/
public String saleOrderNo() {
return saleOrderNo;
}
@ -97,6 +104,7 @@ public final class FeeQuery { @@ -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;

3
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java

@ -89,7 +89,8 @@ public final class YqnFeeMapper { @@ -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)");
}
}

4
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnLogisticsProductTest.java

@ -52,7 +52,7 @@ class YqnLogisticsProductTest { @@ -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 { @@ -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 拿不到有意义的清单。 */

4
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnWarehouseDirectoryTest.java

@ -36,7 +36,7 @@ class YqnWarehouseDirectoryTest { @@ -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 { @@ -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());
}

10
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnFullFlowProbeTest.java

@ -188,15 +188,21 @@ class YqnFullFlowProbeTest { @@ -188,15 +188,21 @@ class YqnFullFlowProbeTest {
});
}
/**
* 结算明细:运去哪的 {@code saleOrderNo} 要的是<b>数字单号</b>(创建出库单返回的
* 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<common.ecommerce.warehouse.model.BillingDocument> 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()

Loading…
Cancel
Save