Browse Source

feat: 运去哪 / 易达云 商品查询接口

统一模型新增:
- ProductQuery:providerSkus(仓侧 SKU)/ barcode / 创建时间窗 / 分页,
  单次上限 100 个 SKU
- ProductInfo:查询结果(仓侧 SKU、条码、尺寸重量、装箱、状态、创建时间)
- WarehouseProductCapable.query(...) 默认抛不支持;门面 queryProducts(ProductQuery)

运去哪(API 113 /v1/product/findPage):
- **页码从 0 开始**(文档原文),游标即页码、不做 ±1 换算
- 单页上限 100、skuList 上限 100
- 该接口没有条码 / 时间窗过滤,传了本地拒绝
- 翻页优先 last,其次 number+1 < totalPages,最后按满页兜底
- cost 没有 currency 时不成 Money(避免丢单位)

易达云(/webApi/skuInfo/v1/listProductPage):
- skuCode 是逗号拼接的单个字符串,一次最多 50 个,超了本地拒绝
- 页码从 1 开始、单页上限 200
- 尺寸取**实际值**,缺失才回落 forecast*(真机 ybtest:实际 55 vs 预报 10,差 5 倍)
- 「查询无数据」按空页处理,不抛异常(与轨迹接口同口径)
- 查询条件全空时仓方默认查最近一个月,本地不补默认值

真机验证(2026-11-17):
- 易达云:不带时间窗 total=52244;skuCode=ybtest 命中 1 行;
  30 天窗口 + 2021 年建的 SKU → 「查询无数据」;10 年窗口正常命中
- 运去哪:未提供 x-api-key,只做了离线单测

SKU 口径已确认并写入文档:两边都传仓侧 SKU(建档下发的 providerSku,
为空时才是 omsSku),SDK 不做 OMS→仓侧转换。

Co-Authored-By: Claude <noreply@anthropic.com>
master
chenchuchuan 3 days ago
parent
commit
b5e94c1157
  1. 67
      docs-warehouse/edayun/README.md
  2. 31
      docs-warehouse/yqn/README.md
  3. 21
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/WarehouseProductCapable.java
  4. 423
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ProductInfo.java
  5. 140
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ProductQuery.java
  6. 19
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java
  7. 3
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/EdayunConstants.java
  8. 44
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java
  9. 153
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunProductQueryMapper.java
  10. 96
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunProductQueryDtos.java
  11. 215
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunProductQueryTest.java
  12. 106
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/probe/EdayunProductQueryProbeTest.java
  13. 3
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/YqnConstants.java
  14. 29
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java
  15. 175
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnProductQueryMapper.java
  16. 112
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnProductQueryDtos.java
  17. 190
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnProductQueryTest.java
  18. 33
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnReadOnlyProbeTest.java

67
docs-warehouse/edayun/README.md

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
| 适配器 / 工厂 | ✅ 类型就绪,能力位为空 |
| 获取 token | ✅ 已对接(`POST /oauth/token`) |
| 创建产品 | ✅ 已对接(`POST /webApi/skuInfo/v1/createProduct`) |
| 商品查询 | ✅ 已对接(`POST /webApi/skuInfo/v1/listProductPage`) |
| 创建出库单 | ✅ 已对接(`POST /webApi/order/v1/createOrder`) |
| 查询出库单 | ✅ 已对接(`POST /webApi/order/v1/getOrderInfo`) |
| 查询面单 | ✅ 已对接(`POST /webApi/order/v1/getOrderLabel`) |
@ -156,6 +157,55 @@ mvn -pl warehouse-sdk-edayun -DfailIfNoTests=false -Dedayun.probe.product=tr @@ -156,6 +157,55 @@ mvn -pl warehouse-sdk-edayun -DfailIfNoTests=false -Dedayun.probe.product=tr
... -Dedayun.probe.write=true -Dedayun.probe.token=... -Dedayun.probe.appKey=... -Dedayun.probe.appSecret=...
```
## 商品查询
```
POST /webApi/skuInfo/v1/listProductPage → Page<ProductInfo>
```
### 三个坑
**1. SKU 是逗号拼接的单个字符串,且一次最多 50 个。**
```java
req.skuCode = String.join(",", query.providerSkus()); // "A,B,C"
```
统一模型是 `List<String>`,超 50 本地拒绝(不截断)。
**2. 没有数据时回 `code=500, msg=查询无数据`。**
这是「查不到」不是「调用失败」,按空页处理——与轨迹接口的「未匹配到轨迹」同一处理。
其它 500 仍抛异常。
**3. 查询条件全空时默认只查最近一个月。**
`ybtest` 创建于 2021 年,不带时间窗就查不到。查老数据必须显式给时间窗。
### 尺寸取实际值,缺失才回落预报值
| 易达云 | 我们用的 |
|---|---|
| `length/width/height/weight` | **优先**(仓方当前存的值) |
| `forecastLength/...` | 实际值缺失时回落 |
真机对比很能说明问题:`ybtest` 的 `length` 是 55(实际量过),
`forecastLength` 是 10(预报时填的)——两者差 5 倍,拿错会算错运费。
### 页码从 1 开始,单页最多 200
### 真机验证(2026-11-17)
| 场景 | 结果 |
|---|---|
| 只给 `pageNum/pageSize`(不带时间窗) | `total=52244`(全量) |
| `skuCode=ybtest` | `total=1`,实际尺寸 55×4×3、重量 1 |
| `skuCode=ybtest` + 最近 30 天窗口 | **`code=500 查询无数据`**(该 SKU 建于 2021) |
| 不存在的 SKU / 条码 | 同样「查询无数据」 |
| 10 年窗口 + `ybtest` | 1 行,`createdAt=2021-02-04` |
**SKU 是仓侧 SKU**:`ybtest` 既是 OMS SKU 也是建档时下发的 `providerSku`,
所以看不出口径差异;若两者不同,必须传仓侧那串(见下方「SKU 口径」)。
## 创建出库单
```
@ -1317,6 +1367,23 @@ DTO 按 `List` 收。 @@ -1317,6 +1367,23 @@ DTO 按 `List` 收。
`listWarehouseHasPerm` 只有 17 个。DTO 只声明统一模型用得上的十几个——
Jackson 会忽略未知字段。
## SKU 口径:传的是 OMS SKU 还是仓侧 SKU?
**结论:两边都必须是仓侧 SKU(建档时下发的那串)。**
代码依据:
- 建档:`YqnProductMapper.skuOf()` / `EdayunProductMapper.skuOf()` 都是
**`providerSku` 优先,为空才回退 `omsSku`**
- 出库行:`OutboundLine` 同时有 `omsSku` 与 `providerSku`,映射时同样 providerSku 优先
- 商品查询:`ProductQuery.providerSkus()` 是仓侧 SKU,**SDK 不做 OMS→仓侧转换**
所以仓方库里存的永远是「我们建档时下发的那串」。如果宿主给 `providerSku`
建了档,那么查询也必须用它;只有两者相同时(如 `ybtest`)才能混用。
**SDK 不会静默转换的原因**:OMS→仓侧 SKU 的映射表在宿主手里(供应商编码规则、
按仓不同的前缀等),SDK 猜不出来。查错了会拿到空结果或错的商品,比报错更难发现。
## 待确认(问易达云)
| # | 要确认 |

31
docs-warehouse/yqn/README.md

@ -206,6 +206,36 @@ WarehouseConnection.of( @@ -206,6 +206,36 @@ WarehouseConnection.of(
**未指定时按 UTC 解释,不猜成北京时间。**
## 9.5 商品查询(API 113)
```
POST /v1/product/findPage → Page<ProductInfo>
```
### 页码从 0 开始
文档原文「起始页为从0开始」。统一模型的游标就是页码字符串,**不做 ±1 换算**——
空游标 = 第 0 页。这和运去哪其它分页接口(从 1 开始)不一致,容易踩。
### 单页上限 100,SKU 上限 100
`pageSize` 默认 100、最大 100;`skuList` 最大 100 个。超了各自本地拒绝。
### 只支持 SKU 过滤
运去哪这个接口没有条码 / 创建时间过滤,`ProductQuery` 里传了这两个会本地拒绝,
不静默忽略。
### 翻页优先看 `last`
响应是 Spring Data 风格,`last=true` 即末页。缺失时用 `number + 1 < totalPages`
推断,再缺失才按「本页是否满页」兜底。
### 成本要带币种才是 Money
`cost` 与 `currency` 是两列;没有币种时只保留数字会丢单位,所以
没有 `currency` 时 `cost()` 为 null。
## 10. 联调探针
两个探针,默认跳过:
@ -235,4 +265,5 @@ mvn -pl warehouse-sdk-yqn -DfailIfNoTests=false \ @@ -235,4 +265,5 @@ mvn -pl warehouse-sdk-yqn -DfailIfNoTests=false \
| 库存调整 | 运去哪无此接口 |
| 换货 / 无头件 / BOL | 仓方无对应接口 |
| 退货查询列表 | 只有按单号查,无列表接口 |
| 商品查询的条码 / 时间窗过滤 | API 113 只接受 skuList 与分页 |
| 出库列表 / 时间窗查询 | 只有按单号查 |

21
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/WarehouseProductCapable.java

@ -3,12 +3,31 @@ package common.ecommerce.warehouse.capability; @@ -3,12 +3,31 @@ package common.ecommerce.warehouse.capability;
import common.ecommerce.warehouse.sdk.WarehouseAdapter;
import common.ecommerce.warehouse.sdk.WarehouseContext;
/** 商品建档 / 更新能力。 */
/** 商品建档 / 更新 / 查询能力。 */
public interface WarehouseProductCapable extends WarehouseAdapter {
/** 在某仓创建或更新一个 SKU。 */
ProductResult createOrUpdate(WarehouseContext ctx, WarehouseProduct product);
/**
* 批量 / 分页查询仓侧商品资料。
*
* <p>查询用的 SKU 是<b>仓侧 SKU</b>(建档时下发的那串,通常是
* {@code WarehouseProduct.providerSku()},没给映射时等于 OMS SKU)。
* SDK 不做 OMS→仓侧 SKU 的转换——映射表在宿主手里,静默转换会让结果对不上。</p>
*
* <p>默认不支持:只有提供商品查询接口的仓才覆盖。</p>
*
* @return 分页结果;仓方无数据时为空页(不是错误)
* @throws common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException
* 该仓不提供商品查询
*/
default common.ecommerce.shared.support.Page<common.ecommerce.warehouse.model.ProductInfo> query(
WarehouseContext ctx, common.ecommerce.warehouse.model.ProductQuery query) {
throw new common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException(
common.ecommerce.warehouse.enums.WarehouseCapability.PRODUCT);
}
/** 商品建档结果。 */
final class ProductResult {

423
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ProductInfo.java

@ -0,0 +1,423 @@ @@ -0,0 +1,423 @@
package common.ecommerce.warehouse.model;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 仓侧商品资料(查询结果)。
*
* <p>与 {@link common.ecommerce.warehouse.capability.WarehouseProduct} 的区别:
* 那个是<b>建档入参</b>(我们下发给仓方),这个是<b>查询结果</b>(仓方存着什么)。
* 两者字段高度重叠但语义不同——入参里没有 id / 状态 / 创建时间,
* 结果里也没有「要求仓方必填」这类约束,所以不复用同一个类。</p>
*
* <p>单位与入参一致:尺寸 cm、重量 g。</p>
*/
public final class ProductInfo {
/** 仓侧 SKU(建档时下发的那串)。 */
private final String providerSku;
/** OMS 侧 SKU;仓方不回时为 null(SDK 不做反查)。 */
private final String omsSku;
/** 仓方内部商品 id;不同仓给不给不一。 */
private final String providerProductId;
/** 自定义产品编码。 */
private final String customItemNo;
private final String barcode;
private final List<String> extraBarcodes;
private final String name;
private final String nameEn;
private final String description;
/** 产品类型:1 成品 / 2 配件 / 3 耗材;未给为 -1。 */
private final int productType;
/** 外箱 / 整箱尺寸重量。 */
private final double lengthCm;
private final double widthCm;
private final double heightCm;
private final double weightGrams;
/** 单品尺寸;未给为 null。 */
private final Double itemLengthCm;
private final Double itemWidthCm;
private final Double itemHeightCm;
/** 装箱数量;未给为 null。 */
private final Integer packedQuantity;
private final Double packedLengthCm;
private final Double packedWidthCm;
private final Double packedHeightCm;
private final Double packedWeightGrams;
/** 是否需要 SN;未给为 null。 */
private final Boolean requireSn;
/** 成本;未给为 null。 */
private final Money cost;
/** 仓方状态原值(如 edayun 的 0 草稿 / 1 已发布);未给为 null。 */
private final Integer rawStatus;
/** 仓方状态名原值。 */
private final String rawStatusName;
/** 创建时间;未给为 null。 */
private final Instant createdAt;
private final String remark;
/** 该商品来自哪家仓。 */
private final WarehouseProvider sourceProvider;
private ProductInfo(Builder b) {
this.providerSku = require(b.providerSku, "providerSku");
this.omsSku = b.omsSku;
this.providerProductId = b.providerProductId;
this.customItemNo = b.customItemNo;
this.barcode = b.barcode;
this.extraBarcodes = Collections.unmodifiableList(
new ArrayList<String>(b.extraBarcodes));
this.name = b.name;
this.nameEn = b.nameEn;
this.description = b.description;
this.productType = b.productType;
this.lengthCm = b.lengthCm;
this.widthCm = b.widthCm;
this.heightCm = b.heightCm;
this.weightGrams = b.weightGrams;
this.itemLengthCm = b.itemLengthCm;
this.itemWidthCm = b.itemWidthCm;
this.itemHeightCm = b.itemHeightCm;
this.packedQuantity = b.packedQuantity;
this.packedLengthCm = b.packedLengthCm;
this.packedWidthCm = b.packedWidthCm;
this.packedHeightCm = b.packedHeightCm;
this.packedWeightGrams = b.packedWeightGrams;
this.requireSn = b.requireSn;
this.cost = b.cost;
this.rawStatus = b.rawStatus;
this.rawStatusName = b.rawStatusName;
this.createdAt = b.createdAt;
this.remark = b.remark;
this.sourceProvider = b.sourceProvider;
}
public static Builder builder() {
return new Builder();
}
public String providerSku() {
return providerSku;
}
/** OMS SKU;仓方不回时为 null。 */
public String omsSku() {
return omsSku;
}
public String providerProductId() {
return providerProductId;
}
public String customItemNo() {
return customItemNo;
}
public String barcode() {
return barcode;
}
/** 额外条码(仓方支持多个时);不可变。 */
public List<String> extraBarcodes() {
return extraBarcodes;
}
public String name() {
return name;
}
public String nameEn() {
return nameEn;
}
public String description() {
return description;
}
/** 产品类型:1 成品 / 2 配件 / 3 耗材;未给为 -1。 */
public int productType() {
return productType;
}
public double lengthCm() {
return lengthCm;
}
public double widthCm() {
return widthCm;
}
public double heightCm() {
return heightCm;
}
public double weightGrams() {
return weightGrams;
}
public Double itemLengthCm() {
return itemLengthCm;
}
public Double itemWidthCm() {
return itemWidthCm;
}
public Double itemHeightCm() {
return itemHeightCm;
}
public Integer packedQuantity() {
return packedQuantity;
}
public Double packedLengthCm() {
return packedLengthCm;
}
public Double packedWidthCm() {
return packedWidthCm;
}
public Double packedHeightCm() {
return packedHeightCm;
}
public Double packedWeightGrams() {
return packedWeightGrams;
}
public Boolean requireSn() {
return requireSn;
}
public Money cost() {
return cost;
}
/** 仓方状态原值。 */
public Integer rawStatus() {
return rawStatus;
}
/** 仓方状态名原值。 */
public String rawStatusName() {
return rawStatusName;
}
public Instant createdAt() {
return createdAt;
}
public String remark() {
return remark;
}
public WarehouseProvider sourceProvider() {
return sourceProvider;
}
private static String require(String v, String name) {
if (v == null || v.trim().isEmpty()) {
throw new IllegalArgumentException(name + " must not be blank");
}
return v.trim();
}
public static final class Builder {
private String providerSku;
private String omsSku;
private String providerProductId;
private String customItemNo;
private String barcode;
private final List<String> extraBarcodes = new ArrayList<String>();
private String name;
private String nameEn;
private String description;
private int productType = -1;
private double lengthCm;
private double widthCm;
private double heightCm;
private double weightGrams;
private Double itemLengthCm;
private Double itemWidthCm;
private Double itemHeightCm;
private Integer packedQuantity;
private Double packedLengthCm;
private Double packedWidthCm;
private Double packedHeightCm;
private Double packedWeightGrams;
private Boolean requireSn;
private Money cost;
private Integer rawStatus;
private String rawStatusName;
private Instant createdAt;
private String remark;
private WarehouseProvider sourceProvider;
public Builder providerSku(String v) {
this.providerSku = v;
return this;
}
public Builder omsSku(String v) {
this.omsSku = v;
return this;
}
public Builder providerProductId(String v) {
this.providerProductId = v;
return this;
}
public Builder customItemNo(String v) {
this.customItemNo = v;
return this;
}
public Builder barcode(String v) {
this.barcode = v;
return this;
}
public Builder extraBarcode(String v) {
if (v != null && !v.trim().isEmpty()) {
this.extraBarcodes.add(v.trim());
}
return this;
}
public Builder name(String v) {
this.name = v;
return this;
}
public Builder nameEn(String v) {
this.nameEn = v;
return this;
}
public Builder description(String v) {
this.description = v;
return this;
}
/** 产品类型:1 成品 / 2 配件 / 3 耗材;-1 表示未给。 */
public Builder productType(int v) {
this.productType = v;
return this;
}
public Builder lengthCm(double v) {
this.lengthCm = v;
return this;
}
public Builder widthCm(double v) {
this.widthCm = v;
return this;
}
public Builder heightCm(double v) {
this.heightCm = v;
return this;
}
public Builder weightGrams(double v) {
this.weightGrams = v;
return this;
}
public Builder itemLengthCm(Double v) {
this.itemLengthCm = v;
return this;
}
public Builder itemWidthCm(Double v) {
this.itemWidthCm = v;
return this;
}
public Builder itemHeightCm(Double v) {
this.itemHeightCm = v;
return this;
}
public Builder packedQuantity(Integer v) {
this.packedQuantity = v;
return this;
}
public Builder packedLengthCm(Double v) {
this.packedLengthCm = v;
return this;
}
public Builder packedWidthCm(Double v) {
this.packedWidthCm = v;
return this;
}
public Builder packedHeightCm(Double v) {
this.packedHeightCm = v;
return this;
}
public Builder packedWeightGrams(Double v) {
this.packedWeightGrams = v;
return this;
}
public Builder requireSn(Boolean v) {
this.requireSn = v;
return this;
}
public Builder cost(Money v) {
this.cost = v;
return this;
}
public Builder rawStatus(Integer v) {
this.rawStatus = v;
return this;
}
public Builder rawStatusName(String v) {
this.rawStatusName = v;
return this;
}
public Builder createdAt(Instant v) {
this.createdAt = v;
return this;
}
public Builder remark(String v) {
this.remark = v;
return this;
}
public Builder sourceProvider(WarehouseProvider v) {
this.sourceProvider = v;
return this;
}
public ProductInfo build() {
return new ProductInfo(this);
}
}
}

140
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ProductQuery.java

@ -0,0 +1,140 @@ @@ -0,0 +1,140 @@
package common.ecommerce.warehouse.model;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 商品查询条件(批量 / 分页)。
*
* <p>与 {@link InventoryQuery} 的口径一致:{@code providerSkus} 是<b>仓侧 SKU</b>,
* 即建档时下发给仓方的那一串(通常等于 {@code WarehouseProduct.providerSku()},
* 没给映射时就是 OMS SKU)。<b>SDK 不做 OMS→仓侧 SKU 的转换</b>——
* 那张映射表在宿主手里,这里静默转换会让查回来的东西对不上。</p>
*
* <p>各仓支持的过滤维度不同,不支持的由适配器<b>显式拒绝</b>,
* 不静默忽略——忽略一个过滤条件会让结果对不上。</p>
*/
public final class ProductQuery {
/** 单次最多查多少个 SKU(各仓不同,由适配器按自己的上限再校验)。 */
public static final int MAX_SKUS = 100;
private final List<String> providerSkus;
/** 条码(UPC / 仓方条码)。 */
private final String barcode;
private final Instant createdAfter;
private final Instant createdBefore;
private final int pageSize;
private final String cursor;
public ProductQuery(Builder b) {
this.providerSkus = Collections.unmodifiableList(
new ArrayList<String>(b.providerSkus));
if (this.providerSkus.size() > MAX_SKUS) {
throw new IllegalArgumentException(
"at most " + MAX_SKUS + " skus per query, got " + this.providerSkus.size());
}
if (b.createdAfter != null && b.createdBefore != null
&& !b.createdAfter.isBefore(b.createdBefore)) {
throw new IllegalArgumentException("createdAfter must be before createdBefore");
}
this.barcode = b.barcode;
this.createdAfter = b.createdAfter;
this.createdBefore = b.createdBefore;
this.pageSize = b.pageSize;
this.cursor = b.cursor;
}
public static Builder builder() {
return new Builder();
}
/** 仓侧 SKU 列表;空表示不按 SKU 过滤。 */
public List<String> providerSkus() {
return providerSkus;
}
/** 条码;null 表示不按条码过滤。 */
public String barcode() {
return barcode;
}
public Instant createdAfter() {
return createdAfter;
}
public Instant createdBefore() {
return createdBefore;
}
/** 是否给了完整的创建时间窗。 */
public boolean hasCreatedRange() {
return createdAfter != null && createdBefore != null;
}
public int pageSize() {
return pageSize;
}
/** 分页游标;null 表示第一页。 */
public String cursor() {
return cursor;
}
public static final class Builder {
private final List<String> providerSkus = new ArrayList<String>();
private String barcode;
private Instant createdAfter;
private Instant createdBefore;
private int pageSize = 100;
private String cursor;
/** 一个仓侧 SKU;空串忽略。 */
public Builder providerSku(String v) {
if (v != null && !v.trim().isEmpty()) {
this.providerSkus.add(v.trim());
}
return this;
}
public Builder providerSkus(List<String> v) {
if (v != null) {
for (String s : v) {
providerSku(s);
}
}
return this;
}
public Builder barcode(String v) {
this.barcode = v;
return this;
}
public Builder createdAfter(Instant v) {
this.createdAfter = v;
return this;
}
public Builder createdBefore(Instant v) {
this.createdBefore = v;
return this;
}
public Builder pageSize(int v) {
this.pageSize = v;
return this;
}
public Builder cursor(String v) {
this.cursor = v;
return this;
}
public ProductQuery build() {
return new ProductQuery(this);
}
}
}

19
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java

@ -40,6 +40,8 @@ import common.ecommerce.warehouse.model.InboundOrder; @@ -40,6 +40,8 @@ import common.ecommerce.warehouse.model.InboundOrder;
import common.ecommerce.warehouse.model.InboundReceipt;
import common.ecommerce.warehouse.model.InventoryQuery;
import common.ecommerce.warehouse.model.InventorySnapshot;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.warehouse.model.LabelPrintTask;
import common.ecommerce.warehouse.model.LogisticsProduct;
import common.ecommerce.warehouse.model.ReturnCommand;
@ -96,6 +98,23 @@ public final class WarehouseOperations { @@ -96,6 +98,23 @@ public final class WarehouseOperations {
}
/**
* 批量 / 分页查询仓侧商品资料。只读,不走幂等。
*
* <p>查询入参的 {@code providerSkus} 是<b>仓侧 SKU</b>(建档时下发的那串)。
* SDK 不做 OMS→仓侧 SKU 转换。</p>
*/
public Page<ProductInfo> queryProducts(ProductQuery query) {
require(WarehouseCapability.PRODUCT, WarehouseProductCapable.class);
return CallSupport.observe(observer, ctx, "warehouse.product.query",
CallSupport.params("skuCount", query.providerSkus().size(),
"barcode", query.barcode(),
"hasCreatedRange", query.hasCreatedRange(),
"cursor", query.cursor()),
p -> p.size(),
() -> ((WarehouseProductCapable) adapter).query(ctx, query));
}
/**
* 创建调拨单。<b>写操作</b>:强制经幂等守卫,幂等键
* {@code warehouseCode + transferRequestNo + create}。
*

3
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/EdayunConstants.java

@ -36,6 +36,9 @@ public final class EdayunConstants { @@ -36,6 +36,9 @@ public final class EdayunConstants {
/** 创建产品({@code POST /webApi/skuInfo/v1/createProduct})。 */
public static final String PATH_PRODUCT_CREATE = "/webApi/skuInfo/v1/createProduct";
/** 批量查询产品分页({@code POST /webApi/skuInfo/v1/listProductPage})。 */
public static final String PATH_PRODUCT_LIST = "/webApi/skuInfo/v1/listProductPage";
/** 创建出库单({@code POST /webApi/order/v1/createOrder})。 */
public static final String PATH_ORDER_CREATE = "/webApi/order/v1/createOrder";

44
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java

@ -18,6 +18,7 @@ import common.ecommerce.edayun.dto.EdayunInboundQueryDtos; @@ -18,6 +18,7 @@ import common.ecommerce.edayun.dto.EdayunInboundQueryDtos;
import common.ecommerce.edayun.dto.EdayunInventoryDtos;
import common.ecommerce.edayun.dto.EdayunLogisticsProductDtos;
import common.ecommerce.edayun.dto.EdayunOrderCostDtos;
import common.ecommerce.edayun.dto.EdayunProductQueryDtos;
import common.ecommerce.edayun.dto.EdayunRentDetailDtos;
import common.ecommerce.edayun.dto.EdayunReturnDetailDtos;
import common.ecommerce.edayun.dto.EdayunReturnDtos;
@ -77,6 +78,8 @@ import common.ecommerce.warehouse.model.OutboundQuery; @@ -77,6 +78,8 @@ import common.ecommerce.warehouse.model.OutboundQuery;
import common.ecommerce.warehouse.model.OutboundReceipt;
import common.ecommerce.warehouse.model.OutboundRef;
import common.ecommerce.warehouse.model.PackageResult;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ReturnCommand;
import common.ecommerce.warehouse.model.ReturnProcessCommand;
import common.ecommerce.warehouse.model.ReturnQuery;
@ -213,6 +216,38 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa @@ -213,6 +216,38 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa
parsed.data == null ? null : parsed.data.skuId);
}
/**
* 批量查询仓侧商品资料({@code POST /webApi/skuInfo/v1/listProductPage})。
*
* <p>入参 SKU 是<b>仓侧 SKU</b>。易达云的 {@code skuCode} 是逗号拼接的
* 单个字符串且一次最多 50 个,超了本地拒绝(不截断)。
* 审核时间窗统一模型没有对应字段,不传。</p>
*
* <p>查询条件全空时仓方默认按创建时间查<b>最近一个月</b>——这一点由仓方兜底,
* 本地不补默认值。</p>
*/
@Override
public Page<ProductInfo> query(WarehouseContext ctx, ProductQuery query) {
int pageNum = EdayunProductQueryMapper.pageNumber(query.cursor());
EdayunProductQueryDtos.ListProductRequest body =
EdayunProductQueryMapper.toRequest(query, ctx.zone(), pageNum);
String bodyJson = json.toJson(body);
HttpResponse resp = send(ctx, EdayunConstants.PATH_PRODUCT_LIST, bodyJson,
"warehouse.product.query");
EdayunProductQueryDtos.ListProductResponse parsed =
json.fromJson(resp.body(), EdayunProductQueryDtos.ListProductResponse.class);
// 「查询无数据」是空结果,不是失败——易达云对查不到的 SKU / 条码回 code=500,
// 但语义与「运单还没轨迹」同类。
if (parsed != null && isNoData(parsed.msg)) {
return Page.empty();
}
requireSuccess(ctx, parsed == null ? null : parsed.code,
parsed == null ? null : parsed.msg, resp, "warehouse.product.query");
return EdayunProductQueryMapper.toPage(parsed, pageNum, body.pageSize);
}
// ------------------------------------------------------------------ 出库
/**
@ -964,7 +999,7 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa @@ -964,7 +999,7 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa
HttpResponse resp = send(ctx, EdayunConstants.PATH_TRACK, bodyJson, operation);
EdayunTrackDtos.GetTrackResponse parsed =
json.fromJson(resp.body(), EdayunTrackDtos.GetTrackResponse.class);
if (parsed != null && isNoTrackFound(parsed.msg)) {
if (parsed != null && isNoData(parsed.msg)) {
return null;
}
requireSuccess(ctx, parsed == null ? null : parsed.code,
@ -973,9 +1008,10 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa @@ -973,9 +1008,10 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa
return EdayunTrackMapper.find(parsed, trackingNumber);
}
/** 仓方「没有轨迹」的提示语。 */
private static boolean isNoTrackFound(String msg) {
return msg != null && (msg.contains("未匹配到轨迹") || msg.contains("跟踪号为空"));
/** 仓方「没有数据」的提示语:查不到不等于调用失败。 */
private static boolean isNoData(String msg) {
return msg != null && (msg.contains("查询无数据") || msg.contains("未匹配到轨迹")
|| msg.contains("跟踪号为空"));
}
// ------------------------------------------------------------------ 条码打印

153
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunProductQueryMapper.java

@ -0,0 +1,153 @@ @@ -0,0 +1,153 @@
package common.ecommerce.edayun.adapter;
import common.ecommerce.edayun.dto.EdayunProductQueryDtos;
import common.ecommerce.shared.support.Page;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import java.time.Instant;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 易达云商品查询映射({@code /webApi/skuInfo/v1/listProductPage})。
*
* <p><b>SKU 过滤用逗号拼接的单个字符串</b>({@code skuCode}),
* 且一次最多 50 个——与统一模型的 {@code providerSkus} 列表不同,这里要拼。</p>
*
* <p>页码从 1 开始,单页最多 200。</p>
*/
public final class EdayunProductQueryMapper {
static final int MAX_PAGE_SIZE = 200;
/** skuCode 一次最多查多少个(文档:50)。 */
static final int MAX_SKUS = 50;
private EdayunProductQueryMapper() {
}
/**
* 统一查询条件 → 仓方请求。
*
* @param zone 解释创建时间窗的时区(仓方口径)
*/
public static EdayunProductQueryDtos.ListProductRequest toRequest(ProductQuery query,
ZoneId zone,
int pageNum) {
EdayunProductQueryDtos.ListProductRequest req =
new EdayunProductQueryDtos.ListProductRequest();
req.pageNum = pageNum;
req.pageSize = pageSize(query.pageSize());
if (!query.providerSkus().isEmpty()) {
if (query.providerSkus().size() > MAX_SKUS) {
throw new IllegalArgumentException(
"edayun product query accepts at most " + MAX_SKUS + " skus, got "
+ query.providerSkus().size()
+ "; split into multiple queries");
}
req.skuCode = String.join(",", query.providerSkus());
}
if (query.barcode() != null && !query.barcode().trim().isEmpty()) {
req.barcode = query.barcode().trim();
}
if (query.hasCreatedRange()) {
req.startCreateTime = query.createdAfter().toEpochMilli();
req.endCreateTime = query.createdBefore().toEpochMilli();
}
return req;
}
/** 每页条数:默认 100、上限 200。 */
static int pageSize(int requested) {
if (requested <= 0) {
return 100;
}
return Math.min(requested, MAX_PAGE_SIZE);
}
/** 游标是字符串化的页码(从 1 开始)。 */
static int pageNumber(String cursor) {
if (cursor == null || cursor.trim().isEmpty()) {
return 1;
}
try {
int v = Integer.parseInt(cursor.trim());
return v > 0 ? v : 1;
} catch (NumberFormatException e) {
return 1;
}
}
/** 响应 → 分页结果。 */
public static Page<ProductInfo> toPage(EdayunProductQueryDtos.ListProductResponse response,
int currentPage, int pageSize) {
if (response == null || response.rows == null || response.rows.isEmpty()) {
return Page.empty();
}
List<ProductInfo> out = new ArrayList<ProductInfo>(response.rows.size());
for (EdayunProductQueryDtos.ProductRow row : response.rows) {
ProductInfo info = toInfo(row);
if (info != null) {
out.add(info);
}
}
return Page.of(out, nextCursor(response.total, currentPage, pageSize, out.size()));
}
/** 有下一页时返回下一页页码;优先用 {@code total}(总行数)。 */
static String nextCursor(Long total, int currentPage, int pageSize, int fetched) {
boolean more = total != null
? (long) currentPage * pageSize < total
: fetched >= pageSize;
return more ? String.valueOf(currentPage + 1) : null;
}
/**
* 一行 → 统一商品资料。
*
* <p>尺寸取<b>实际</b>({@code length/width/height/weight}),缺失才回落
* 预报值({@code forecast*})——查询商品资料的目的就是拿到仓方当前存的值。</p>
*/
static ProductInfo toInfo(EdayunProductQueryDtos.ProductRow row) {
if (row == null || row.skuCode == null || row.skuCode.trim().isEmpty()) {
return null;
}
ProductInfo.Builder b = ProductInfo.builder()
.sourceProvider(WarehouseProvider.EDAYUN)
.providerSku(row.skuCode.trim())
.providerProductId(trimToNull(row.skuId))
.barcode(trimToNull(row.barcode))
.name(trimToNull(row.skuName))
.nameEn(trimToNull(row.skuNameEn))
.lengthCm(numberOf(row.length, row.forecastLength))
.widthCm(numberOf(row.width, row.forecastWidth))
.heightCm(numberOf(row.height, row.forecastHeight))
.weightGrams(numberOf(row.weight, row.forecastWeight))
.remark(trimToNull(row.remark))
.createdAt(instantOf(row.createTime));
b.extraBarcode(row.extraBarcode1);
b.extraBarcode(row.extraBarcode2);
b.extraBarcode(row.extraBarcode3);
return b.build();
}
/** 优先实际值,缺失回落预报值;都缺为 0。 */
private static double numberOf(Double actual, Double forecast) {
if (actual != null) {
return actual;
}
return forecast == null ? 0 : forecast;
}
private static Instant instantOf(Long millis) {
return millis == null || millis <= 0 ? null : Instant.ofEpochMilli(millis);
}
private static String trimToNull(String v) {
return v == null || v.trim().isEmpty() ? null : v.trim();
}
}

96
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunProductQueryDtos.java

@ -0,0 +1,96 @@ @@ -0,0 +1,96 @@
package common.ecommerce.edayun.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 易达云报文结构:批量查询产品分页
* ({@code POST /webApi/skuInfo/v1/listProductPage})。
*
* <p>一个文件对应一个接口。查询条件全空时仓方默认按创建时间查<b>最近一个月</b>,
* 页码从 1 开始,单页最多 200 条。</p>
*/
public final class EdayunProductQueryDtos {
private EdayunProductQueryDtos() {
}
/** 查询请求。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ListProductRequest {
/** 产品状态:0 草稿 / 1 已发布。 */
public String status;
/** 每页条数,最多 200。 */
public Integer pageSize;
/** 页码,从 1 开始。 */
public Integer pageNum;
public String barcode;
/** SKU 编码,多个用英文逗号拼接,<b>一次最多 50 个</b>。 */
public String skuCode;
public String extraBarcode;
/** 中文品名。 */
public String skuName;
/** 创建时间窗(毫秒)。 */
public Long startCreateTime;
public Long endCreateTime;
/** 审核时间窗(毫秒)。 */
public Long startAuditTime;
public Long endAuditTime;
}
/** 查询响应。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ListProductResponse {
public Long total;
public List<ProductRow> rows;
public Integer code;
public String msg;
}
/** 一行商品。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ProductRow {
/** 创建时间(毫秒)。 */
public Long createTime;
public String remark;
/** 仓方商品 id。 */
public String skuId;
public String skuCode;
/** 中文品名。 */
public String skuName;
public String skuNameEn;
public String barcode;
/** 外部条码 1/2/3。 */
public String extraBarcode1;
public String extraBarcode2;
public String extraBarcode3;
/** 预报尺寸(cm)与重量;量级像克。 */
public Double forecastLength;
public Double forecastWidth;
public Double forecastHeight;
public Double forecastWeight;
/** 实际尺寸(cm)与重量;量级像克。 */
public Double length;
public Double width;
public Double height;
public Double weight;
/** 带电标志:<b>0 是 / 1 否</b>(同其它接口的反向布尔)。 */
public Integer electricFlag;
public Integer electricType;
public Integer electricPackage;
public Integer electricPower;
public String electricUrl;
/** 商品图片。 */
public String skuUrl;
/** 品牌标志:0 是 / 1 否。 */
public Integer brandFlag;
public String brandName;
}
}

215
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunProductQueryTest.java

@ -0,0 +1,215 @@ @@ -0,0 +1,215 @@
package common.ecommerce.edayun.adapter;
import common.ecommerce.edayun.dto.EdayunProductQueryDtos;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.testkit.RecordingTransport;
import common.ecommerce.shared.testkit.Responses;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.warehouse.sdk.WarehouseConnection;
import common.ecommerce.warehouse.sdk.WarehouseContext;
import org.junit.jupiter.api.Test;
import java.time.Clock;
import java.time.Instant;
import java.time.ZoneOffset;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* 商品查询({@code /webApi/skuInfo/v1/listProductPage})映射。
*
* <p>重点:SKU 是逗号拼接的单个字符串、<b>一次最多 50 个</b>、页码从 1 开始、
* 实际尺寸优先于预报尺寸。</p>
*/
class EdayunProductQueryTest {
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-17T00:00:00Z"), ZoneOffset.UTC);
private static WarehouseContext ctx() {
return WarehouseContext.of("EDY-WH", WarehouseProvider.EDAYUN, "2",
WarehouseConnection.of("https://test.example/openapi",
ChannelSecret.builder().appKey("k").appSecret("s")
.clientId("c").clientSecret("cs").build()),
"req-product-query", CLOCK);
}
private static RecordingTransport stub(String body) {
return RecordingTransport.create()
.route(common.ecommerce.edayun.EdayunConstants.PATH_TOKEN, req -> Responses.ok(
"{\"access_token\":\"T1\",\"token_type\":\"bearer\"}"))
.route(common.ecommerce.edayun.EdayunConstants.PATH_PRODUCT_LIST,
req -> Responses.ok(body));
}
// ------------------------------------------------------------ 请求
/** SKU 列表要拼成逗号分隔的单个字符串。 */
@Test
void skusAreJoinedWithComma() {
EdayunProductQueryDtos.ListProductRequest req =
EdayunProductQueryMapper.toRequest(
ProductQuery.builder().providerSku("A").providerSku("B").build(),
ZoneOffset.UTC, 1);
assertEquals("A,B", req.skuCode);
}
/** 一次最多 50 个 SKU,超了本地拒绝(不截断)。 */
@Test
void moreThan50SkusRejected() {
ProductQuery.Builder b = ProductQuery.builder();
for (int i = 0; i < 51; i++) {
b.providerSku("SKU-" + i);
}
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> EdayunProductQueryMapper.toRequest(b.build(), ZoneOffset.UTC, 1));
assertTrue(ex.getMessage().contains("at most 50"), ex.getMessage());
}
@Test
void pageSizeCappedAt200() {
assertEquals(200, EdayunProductQueryMapper.pageSize(1000));
assertEquals(100, EdayunProductQueryMapper.pageSize(0));
}
/** 页码从 1 开始。 */
@Test
void pageNumberStartsAtOne() {
assertEquals(1, EdayunProductQueryMapper.pageNumber(null));
assertEquals(1, EdayunProductQueryMapper.pageNumber("0"));
assertEquals(3, EdayunProductQueryMapper.pageNumber("3"));
}
/** 创建时间窗按毫秒下发;只给一端时不下发(避免半开区间语义不明)。 */
@Test
void createdRangeIsMillis() {
EdayunProductQueryDtos.ListProductRequest req = EdayunProductQueryMapper.toRequest(
ProductQuery.builder()
.createdAfter(Instant.parse("2026-01-01T00:00:00Z"))
.createdBefore(Instant.parse("2026-02-01T00:00:00Z"))
.build(), ZoneOffset.UTC, 1);
assertEquals(Long.valueOf(Instant.parse("2026-01-01T00:00:00Z").toEpochMilli()),
req.startCreateTime);
assertEquals(Long.valueOf(Instant.parse("2026-02-01T00:00:00Z").toEpochMilli()),
req.endCreateTime);
assertNull(EdayunProductQueryMapper.toRequest(
ProductQuery.builder().createdAfter(Instant.parse("2026-01-01T00:00:00Z")).build(),
ZoneOffset.UTC, 1).startCreateTime);
}
// ------------------------------------------------------------ 响应
private static EdayunProductQueryDtos.ProductRow row() {
EdayunProductQueryDtos.ProductRow r = new EdayunProductQueryDtos.ProductRow();
r.skuCode = "ybtest";
r.skuId = "1001";
r.skuName = "苹果14";
r.skuNameEn = "iphone14";
r.barcode = "N94902313123";
r.extraBarcode1 = "E1";
r.extraBarcode3 = "E3";
r.length = 12.0;
r.width = 11.0;
r.height = 10.0;
r.weight = 600.0;
r.forecastLength = 99.0;
r.createTime = 1745473090263L;
return r;
}
/** 实际尺寸优先于预报尺寸。 */
@Test
void actualSizeWinsOverForecast() {
ProductInfo info = EdayunProductQueryMapper.toInfo(row());
assertEquals(12.0, info.lengthCm());
assertEquals(11.0, info.widthCm());
assertEquals(600.0, info.weightGrams());
assertEquals("ybtest", info.providerSku());
assertEquals("1001", info.providerProductId());
assertEquals(2, info.extraBarcodes().size());
assertEquals(WarehouseProvider.EDAYUN, info.sourceProvider());
assertEquals(Instant.ofEpochMilli(1745473090263L), info.createdAt());
}
/** 实际尺寸缺失才回落预报值。 */
@Test
void fallsBackToForecastSize() {
EdayunProductQueryDtos.ProductRow r = row();
r.length = null;
r.weight = null;
ProductInfo info = EdayunProductQueryMapper.toInfo(r);
assertEquals(99.0, info.lengthCm());
assertEquals(0.0, info.weightGrams());
}
/** 没有 SKU 的行跳过。 */
@Test
void rowsWithoutSkuAreSkipped() {
EdayunProductQueryDtos.ProductRow bad = row();
bad.skuCode = " ";
assertNull(EdayunProductQueryMapper.toInfo(bad));
assertNull(EdayunProductQueryMapper.toInfo(null));
}
/** 「查询无数据」是空结果,不抛异常(同轨迹接口的处理)。 */
@Test
void noDataYieldsEmptyPage() {
RecordingTransport transport = stub(
"{\"total\":0,\"rows\":null,\"code\":500,\"msg\":\"查询无数据\"}");
Page<ProductInfo> page = new EdayunAdapter(transport, new JacksonJsonCodec())
.query(ctx(), ProductQuery.builder().providerSku("NOPE").build());
assertTrue(page.items().isEmpty());
assertTrue(!page.hasMore());
}
/** 其它业务错误仍然抛。 */
@Test
void otherBusinessErrorsStillThrow() {
RecordingTransport transport = stub("{\"code\":500,\"msg\":\"系统异常\"}");
assertThrows(RuntimeException.class,
() -> new EdayunAdapter(transport, new JacksonJsonCodec())
.query(ctx(), ProductQuery.builder().build()));
}
@Test
void nextCursorUsesTotal() {
assertEquals("2", EdayunProductQueryMapper.nextCursor(250L, 1, 100, 100));
assertNull(EdayunProductQueryMapper.nextCursor(250L, 3, 100, 50));
// total 缺失时按满页判断
assertEquals("2", EdayunProductQueryMapper.nextCursor(null, 1, 100, 100));
}
@Test
void adapterQueriesProducts() {
RecordingTransport transport = stub("{\"total\":1,\"code\":200,\"msg\":\"成功\",\"rows\":[{"
+ "\"skuCode\":\"ybtest\",\"skuName\":\"苹果14\",\"length\":12,\"width\":11,"
+ "\"height\":10,\"weight\":600,\"createTime\":1745473090263}]}");
Page<ProductInfo> page = new EdayunAdapter(transport, new JacksonJsonCodec())
.query(ctx(), ProductQuery.builder().providerSku("ybtest").build());
assertEquals(1, page.size());
assertEquals("ybtest", page.items().get(0).providerSku());
String body = transport.lastDataRequest().body();
assertTrue(body.contains("\"skuCode\":\"ybtest\""), body);
assertTrue(body.contains("\"pageNum\":1"), body);
}
}

106
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/probe/EdayunProductQueryProbeTest.java

@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
package common.ecommerce.edayun.probe;
import common.ecommerce.edayun.EdayunConstants;
import common.ecommerce.edayun.adapter.EdayunAdapter;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.OkHttpTransport;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.support.Page;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.warehouse.sdk.WarehouseConnection;
import common.ecommerce.warehouse.sdk.WarehouseContext;
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.util.Arrays;
import java.util.UUID;
/**
* 商品查询联调探针:<b>只读</b>。
*
* <pre>
* # 只看报文(不联网)
* mvn -pl warehouse-sdk-edayun -DfailIfNoTests=false \
* -Dedayun.probe.productQuery=true -Dtest=EdayunProductQueryProbeTest test
*
* # 真查(只读)
* ... -Dedayun.probe.productQuery=true -Dedayun.probe.call=true \
* -Dedayun.probe.clientId=... -Dedayun.probe.clientSecret=... \
* -Dedayun.probe.appKey=... -Dedayun.probe.appSecret=... \
* [-Dedayun.probe.sku=ybtest] [-Dedayun.probe.days=30]
* </pre>
*/
@EnabledIfSystemProperty(named = "edayun.probe.productQuery", matches = "true")
class EdayunProductQueryProbeTest {
private static final String BASE_URL = opt("edayun.probe.baseUrl", EdayunConstants.PR_BASE_URL);
private static final String CLIENT_ID = System.getProperty("edayun.probe.clientId", "");
private static final String CLIENT_SECRET = System.getProperty("edayun.probe.clientSecret", "");
private static final String APP_KEY = System.getProperty("edayun.probe.appKey", "");
private static final String APP_SECRET = System.getProperty("edayun.probe.appSecret", "");
private static final String SKU = System.getProperty("edayun.probe.sku", "ybtest");
private static final int DAYS = Integer.getInteger("edayun.probe.days", 30);
private static final boolean CALL = Boolean.getBoolean("edayun.probe.call");
@Test
void probeProductQuery() {
ProductQuery query = ProductQuery.builder()
.providerSku(SKU)
.createdAfter(java.time.Instant.now().minus(java.time.Duration.ofDays(DAYS)))
.createdBefore(java.time.Instant.now())
.build();
System.out.println("\n================ edayun / POST "
+ EdayunConstants.PATH_PRODUCT_LIST + " ================");
System.out.println("[probe] baseUrl=" + BASE_URL + " sku=" + SKU + " days=" + DAYS);
Assumptions.assumeTrue(CALL, "dry-run:未加 -Dedayun.probe.call=true,不实际调用");
Assumptions.assumeTrue(!CLIENT_ID.trim().isEmpty() && !CLIENT_SECRET.trim().isEmpty()
&& !APP_KEY.trim().isEmpty() && !APP_SECRET.trim().isEmpty(),
"真查需要 -Dedayun.probe.clientId / clientSecret / appKey / appSecret");
try {
WarehouseContext ctx = WarehouseContext.of("EDY-PROBE", WarehouseProvider.EDAYUN, "2",
WarehouseConnection.of(BASE_URL,
ChannelSecret.builder()
.appKey(APP_KEY).appSecret(APP_SECRET)
.clientId(CLIENT_ID).clientSecret(CLIENT_SECRET)
.build()),
"probe-" + UUID.randomUUID(), Clock.systemUTC());
EdayunAdapter adapter = new EdayunAdapter(
new OkHttpTransport("common-ecommerce/1.0.0 (edayun-probe)", 10_000, 60_000),
new JacksonJsonCodec());
Page<ProductInfo> page = adapter.query(ctx, query);
System.out.println("[OK] rows=" + page.size() + " hasMore=" + page.hasMore()
+ " nextCursor=" + page.nextCursor());
for (ProductInfo p : page.items()) {
System.out.println(" " + p.providerSku() + " " + p.name()
+ " lwh=" + p.lengthCm() + "x" + p.widthCm() + "x" + p.heightCm()
+ " weight=" + p.weightGrams()
+ " barcode=" + p.barcode()
+ " createdAt=" + p.createdAt());
}
} catch (RuntimeException e) {
String msg = e.getMessage() == null ? e.getClass().getSimpleName() : e.getMessage();
System.out.println("[ERROR] " + e.getClass().getSimpleName() + ": "
+ (msg.length() <= 800 ? msg : msg.substring(0, 800) + "…"));
if (e instanceof ChannelException) {
ChannelException ce = (ChannelException) e;
System.out.println(" platformCode=" + ce.platformCode()
+ " retryable=" + ce.retryable());
}
}
}
private static String opt(String name, String fallback) {
String value = System.getProperty(name, "");
String trimmed = value == null ? "" : value.trim();
return trimmed.isEmpty() ? fallback : trimmed;
}
}

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

@ -26,6 +26,9 @@ public final class YqnConstants { @@ -26,6 +26,9 @@ public final class YqnConstants {
/** 商品创建 / 编辑(V1 推荐版)。 */
public static final String PATH_PRODUCT_SAVE = "/v1/product/save";
/** 批量查询 SKU 分页(API 113)。页码从 0 开始。 */
public static final String PATH_PRODUCT_FIND_PAGE = "/v1/product/findPage";
/** 创建销售订单(API 123)。 */
public static final String PATH_ORDER_CREATE = "/v1/saleOrder/create";
/** 订单详情(API 128):按来源单号查完整订单。 */

29
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java

@ -13,6 +13,7 @@ import common.ecommerce.yqn.dto.YqnInventoryDtos; @@ -13,6 +13,7 @@ import common.ecommerce.yqn.dto.YqnInventoryDtos;
import common.ecommerce.yqn.dto.YqnLogisticsProductDtos;
import common.ecommerce.yqn.dto.YqnOrderDetailDtos;
import common.ecommerce.yqn.dto.YqnProductDtos;
import common.ecommerce.yqn.dto.YqnProductQueryDtos;
import common.ecommerce.yqn.dto.YqnReturnProcessDtos;
import common.ecommerce.yqn.dto.YqnSaleReturnPlanDtos;
import common.ecommerce.yqn.dto.YqnSkuLabelDtos;
@ -170,6 +171,34 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -170,6 +171,34 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
json.stringAt(raw, "message"));
}
/**
* 批量查询仓侧商品资料(API 113,{@code /v1/product/findPage})。
*
* <p>入参 SKU 是<b>仓侧 SKU</b>;运去哪这个接口没有条码 / 时间窗过滤,
* 传了要本地拒绝而不是静默忽略。</p>
*
* <p>页码从 0 开始——游标就是页码字符串,不做 ±1 换算。</p>
*/
@Override
public common.ecommerce.shared.support.Page<
common.ecommerce.warehouse.model.ProductInfo> query(
WarehouseContext ctx, common.ecommerce.warehouse.model.ProductQuery query) {
if (query.barcode() != null) {
throw new IllegalArgumentException(
"yqn product query does not support barcode filter");
}
if (query.hasCreatedRange()) {
throw new IllegalArgumentException(
"yqn product query does not support created time range");
}
YqnProductQueryDtos.FindPageRequest body = YqnProductQueryMapper.toRequest(query);
String raw = execute(ctx, YqnConstants.PATH_PRODUCT_FIND_PAGE, body,
"warehouse.product.query");
YqnProductQueryDtos.FindPageResponse resp =
json.fromJson(raw, YqnProductQueryDtos.FindPageResponse.class);
return YqnProductQueryMapper.toPage(resp);
}
// ------------------------------------------------------------------ 出库
@Override

175
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnProductQueryMapper.java

@ -0,0 +1,175 @@ @@ -0,0 +1,175 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.Page;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.yqn.dto.YqnProductQueryDtos;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 运去哪商品查询映射(API 113,{@code /v1/product/findPage})。
*
* <p><b>页码从 0 开始</b>——统一模型的游标语义是「下一页页码」,
* 这里用字符串页码原样透传,不做 ±1 换算,免得调用方和仓方口径对不上。</p>
*/
public final class YqnProductQueryMapper {
/** 单页上限(文档:默认 100、最大 100)。 */
static final int MAX_PAGE_SIZE = 100;
/** 一次最多查多少个 SKU(文档:最大 100)。 */
static final int MAX_SKUS = 100;
private YqnProductQueryMapper() {
}
/** 统一查询条件 → 仓方请求。 */
public static YqnProductQueryDtos.FindPageRequest toRequest(ProductQuery query) {
YqnProductQueryDtos.FindPageRequest req = new YqnProductQueryDtos.FindPageRequest();
if (!query.providerSkus().isEmpty()) {
if (query.providerSkus().size() > MAX_SKUS) {
throw new IllegalArgumentException(
"yqn product query accepts at most " + MAX_SKUS + " skus, got "
+ query.providerSkus().size());
}
req.skuList = new ArrayList<String>(query.providerSkus());
}
req.pageSize = pageSize(query.pageSize());
req.pageNum = pageNum(query.cursor());
return req;
}
/** 每页条数:默认 100、上限 100。 */
static int pageSize(int requested) {
if (requested <= 0) {
return MAX_PAGE_SIZE;
}
return Math.min(requested, MAX_PAGE_SIZE);
}
/** 游标 → 页码;<b>从 0 开始</b>,空游标即第 0 页。 */
static int pageNum(String cursor) {
if (cursor == null || cursor.trim().isEmpty()) {
return 0;
}
try {
int v = Integer.parseInt(cursor.trim());
return Math.max(v, 0);
} catch (NumberFormatException e) {
return 0;
}
}
/** 响应 → 分页结果。 */
public static Page<ProductInfo> toPage(YqnProductQueryDtos.FindPageResponse response) {
if (response == null || response.data == null
|| response.data.content == null || response.data.content.isEmpty()) {
return Page.empty();
}
List<ProductInfo> out = new ArrayList<ProductInfo>(response.data.content.size());
for (YqnProductQueryDtos.ProductRow row : response.data.content) {
ProductInfo info = toInfo(row);
if (info != null) {
out.add(info);
}
}
return Page.of(out, nextCursor(response.data));
}
/**
* 下一页游标。
*
* <p>优先用 {@code last}(仓方明确给了是否末页);缺失时用
* {@code number+1 < totalPages} 推断。两者都给不出时按「本页是否满页」兜底。</p>
*/
static String nextCursor(YqnProductQueryDtos.ProductPage page) {
if (page == null) {
return null;
}
if (page.last != null) {
if (page.last) {
return null;
}
int current = page.number == null ? 0 : page.number;
return String.valueOf(current + 1);
}
if (page.number != null && page.totalPages != null) {
return page.number + 1 < page.totalPages
? String.valueOf(page.number + 1) : null;
}
if (page.size != null && page.numberOfElements != null) {
return page.numberOfElements < page.size
? null : String.valueOf((page.number == null ? 0 : page.number) + 1);
}
return null;
}
/** 一行 → 统一商品资料;没有 SKU 的行跳过。 */
static ProductInfo toInfo(YqnProductQueryDtos.ProductRow row) {
if (row == null || row.sku == null || row.sku.trim().isEmpty()) {
return null;
}
ProductInfo.Builder b = ProductInfo.builder()
.sourceProvider(WarehouseProvider.YQN)
.providerSku(row.sku.trim())
.customItemNo(trimToNull(row.customItemNo))
.barcode(trimToNull(row.upc))
.name(trimToNull(row.name))
.nameEn(trimToNull(row.nameEn))
.description(trimToNull(row.description))
// 文档:1 成品 / 2 配件 / 3 耗材;未给保持 -1
.productType(row.productType == null ? -1 : row.productType)
.lengthCm(numberOf(row.length))
.widthCm(numberOf(row.width))
.heightCm(numberOf(row.height))
.weightGrams(numberOf(row.weight))
.itemLengthCm(row.itemLength)
.itemWidthCm(row.itemWidth)
.itemHeightCm(row.itemHeight)
.packedQuantity(row.packedQty)
.packedLengthCm(row.packedLength)
.packedWidthCm(row.packedWidth)
.packedHeightCm(row.packedHeight)
.packedWeightGrams(row.packedWeight)
.requireSn(flagOf(row.isRequireSn))
.remark(trimToNull(row.remark));
// 成本:文档标 integer,但货币是另一列;没有币种时不造 Money
if (row.cost != null && trimToNull(row.currency) != null) {
b.cost(Money.of(java.math.BigDecimal.valueOf(row.cost), row.currency.trim()));
}
return b.build();
}
/**
* 文档把 {@code isRequireSn} 标成 string,真机可能是数字。
* 统一按「是不是 1 / "1" / true」判,认不出返回 null(不猜)。
*/
static Boolean flagOf(String raw) {
if (raw == null) {
return null;
}
String v = raw.trim();
if ("1".equals(v) || "true".equalsIgnoreCase(v) || "Y".equalsIgnoreCase(v)) {
return Boolean.TRUE;
}
if ("0".equals(v) || "false".equalsIgnoreCase(v) || "N".equalsIgnoreCase(v)) {
return Boolean.FALSE;
}
return null;
}
private static double numberOf(Double v) {
return v == null ? 0 : v;
}
private static String trimToNull(String v) {
return v == null || v.trim().isEmpty() ? null : v.trim();
}
}

112
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnProductQueryDtos.java

@ -0,0 +1,112 @@ @@ -0,0 +1,112 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:批量查询 SKU 分页(API 113,{@code /v1/product/findPage})。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构。</p>
*
* <p><b>页码从 0 开始</b>(文档:「起始页为从0开始」),与其它分页接口不同。
* {@code pageSize} 默认 100、最大 100。</p>
*/
public final class YqnProductQueryDtos {
private YqnProductQueryDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class FindPageRequest {
/** 仓侧 SKU 列表,最大 100 个。 */
public List<String> skuList;
/** 每页大小,默认 100、最大 100。 */
public Integer pageSize;
/** 页码,<b>从 0 开始</b>。 */
public Integer pageNum;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class FindPageResponse {
public Integer code;
public String message;
public Integer statusCode;
public Integer status;
public ProductPage data;
}
/** Spring Data 风格的分页载荷。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ProductPage {
public Pageable pageable;
public Integer totalElements;
public Integer totalPages;
public Boolean last;
public Boolean first;
public Integer numberOfElements;
public Integer size;
public Integer number;
public Boolean empty;
public List<ProductRow> content;
}
/** 分页元信息(只取用得到的几个)。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class Pageable {
public Integer pageNumber;
public Integer pageSize;
public Integer offset;
public Boolean paged;
public Boolean unpaged;
}
/** 一行商品。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ProductRow {
public String sku;
public String customItemNo;
public String upc;
/** 1 成品 / 2 配件 / 3 耗材。 */
public Integer productType;
public String name;
public String nameEn;
public String description;
/** 整箱尺寸(cm)与重量(g)。 */
public Double length;
public Double width;
public Double height;
public Double weight;
/** 单品尺寸(cm)。 */
public Double itemLength;
public Double itemWidth;
public Double itemHeight;
/** 装箱数量 / 外箱尺寸重量。 */
public Integer packedQty;
public Double packedLength;
public Double packedWidth;
public Double packedHeight;
public Double packedWeight;
public Double cost;
public String currency;
public String remark;
/** 是否需要 SN;文档标 string({@code "0"} / {@code "1"})。 */
public String isRequireSn;
/** 商品形态。 */
public Integer saleType;
public String parentErpsku;
public Integer standardQuantity;
public String customName;
public String customNameEn;
/** 是否启用。 */
public Integer enable;
}
}

190
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnProductQueryTest.java

@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.testkit.RecordingTransport;
import common.ecommerce.shared.testkit.Responses;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.ProductInfo;
import common.ecommerce.warehouse.model.ProductQuery;
import common.ecommerce.warehouse.sdk.WarehouseConnection;
import common.ecommerce.warehouse.sdk.WarehouseContext;
import common.ecommerce.yqn.YqnConstants;
import org.junit.jupiter.api.Test;
import java.time.Clock;
import java.time.Instant;
import java.time.ZoneOffset;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* 商品查询(API 113,{@code /v1/product/findPage})映射。
*
* <p>重点:<b>页码从 0 开始</b>、单页上限 100、{@code last} 优先判断翻页。</p>
*/
class YqnProductQueryTest {
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-17T00:00:00Z"), ZoneOffset.UTC);
private static WarehouseContext ctx() {
return WarehouseContext.of("YQN-WH", WarehouseProvider.YQN, "RF_NY_US",
WarehouseConnection.of(YqnConstants.PR_BASE_URL,
ChannelSecret.builder().appSecret("key-1").build()),
"req-product-query", CLOCK);
}
private static RecordingTransport stub(String body) {
return RecordingTransport.create()
.route(YqnConstants.PATH_PRODUCT_FIND_PAGE, req -> Responses.ok(body));
}
// ------------------------------------------------------------ 请求
/** 游标为空 → 第 0 页(不是第 1 页)。 */
@Test
void emptyCursorMeansPageZero() {
assertEquals(0, YqnProductQueryMapper.pageNum(null));
assertEquals(0, YqnProductQueryMapper.pageNum(" "));
assertEquals(0, YqnProductQueryMapper.pageNum("abc"));
assertEquals(3, YqnProductQueryMapper.pageNum("3"));
// 负数归 0
assertEquals(0, YqnProductQueryMapper.pageNum("-1"));
}
/** 单页上限 100。 */
@Test
void pageSizeCappedAt100() {
assertEquals(100, YqnProductQueryMapper.pageSize(0));
assertEquals(100, YqnProductQueryMapper.pageSize(500));
assertEquals(50, YqnProductQueryMapper.pageSize(50));
}
@Test
void mapsSkusAndPaging() {
common.ecommerce.yqn.dto.YqnProductQueryDtos.FindPageRequest req =
YqnProductQueryMapper.toRequest(
ProductQuery.builder().providerSku("SKU-1").providerSku("SKU-2")
.pageSize(20).cursor("2").build());
assertEquals(java.util.Arrays.asList("SKU-1", "SKU-2"), req.skuList);
assertEquals(Integer.valueOf(20), req.pageSize);
assertEquals(Integer.valueOf(2), req.pageNum);
}
@Test
void moreThan100SkusRejected() {
ProductQuery.Builder b = ProductQuery.builder();
for (int i = 0; i < 101; i++) {
b.providerSku("SKU-" + i);
}
assertThrows(IllegalArgumentException.class, () -> b.build());
}
/** 运去哪这个接口没有条码 / 时间窗过滤,传了要本地拒绝。 */
@Test
void unsupportedFiltersAreRejected() {
assertThrows(IllegalArgumentException.class,
() -> new YqnAdapter(stub("{}"), new JacksonJsonCodec()).query(ctx(),
ProductQuery.builder().barcode("UPC1").build()));
assertThrows(IllegalArgumentException.class,
() -> new YqnAdapter(stub("{}"), new JacksonJsonCodec()).query(ctx(),
ProductQuery.builder()
.createdAfter(Instant.parse("2026-01-01T00:00:00Z"))
.createdBefore(Instant.parse("2026-02-01T00:00:00Z"))
.build()));
}
// ------------------------------------------------------------ 响应
private static String pageBody(boolean last, int number, Integer totalPages) {
return "{\"code\":200,\"message\":\"ok\",\"data\":{"
+ "\"pageable\":{\"pageNumber\":" + number + ",\"pageSize\":100},"
+ "\"numberOfElements\":1,\"size\":100,\"number\":" + number + ","
+ "\"last\":" + last + ","
+ (totalPages == null ? "" : "\"totalPages\":" + totalPages + ",")
+ "\"content\":[{\"sku\":\"SKU-1\",\"name\":\"商品1\",\"nameEn\":\"P1\","
+ "\"upc\":\"UPC1\",\"productType\":1,\"length\":10,\"width\":8,\"height\":6,"
+ "\"weight\":500,\"packedQty\":12,\"isRequireSn\":\"0\","
+ "\"cost\":9.5,\"currency\":\"USD\",\"enable\":1}]}}";
}
@Test
void mapsRow() {
Page<ProductInfo> page = YqnProductQueryMapper.toPage(
new JacksonJsonCodec().fromJson(pageBody(true, 0, null),
common.ecommerce.yqn.dto.YqnProductQueryDtos.FindPageResponse.class));
assertEquals(1, page.size());
ProductInfo p = page.items().get(0);
assertEquals("SKU-1", p.providerSku());
assertEquals("商品1", p.name());
assertEquals("UPC1", p.barcode());
assertEquals(1, p.productType());
assertEquals(10.0, p.lengthCm());
assertEquals(500.0, p.weightGrams());
assertEquals(Integer.valueOf(12), p.packedQuantity());
assertEquals(Boolean.FALSE, p.requireSn());
assertEquals(WarehouseProvider.YQN, p.sourceProvider());
// 成本带币种才成 Money
assertEquals(0, new java.math.BigDecimal("9.5").compareTo(p.cost().amount()));
assertEquals("USD", p.cost().currencyCode());
assertFalse(page.hasMore());
}
/** {@code last=false} → 游标 = number + 1。 */
@Test
void nextCursorUsesLast() {
assertEquals("1", YqnProductQueryMapper.nextCursor(page(0, false, null)));
assertNull(YqnProductQueryMapper.nextCursor(page(3, true, null)));
}
/** {@code last} 缺失时用 number + 1 < totalPages 推断。 */
@Test
void nextCursorFallsBackToTotalPages() {
assertEquals("2", YqnProductQueryMapper.nextCursor(page(1, null, 3)));
assertNull(YqnProductQueryMapper.nextCursor(page(2, null, 3)));
}
private static common.ecommerce.yqn.dto.YqnProductQueryDtos.ProductPage page(
int number, Boolean last, Integer totalPages) {
common.ecommerce.yqn.dto.YqnProductQueryDtos.ProductPage p =
new common.ecommerce.yqn.dto.YqnProductQueryDtos.ProductPage();
p.number = number;
p.last = last;
p.totalPages = totalPages;
p.size = 100;
p.numberOfElements = 100;
return p;
}
/** 没有 SKU 的行跳过,不整页失败。 */
@Test
void rowsWithoutSkuAreSkipped() {
common.ecommerce.yqn.dto.YqnProductQueryDtos.ProductRow bad =
new common.ecommerce.yqn.dto.YqnProductQueryDtos.ProductRow();
bad.sku = " ";
assertNull(YqnProductQueryMapper.toInfo(bad));
assertNull(YqnProductQueryMapper.toInfo(null));
}
@Test
void adapterQueriesProducts() {
RecordingTransport transport = stub(pageBody(true, 0, null));
Page<ProductInfo> page = new YqnAdapter(transport, new JacksonJsonCodec())
.query(ctx(), ProductQuery.builder().providerSku("SKU-1").build());
assertEquals(1, page.size());
String body = transport.lastDataRequest().body();
assertTrue(body.contains("\"skuList\":[\"SKU-1\"]"), body);
// 首页必须是 pageNum=0
assertTrue(body.contains("\"pageNum\":0"), body);
}
}

33
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/probe/YqnReadOnlyProbeTest.java

@ -75,6 +75,39 @@ class YqnReadOnlyProbeTest { @@ -75,6 +75,39 @@ class YqnReadOnlyProbeTest {
});
}
/**
* 商品查询(API 113)。
*
* <p>不传 {@code skuList} 时仓方返回全量第一页——正好用来验「页码从 0 开始」。
* 用 {@code -Dyqn.probe.skuList=A,B} 可以顺带验按 SKU 过滤。</p>
*/
@Test
void probeProductQuery() {
assumeToken();
run("POST /v1/product/findPage", () -> {
String raw = System.getProperty("yqn.probe.skuList", "");
common.ecommerce.warehouse.model.ProductQuery.Builder q =
common.ecommerce.warehouse.model.ProductQuery.builder().pageSize(5);
if (!raw.trim().isEmpty()) {
q.providerSkus(java.util.Arrays.asList(raw.split(",")));
}
common.ecommerce.shared.support.Page<
common.ecommerce.warehouse.model.ProductInfo> page =
adapter().query(ctx(), q.build());
System.out.println("[products] 本页 " + page.size()
+ " hasMore=" + page.hasMore() + " nextCursor=" + page.nextCursor());
for (int i = 0; i < Math.min(page.size(), 3); i++) {
common.ecommerce.warehouse.model.ProductInfo p = page.items().get(i);
System.out.println(" [" + i + "] sku=" + p.providerSku()
+ " name=" + p.name()
+ " lwh=" + p.lengthCm() + "x" + p.widthCm() + "x" + p.heightCm()
+ " weight=" + p.weightGrams()
+ " packedQty=" + p.packedQuantity()
+ " productType=" + p.productType());
}
});
}
/** 物流产品:验证「GET 但参数写在 query」这条路是否被仓方接受。 */
@Test
void probeLogisticsProducts() {

Loading…
Cancel
Save