Browse Source

feat(edayun): 对接查询出库单与查询面单

两个接口:
- POST /webApi/order/v1/getOrderInfo → OutboundOrder
- POST /webApi/order/v1/getOrderLabel → List<PackageResult>(含 labelRef)

enums/EdayunOrderStatus:文档给了 24 个状态,按「宿主是否需要区分」折叠:
- ReadyToShip → SUBMITTED,Shipment → PICKING
- Shipped / Online / Delivered / Returns → SHIPPED(文档定义的「已发货」)
- Cancelled / InterceptSuccess → CANCELLED(文档定义的「已取消」)
- 其余 19 个异常类 → EXCEPTION,具体原因在 errorMsg / rawStatus

精确匹配不做子串:Shipment(发货中)不能因为含 Ship 就判成已发货。

adapter/EdayunOrderQueryMapper:
- 订单详情映射:poNumber→来源单号、orderNo→仓侧单号;毫秒时间戳;
  SN 按 SKU 汇总;包裹 fileUrl 转附件;0/1 旗标 null 保持 null
- 面单映射:trackingNo 与 labels 按逗号位置一一对应到 PackageResult
- 地址优先取二字码(destProvince),全称兜底

适配器 get / packages 已实现;query / cancel / checkCancel 仍显式不支持。

测试 15 个(状态映射、地址口径、SN、旗标 null、多包裹对应、空面单)。

只跑 edayun 模块:56 个测试全绿。

Co-Authored-By: Claude <noreply@anthropic.com>
master
chenchuchuan 1 week ago
parent
commit
03f4773cb8
  1. 54
      docs-warehouse/edayun/README.md
  2. 37
      docs-warehouse/edayun/TODO.md
  3. 6
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/EdayunConstants.java
  4. 62
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java
  5. 296
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderQueryMapper.java
  6. 240
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunGetOrderDtos.java
  7. 47
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunGetOrderLabelDtos.java
  8. 141
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/enums/EdayunOrderStatus.java
  9. 23
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunAdapterTest.java
  10. 248
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderQueryTest.java

54
docs-warehouse/edayun/README.md

@ -9,6 +9,8 @@
| 获取 token | ✅ 已对接(`POST /oauth/token`) | | 获取 token | ✅ 已对接(`POST /oauth/token`) |
| 创建产品 | ✅ 已对接(`POST /webApi/skuInfo/v1/createProduct`) | | 创建产品 | ✅ 已对接(`POST /webApi/skuInfo/v1/createProduct`) |
| 创建出库单 | ✅ 已对接(`POST /webApi/order/v1/createOrder`) | | 创建出库单 | ✅ 已对接(`POST /webApi/order/v1/createOrder`) |
| 查询出库单 | ✅ 已对接(`POST /webApi/order/v1/getOrderInfo`) |
| 查询面单 | ✅ 已对接(`POST /webApi/order/v1/getOrderLabel`) |
| 其它业务接口 | ⬜ 等文档 | | 其它业务接口 | ⬜ 等文档 |
| 回调 | ⬜ 等文档 | | 回调 | ⬜ 等文档 |
| 真机验证 | ⬜ 等测试环境 | | 真机验证 | ⬜ 等测试环境 |
@ -184,10 +186,58 @@ POST /webApi/order/v1/createOrder
保价(`is_insurance`)标准模型没有对应字段,暂不下发。 保价(`is_insurance`)标准模型没有对应字段,暂不下发。
## 查询出库单 / 面单
```
POST /webApi/order/v1/getOrderInfo → OutboundOrder
POST /webApi/order/v1/getOrderLabel → List<PackageResult>(含 labelRef)
```
两个接口都是 `orderNo`(仓侧单号)与 `poNumber`(我们的来源单号)**二选一**。
实现优先用 `outboundRequestNo` 当 `poNumber`,没有才用 `providerOrderId` 当 `orderNo`。
### 状态映射(24 个取值折叠)
文档给了 24 个状态,按「宿主是否需要区分」折叠:
| 类别 | 易达云取值 | 统一状态 |
|---|---|---|
| 待发货 | `ReadyToShip` | `SUBMITTED` |
| 发货中 | `Shipment` | `PICKING` |
| **已发货** | `Shipped` / `Online` / `Delivered` / `Returns` | `SHIPPED` |
| **已取消** | `Cancelled` / `InterceptSuccess` | `CANCELLED` |
| 异常(19 个) | `DistrError` / `NoCarrier` / `InvError` / `StockLack` … | `EXCEPTION` |
异常类全部归 `EXCEPTION`,**具体原因看 `exceptionCode()`(来自 `errorMsg`)与
`rawStatus`**。宿主对它们的处理都是「人工介入」,不需要 19 个细分状态。
注意 `Shipment`(发货中)不能因为含 `Ship` 就判成已发货——**精确匹配,不做子串**。
### 面单:多包裹按位置对应
```json
"trackingNo": "1Z111,1Z222",
"labels": "https://oss/1.png,https://oss/2.png"
```
一个包裹(trackingNo)对应一个面单 URL,按逗号位置一一匹配。
输出到 `PackageResult.trackingNumber()` 与 `PackageResult.labelRef()`。
### 地址:同时给了二字码和全称
`getOrderInfo` 的地址里两套都有:
| 字段 | 示例 |
|---|---|
| `destProvince` | `CA` |
| `destProvinceName` | `California` |
标准模型口径是**二字码**,所以优先取 `destProvince`,缺失才用全称。
### 本期未接的出库能力 ### 本期未接的出库能力
`get` / `query` / `cancel` / `packages` 都显式抛 `query` / `cancel` / `checkCancel` 显式抛 `WarehouseUnsupportedCapabilityException`
`WarehouseUnsupportedCapabilityException`——文档还没给这几个接口。 ——文档还没给这几个接口。
## 待确认(问易达云) ## 待确认(问易达云)

37
docs-warehouse/edayun/TODO.md

@ -0,0 +1,37 @@
# 易达云:待确认事项
接入过程中发现、需要业务或仓方确认的点。**先记下来,不阻塞接口对接。**
## 待仓方确认
| # | 问题 | 当前处理 | 影响 |
|---|---|---|---|
| 1 | **创建产品是否需要 `declarationInfoList` 的进口国** | 默认 `US` | 申报准确性 |
| 2 | `declarationType` 码值(0 出口 / 1 进口) | 按示例推断 | 申报方向可能反 |
| 3 | 业务接口能否用 `openApiAdminSecret` 免签 | 当前一律用 `appSecret` 算 MD5 | 若只有 token 接口免签,现在是正确的 |
| 4 | 创建产品同 SKU 重复调用的行为 | 按「创建」语义处理,无更新接口 | 重复建档会报错 |
| 5 | 出库单 `getOrderInfo` 的 `carrierInfoList` 是否总与追踪号一一对应 | 按数组原样映射 | 多包裹场景 |
## 待业务确认
| # | 问题 | 当前处理 | 影响 |
|---|---|---|---|
| 6 | **派送地址的州要全称(California)还是二字码(CA)** | 原样透传 | 所有出库单地址 |
| 7 | 统一模型缺的字段:带电 / 包材 / 物流包装 | 创建产品里硬编码为「不带」 | 带电商品无法正确申报 |
| 8 | 保价服务(`is_insurance`) | 未下发,标准模型无字段 | 保价订单 |
| 9 | `OutboundCommand` 没有 `carrierProductId`(易达云物流产品 id) | 未下发,走仓方默认分物流规则 | 指定物流产品 |
| 10 | `channelName` 从 `Platform` 枚举推(AMAZON_SC → Amazon) | 首段大写 | 非标准平台名可能对不上 |
## 已确认(不需要再问)
| 项 | 结论 |
|---|---|
| 测试基址 | `https://test.omniselling.com.cn/saas-service/openapi/microService` |
| 测试账号 | `openapi-test` / `123456` |
| token 接口响应 | 扁平结构,无 `code`,无有效期,`token_type=bearer` |
| token 请求头 | `POST /oauth/token` **不带** `token` 头 |
| 业务请求头 | `Authorization: Bearer <token>` + `appKey` + `timestamp` + `sign` |
| 签名算法 | `MD5(body + "." + appSecret)`,小写十六进制 |
| 时间戳单位 | 毫秒,5 分钟内有效 |
| 布尔标志 | **0 是 / 1 否**(与直觉相反) |
| 重量单位 | kg(我们的是 g,需换算) |

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

@ -39,6 +39,12 @@ public final class EdayunConstants {
/** 创建出库单({@code POST /webApi/order/v1/createOrder})。 */ /** 创建出库单({@code POST /webApi/order/v1/createOrder})。 */
public static final String PATH_ORDER_CREATE = "/webApi/order/v1/createOrder"; public static final String PATH_ORDER_CREATE = "/webApi/order/v1/createOrder";
/** 查询出库单信息({@code POST /webApi/order/v1/getOrderInfo})。 */
public static final String PATH_ORDER_GET = "/webApi/order/v1/getOrderInfo";
/** 查询出库单面单({@code POST /webApi/order/v1/getOrderLabel})。 */
public static final String PATH_ORDER_LABEL = "/webApi/order/v1/getOrderLabel";
/** 物流增值:签收服务。 */ /** 物流增值:签收服务。 */
public static final String ADD_SERVICE_SIGNATURE = "is_signature"; public static final String ADD_SERVICE_SIGNATURE = "is_signature";

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

@ -4,6 +4,8 @@ import common.ecommerce.edayun.EdayunConstants;
import common.ecommerce.edayun.auth.EdayunTokenClient; import common.ecommerce.edayun.auth.EdayunTokenClient;
import common.ecommerce.edayun.dto.EdayunCreateOrderDtos; import common.ecommerce.edayun.dto.EdayunCreateOrderDtos;
import common.ecommerce.edayun.dto.EdayunCreateProductDtos; import common.ecommerce.edayun.dto.EdayunCreateProductDtos;
import common.ecommerce.edayun.dto.EdayunGetOrderDtos;
import common.ecommerce.edayun.dto.EdayunGetOrderLabelDtos;
import common.ecommerce.edayun.http.EdayunRequestFactory; import common.ecommerce.edayun.http.EdayunRequestFactory;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpResponse;
@ -206,10 +208,36 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa
} }
} }
/** 查询 / 取消 / 包裹:本期未接,显式拒绝。 */ /**
* 查询出库单信息({@code POST /webApi/order/v1/getOrderInfo})。
*
* <p>{@code orderNo} 与 {@code poNumber} 二选一。我们优先用来源单号当
* {@code poNumber} 查(那是创建时下发的),没有来源单号才用仓侧单号。</p>
*/
@Override @Override
public OutboundOrder get(WarehouseContext ctx, OutboundRef ref) { public OutboundOrder get(WarehouseContext ctx, OutboundRef ref) {
throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.OUTBOUND); EdayunGetOrderDtos.GetOrderRequest body = new EdayunGetOrderDtos.GetOrderRequest();
if (hasText(ref.outboundRequestNo())) {
body.poNumber = ref.outboundRequestNo().trim();
} else if (hasText(ref.providerOrderId())) {
body.orderNo = ref.providerOrderId().trim();
} else {
throw new IllegalArgumentException(
"edayun needs outboundRequestNo (as poNumber) or providerOrderId (as orderNo)");
}
String bodyJson = json.toJson(body);
HttpResponse resp = send(ctx, EdayunConstants.PATH_ORDER_GET, bodyJson,
"warehouse.outbound.get");
EdayunGetOrderDtos.GetOrderResponse parsed =
json.fromJson(resp.body(), EdayunGetOrderDtos.GetOrderResponse.class);
requireSuccess(ctx, parsed == null ? null : parsed.code,
parsed == null ? null : parsed.msg, resp, "warehouse.outbound.get");
if (parsed.data == null) {
return null;
}
return EdayunOrderQueryMapper.toOrder(parsed.data, ctx.warehouseCode(),
ref.outboundRequestNo());
} }
@Override @Override
@ -227,9 +255,37 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa
throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.OUTBOUND); throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.OUTBOUND);
} }
/**
* 查面单({@code POST /webApi/order/v1/getOrderLabel})。
*
* <p>返回的 {@code labels} 与 {@code trackingNo} 都是逗号拼接、按位置对应;
* 一个包裹(trackingNo)对应一个面单 URL。</p>
*/
@Override @Override
public List<PackageResult> packages(WarehouseContext ctx, OutboundRef ref) { public List<PackageResult> packages(WarehouseContext ctx, OutboundRef ref) {
throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.OUTBOUND); EdayunGetOrderLabelDtos.GetLabelRequest body = new EdayunGetOrderLabelDtos.GetLabelRequest();
if (hasText(ref.outboundRequestNo())) {
body.poNumber = ref.outboundRequestNo().trim();
} else if (hasText(ref.providerOrderId())) {
body.orderNo = ref.providerOrderId().trim();
} else {
throw new IllegalArgumentException(
"edayun needs outboundRequestNo (as poNumber) or providerOrderId (as orderNo)");
}
String bodyJson = json.toJson(body);
HttpResponse resp = send(ctx, EdayunConstants.PATH_ORDER_LABEL, bodyJson,
"warehouse.outbound.packages");
EdayunGetOrderLabelDtos.GetLabelResponse parsed =
json.fromJson(resp.body(), EdayunGetOrderLabelDtos.GetLabelResponse.class);
requireSuccess(ctx, parsed == null ? null : parsed.code,
parsed == null ? null : parsed.msg, resp, "warehouse.outbound.packages");
return EdayunOrderQueryMapper.toPackages(parsed.data, ref.outboundRequestNo());
}
/** 原始响应是否为空串。 */
private static boolean hasText(String v) {
return v != null && !v.trim().isEmpty();
} }
// ------------------------------------------------------------------ internals // ------------------------------------------------------------------ internals

296
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderQueryMapper.java

@ -0,0 +1,296 @@
package common.ecommerce.edayun.adapter;
import common.ecommerce.edayun.dto.EdayunGetOrderDtos;
import common.ecommerce.edayun.dto.EdayunGetOrderLabelDtos;
import common.ecommerce.edayun.enums.EdayunOrderStatus;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.enums.LabelMode;
import common.ecommerce.warehouse.enums.OutboundStatus;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.OutboundLine;
import common.ecommerce.warehouse.model.OutboundOrder;
import common.ecommerce.warehouse.model.PackageResult;
import common.ecommerce.warehouse.model.SerialNumber;
import common.ecommerce.warehouse.model.ShipTo;
import common.ecommerce.warehouse.model.WarehouseAttachment;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 易达云出库单查询报文映射。
*
* <p>两个接口:</p>
* <ul>
* <li>{@code getOrderInfo} → {@link OutboundOrder}(含包裹、SN、地址、增值服务)</li>
* <li>{@code getOrderLabel} → 面单 URL 列表</li>
* </ul>
*
* <p>三处口径与创建侧对称:时间戳是毫秒、金额币种在顶层、异常原因在 {@code errorMsg}。</p>
*/
public final class EdayunOrderQueryMapper {
private EdayunOrderQueryMapper() {
}
/** 订单详情 → 统一出库单。 */
public static OutboundOrder toOrder(EdayunGetOrderDtos.OrderInfo info, String warehouseCode,
String requestedOrderNo) {
OutboundStatus status = EdayunOrderStatus.toCore(info.orderStatus);
List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> carriers = info.carrierInfoList;
OutboundOrder.Builder builder = OutboundOrder.builder()
.warehouseCode(firstNonBlank(info.warehouseCode, warehouseCode))
// poNumber 是我们下发的来源单号;orderNo 是仓侧的
.outboundRequestNo(firstNonBlank(info.poNumber, requestedOrderNo))
.providerOrderId(info.orderNo)
.orderRef(info.poNumber)
.status(status)
.rawStatus(info.orderStatus)
.carrier(firstNonBlank(info.carrierName, firstCarrierName(carriers)))
.trackingNumber(firstNonBlank(info.trackingNo, firstTracking(carriers)))
.carrierCode(firstNonBlank(info.carrierId, firstCarrierId(carriers)))
.currency(info.currency)
.requestedAt(instantOf(info.createTime, null))
.shippedAt(instantOf(null, info.shippedTime))
.shipTo(toShipTo(info.orderAddressVO))
.exceptionCode(hasText(info.errorMsg) ? info.errorMsg : null)
.estimatedShippingFee(moneyOrNull(info.estimatedCost, info.currency))
.insured(flagOf(info.orderAttribute == null ? null : info.orderAttribute.insuranceFlag))
.signatureRequired(flagOf(info.orderAttribute == null ? null
: info.orderAttribute.signatureFlag))
.sourceProvider(WarehouseProvider.EDAYUN);
builder.lines(toLines(info.productItemVOList));
for (SerialNumber sn : toSerialNumbers(info.productItemVOList)) {
builder.serialNumber(sn);
}
for (WarehouseAttachment att : toAttachments(carriers)) {
builder.attachment(att);
}
return builder.build();
}
/** 面单查询 → 包裹列表(一个包裹一个 tracker + 一个面单 URL)。 */
public static List<PackageResult> toPackages(EdayunGetOrderLabelDtos.LabelData data,
String outboundRequestNo) {
if (data == null || !hasText(data.trackingNo)) {
return Collections.emptyList();
}
List<String> trackings = split(data.trackingNo);
List<String> labels = split(data.labels);
List<PackageResult> out = new ArrayList<PackageResult>(trackings.size());
for (int i = 0; i < trackings.size(); i++) {
String tracking = trackings.get(i);
out.add(PackageResult.builder()
.packageId(hasText(tracking) ? tracking : "PKG-" + i)
.outboundRequestNo(firstNonBlank(data.poNumber, outboundRequestNo))
.trackingNumber(hasText(tracking) ? tracking : null)
.carrier(data.carrierName)
.carrierCode(data.carrierId)
// 多个 labels 与多个 trackingNo 按位置对应
.labelRef(i < labels.size() ? labels.get(i) : null)
.build());
}
return out;
}
/**
* 面单 URL 列表 → 附件。
*
* <p>与 {@code trackingNo} 按逗号位置对应;数量不一致时按索引匹配,多出来的忽略。</p>
*/
public static List<WarehouseAttachment> attachmentsOf(EdayunGetOrderLabelDtos.LabelData data) {
if (data == null) {
return Collections.emptyList();
}
List<String> trackings = split(data.trackingNo);
List<String> labels = split(data.labels);
List<WarehouseAttachment> out = new ArrayList<WarehouseAttachment>(labels.size());
for (int i = 0; i < labels.size(); i++) {
String url = labels.get(i);
if (!hasText(url)) {
continue;
}
out.add(WarehouseAttachment.builder()
.name(i < trackings.size() && hasText(trackings.get(i))
? trackings.get(i) : "label-" + i)
.type("ShippingLabel")
.url(url)
.build());
}
return out;
}
// ------------------------------------------------------------ 子结构
private static ShipTo toShipTo(EdayunGetOrderDtos.OrderInfo.OrderAddress a) {
if (a == null) {
return null;
}
return ShipTo.builder()
.name(a.buyerName)
.phone(a.buyerPhone)
.email(a.email)
.countryCode(firstNonBlank(a.destCountry, a.destCountryName))
// 易达云同时给了二字码与全称;优先二字码(标准模型口径)
.stateOrProvince(firstNonBlank(a.destProvince, a.destProvinceName))
.city(firstNonBlank(a.destCity, a.destCityName))
.addressLine1(a.destFirstAddress)
.addressLine2(a.destSecondAddress)
.postalCode(a.zipCode)
.build();
}
private static List<OutboundLine> toLines(List<EdayunGetOrderDtos.OrderInfo.ProductItem> items) {
if (items == null || items.isEmpty()) {
return Collections.emptyList();
}
List<OutboundLine> out = new ArrayList<OutboundLine>(items.size());
for (EdayunGetOrderDtos.OrderInfo.ProductItem item : items) {
if (!hasText(item.productSku)) {
continue;
}
out.add(OutboundLine.builder()
.lineNo(item.productSku)
.omsSku(item.productSku)
.providerSku(item.productSku)
.quantity(item.quantity == null ? 0 : item.quantity)
.declareValue(moneyOrNull(item.unitPrice, null))
.build());
}
return out;
}
/** 序列号:按 SKU 汇总。 */
private static List<SerialNumber> toSerialNumbers(
List<EdayunGetOrderDtos.OrderInfo.ProductItem> items) {
if (items == null || items.isEmpty()) {
return Collections.emptyList();
}
List<SerialNumber> out = new ArrayList<SerialNumber>();
for (EdayunGetOrderDtos.OrderInfo.ProductItem item : items) {
if (item.snCodeList == null) {
continue;
}
for (String sn : item.snCodeList) {
if (!hasText(sn)) {
continue;
}
out.add(SerialNumber.builder()
.providerSku(item.productSku)
.snCode(sn.trim())
.lineNo(item.productSku)
.build());
}
}
return out;
}
/** 包裹的面单地址 → 附件。 */
private static List<WarehouseAttachment> toAttachments(
List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> carriers) {
if (carriers == null || carriers.isEmpty()) {
return Collections.emptyList();
}
List<WarehouseAttachment> out = new ArrayList<WarehouseAttachment>();
for (EdayunGetOrderDtos.OrderInfo.CarrierInfo c : carriers) {
if (!hasText(c.fileUrl)) {
continue;
}
out.add(WarehouseAttachment.builder()
.name(firstNonBlank(c.fileName, c.trackingNo))
.type("ShippingLabel")
.url(c.fileUrl)
.packageNo(c.trackingNo)
.build());
}
return out;
}
private static String firstCarrierName(List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> list) {
return firstField(list, Field.NAME);
}
private static String firstCarrierId(List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> list) {
return firstField(list, Field.ID);
}
private static String firstTracking(List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> list) {
return firstField(list, Field.TRACKING);
}
private enum Field { NAME, ID, TRACKING }
private static String firstField(List<EdayunGetOrderDtos.OrderInfo.CarrierInfo> list, Field f) {
if (list == null) {
return null;
}
for (EdayunGetOrderDtos.OrderInfo.CarrierInfo c : list) {
String v = f == Field.NAME ? c.carrierName
: f == Field.ID ? c.carrierId : c.trackingNo;
if (hasText(v)) {
return v.trim();
}
}
return null;
}
// ------------------------------------------------------------ helpers
/** 易达云的毫秒时间戳字段有的是 number、有的是 string,统一转。 */
static Instant instantOf(String epochText, Long epochMillis) {
if (epochMillis != null && epochMillis > 0) {
return Instant.ofEpochMilli(epochMillis);
}
if (!hasText(epochText)) {
return null;
}
try {
long v = Long.parseLong(epochText.trim());
// 10 位按秒,13 位按毫秒
return epochText.trim().length() <= 10 ? Instant.ofEpochSecond(v) : Instant.ofEpochMilli(v);
} catch (NumberFormatException e) {
return null;
}
}
/** 0/1 旗标;null 保持 null(「仓方未给」不等于「否」)。 */
static Boolean flagOf(Integer flag) {
return flag == null ? null : flag != 0;
}
private static Money moneyOrNull(Double amount, String currency) {
if (amount == null) {
return null;
}
return Money.of(java.math.BigDecimal.valueOf(amount),
hasText(currency) ? currency.trim() : "USD");
}
private static List<String> split(String csv) {
if (!hasText(csv)) {
return Collections.emptyList();
}
String[] parts = csv.split(",");
List<String> out = new ArrayList<String>(parts.length);
for (String p : parts) {
out.add(p.trim());
}
return out;
}
private static String firstNonBlank(String a, String b) {
if (hasText(a)) {
return a.trim();
}
return hasText(b) ? b.trim() : null;
}
private static boolean hasText(String v) {
return v != null && !v.trim().isEmpty();
}
}

240
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunGetOrderDtos.java

@ -0,0 +1,240 @@
package common.ecommerce.edayun.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 易达云报文结构:查询出库单信息({@code POST /webApi/order/v1/getOrderInfo})。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构。</p>
*
* <p>{@code orderNo} 与 {@code poNumber} 二选一必填。</p>
*/
public final class EdayunGetOrderDtos {
private EdayunGetOrderDtos() {
}
/** 查询请求。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class GetOrderRequest {
/** EDA 订单号;与 {@link #poNumber} 二选一。 */
public String orderNo;
/** 平台单号(客户单号);与 {@link #orderNo} 二选一。 */
public String poNumber;
}
/** 查询响应。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class GetOrderResponse {
public Integer code;
public String msg;
public OrderInfo data;
/** 响应 id,排查用。 */
public String traceId;
}
/** 订单信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class OrderInfo {
/** EDA 订单号。 */
public String orderNo;
/** 平台单号。 */
public String poNumber;
/**
* 订单状态,字典 {@code oms_order_status}。
*
* <p>ReadyToShip / Shipment / Cancelled / Shipped / Online / Delivered / Returns /
* VerifyNotPass / DistrError / NoCarrier / NoMapping / ShipmentError / LabelError /
* InterceptProcessing / InterceptFailure / InterceptSuccess / ManualReview /
* InvError / BillLate / BalanceNotEnough / LogisticsVerificationFailed /
* UnableRequestTrackingNumber / StockException / StockLack</p>
*/
public String orderStatus;
/** 跟踪号回传状态:READY / UPLOADING / ERROR / COMPLETED。 */
public String trackingNoStatus;
public String warehouseId;
public String warehouseName;
public String warehouseCode;
public String carrierProductName;
public String carrierProductId;
public String channelAccountName;
public String channelAccountId;
/** 发货物流:0 海外仓物流 / 1 自选物流。 */
public Integer carrierType;
public String carrierName;
public String carrierId;
/** 跟踪号;多包裹用英文逗号拼接。 */
public String trackingNo;
/** 异常原因;状态异常时有值。 */
public String errorMsg;
public String currency;
public Double orderCost;
public Double estimatedCost;
public String channelName;
public String ebayTransactionId;
public String buyerId;
public String buyerAccountName;
/** 创建时间(毫秒时间戳,文档标为 string)。 */
public String createTime;
/** 最后修改时间(毫秒时间戳)。 */
public String updateTime;
public String remark;
/** 发货方式:0 快递 / 1 卡车。 */
public Integer deliveryType;
/** 物流增值:is_signature / is_insurance。 */
public List<String> addService;
/** 出库后的实际总费用。 */
public Double actualTotalFee;
public String actualTotalFeeCurrency;
public Long customerLogisticsAccountId;
/** 拦截成功时仓库是否已还货。 */
public Boolean hasGoodsReturned;
/** 最晚发货时间(毫秒)。 */
public Long promiseShipTime;
/** 发货时间(毫秒)。 */
public Long shippedTime;
/** 交货时间(毫秒)。 */
public Long expressDeliveryTime;
public String salesPlatformOrderNo;
public String sellerId;
/** 是否指令订单。 */
public Integer isInstructionOrder;
public List<InstructionAttach> instructionOrderAttachFileList;
public List<ProductItem> productItemVOList;
public List<AddServiceAttachFile> addServiceAttachFiles;
public OrderAddress orderAddressVO;
public OrderAttribute orderAttribute;
/** 包裹信息集合。 */
public List<CarrierInfo> carrierInfoList;
public List<OrderTag> orderTagList;
/** 指令订单附件。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InstructionAttach {
public String fileType;
public String filePath;
}
/** 商品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ProductItem {
public String orderNo;
public String productSku;
public String barcode;
public String productCnName;
public String productName;
public Integer quantity;
public Double unitPrice;
public String ebayItemId;
public String ebayTransactionId;
public Double length;
public Double width;
public Double height;
/** 文档标为 string。 */
public String weight;
public String attachment;
public String remark;
/** 采集到的序列号。 */
public List<String> snCodeList;
public String platformItemId;
public List<ValueAddedService> valueAddedServiceVOList;
}
/** 商品层面的增值服务。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ValueAddedService {
public Integer type;
public String fileUrl;
/** 文档标为 string。 */
public String isCoverOldLabel;
public String customizedInstructions;
}
/** 订单层面的增值服务附件。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class AddServiceAttachFile {
/** 文档标为 string。 */
public String objectType;
public Attribute attributeDTO;
/** 附件属性。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class Attribute {
public Integer boxPasteQuantity;
public List<String> fileUrl;
public Integer isCoverOldLabel;
public String customizedInstructions;
}
}
/** 收件地址。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class OrderAddress {
public String orderNo;
public String buyerName;
public String buyerPhone;
public String companyName;
public String zipCode;
/** 国家二字码。 */
public String destCountry;
public String destCountryName;
/** 州二字码。 */
public String destProvince;
/** 州全称。 */
public String destProvinceName;
public String destCity;
public String destCityName;
public String destDistrict;
public String destSubDistrict;
public String destFirstAddress;
public String destSecondAddress;
public String email;
public String houseNumber;
public String remark;
}
/** 订单属性。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class OrderAttribute {
public Integer signatureFlag;
public Integer insuranceFlag;
public Integer trackingNoFlag;
public Integer pickUpType;
public Boolean primeFlag;
}
/** 包裹信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CarrierInfo {
public String orderNo;
public Double lengthCm;
public Double widthCm;
public Double heightCm;
public Double weightG;
public String carrierId;
public String carrierName;
public String trackingNo;
/** 面单文件地址。 */
public String fileUrl;
public String fileName;
/** 预计提货时间(毫秒)。 */
public Long expPickupTimeSystem;
}
/** 订单标签。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class OrderTag {
public String tagCode;
public String tagName;
}
}
}

47
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunGetOrderLabelDtos.java

@ -0,0 +1,47 @@
package common.ecommerce.edayun.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
/**
* 易达云报文结构:查询出库单面单信息({@code POST /webApi/order/v1/getOrderLabel})。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构。</p>
*
* <p>{@code orderNo} 与 {@code poNumber} 二选一必填。</p>
*/
public final class EdayunGetOrderLabelDtos {
private EdayunGetOrderLabelDtos() {
}
/** 查询请求。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class GetLabelRequest {
/** EDA 订单号;与 {@link #poNumber} 二选一。 */
public String orderNo;
/** 平台单号(客户单号);与 {@link #orderNo} 二选一。 */
public String poNumber;
}
/** 查询响应。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class GetLabelResponse {
public Integer code;
public String msg;
public LabelData data;
public String traceId;
}
/** 面单信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class LabelData {
public String orderNo;
public String poNumber;
public String carrierName;
public String carrierId;
/** 跟踪号;多包裹用英文逗号拼接。 */
public String trackingNo;
/** 面单文件 URL;多个用英文逗号拼接,与 {@link #trackingNo} 一一对应。 */
public String labels;
}
}

141
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/enums/EdayunOrderStatus.java

@ -0,0 +1,141 @@
package common.ecommerce.edayun.enums;
import common.ecommerce.warehouse.enums.OutboundStatus;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
/**
* 易达云出库单状态({@code orderStatus},字典 {@code oms_order_status})。
*
* <p>文档给了 24 个取值,按「宿主是否需要区分」折叠到统一的 {@link OutboundStatus}:</p>
*
* <table>
* <tr><th>易达云</th><th>含义</th><th>统一状态</th></tr>
* <tr><td>ReadyToShip</td><td>待发货</td><td>SUBMITTED</td></tr>
* <tr><td>Shipment</td><td>发货中</td><td>PICKING</td></tr>
* <tr><td>Shipped</td><td>已出库</td><td>SHIPPED</td></tr>
* <tr><td>Online</td><td>已上网</td><td>SHIPPED</td></tr>
* <tr><td>Delivered</td><td>已妥投</td><td>SHIPPED</td></tr>
* <tr><td>Returns</td><td>退件</td><td>SHIPPED</td></tr>
* <tr><td>Cancelled</td><td>已取消</td><td>CANCELLED</td></tr>
* <tr><td>InterceptSuccess</td><td>拦截成功</td><td>CANCELLED</td></tr>
* <tr><td>其余异常类</td><td>分仓失败 / 缺货 / 面单异常等</td><td>EXCEPTION</td></tr>
* </table>
*
* <p><b>为什么异常类都归 EXCEPTION</b>:宿主对它们的处理都是「人工介入」,
* 具体原因在 {@code errorMsg} 与 {@code rawStatus} 里,不需要 19 个细分状态。
* 若将来业务要按原因分流,再加枚举值不迟。</p>
*/
public enum EdayunOrderStatus {
/** 待发货。 */
READY_TO_SHIP("ReadyToShip", OutboundStatus.SUBMITTED),
/** 发货中。 */
SHIPMENT("Shipment", OutboundStatus.PICKING),
/** 已出库。 */
SHIPPED("Shipped", OutboundStatus.SHIPPED),
/** 已上网。 */
ONLINE("Online", OutboundStatus.SHIPPED),
/** 已妥投。 */
DELIVERED("Delivered", OutboundStatus.SHIPPED),
/** 退件。 */
RETURNS("Returns", OutboundStatus.SHIPPED),
/** 已取消。 */
CANCELLED("Cancelled", OutboundStatus.CANCELLED),
/** 拦截成功。 */
INTERCEPT_SUCCESS("InterceptSuccess", OutboundStatus.CANCELLED),
/** 拦截中。 */
INTERCEPT_PROCESSING("InterceptProcessing", OutboundStatus.EXCEPTION),
/** 拦截失败。 */
INTERCEPT_FAILURE("InterceptFailure", OutboundStatus.EXCEPTION),
/** 信息异常。 */
VERIFY_NOT_PASS("VerifyNotPass", OutboundStatus.EXCEPTION),
/** 分仓失败。 */
DISTR_ERROR("DistrError", OutboundStatus.EXCEPTION),
/** 分物流失败。 */
NO_CARRIER("NoCarrier", OutboundStatus.EXCEPTION),
/** 产品未关联。 */
NO_MAPPING("NoMapping", OutboundStatus.EXCEPTION),
/** 推仓失败。 */
SHIPMENT_ERROR("ShipmentError", OutboundStatus.EXCEPTION),
/** 面单异常。 */
LABEL_ERROR("LabelError", OutboundStatus.EXCEPTION),
/** 人工审核。 */
MANUAL_REVIEW("ManualReview", OutboundStatus.EXCEPTION),
/** 缺货。 */
INV_ERROR("InvError", OutboundStatus.EXCEPTION),
/** 库存不足。 */
STOCK_LACK("StockLack", OutboundStatus.EXCEPTION),
/** 库存异常。 */
STOCK_EXCEPTION("StockException", OutboundStatus.EXCEPTION),
/** 账单逾期。 */
BILL_LATE("BillLate", OutboundStatus.EXCEPTION),
/** 余额不足。 */
BALANCE_NOT_ENOUGH("BalanceNotEnough", OutboundStatus.EXCEPTION),
/** 物流校验不通过。 */
LOGISTICS_VERIFICATION_FAILED("LogisticsVerificationFailed", OutboundStatus.EXCEPTION),
/** 请求追踪号失败。 */
UNABLE_REQUEST_TRACKING_NUMBER("UnableRequestTrackingNumber", OutboundStatus.EXCEPTION),
/** 无法识别。 */
UNKNOWN(null, OutboundStatus.UNKNOWN);
/** 已发货类(含退件)——文档定义。 */
private static final Set<String> SHIPPED_SET = new HashSet<String>(Arrays.asList(
"Shipped", "Online", "Delivered", "Returns"));
/** 已取消类(含拦截成功)——文档定义。 */
private static final Set<String> CANCELLED_SET = new HashSet<String>(Arrays.asList(
"Cancelled", "InterceptSuccess"));
private final String rawValue;
private final OutboundStatus core;
EdayunOrderStatus(String rawValue, OutboundStatus core) {
this.rawValue = rawValue;
this.core = core;
}
/** 易达云原值;null 表示无法识别。 */
public String rawValue() {
return rawValue;
}
/** 对应的底层状态。 */
public OutboundStatus toCore() {
return core;
}
/** 是否属于「已发货」(文档口径:Shipped / Online / Delivered / Returns)。 */
public static boolean isShipped(String rawStatus) {
return rawStatus != null && SHIPPED_SET.contains(rawStatus.trim());
}
/** 是否属于「已取消」(文档口径:Cancelled / InterceptSuccess)。 */
public static boolean isCancelled(String rawStatus) {
return rawStatus != null && CANCELLED_SET.contains(rawStatus.trim());
}
/** 易达云原值 → 平台枚举;<b>精确匹配</b>,未知归 UNKNOWN。 */
public static EdayunOrderStatus of(String rawStatus) {
if (rawStatus == null) {
return UNKNOWN;
}
String s = rawStatus.trim();
if (s.isEmpty()) {
return UNKNOWN;
}
for (EdayunOrderStatus v : values()) {
if (v.rawValue != null && s.equalsIgnoreCase(v.rawValue)) {
return v;
}
}
return UNKNOWN;
}
/** 易达云原值 → 底层状态。 */
public static OutboundStatus toCore(String rawStatus) {
return of(rawStatus).toCore();
}
}

23
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunAdapterTest.java

@ -77,7 +77,23 @@ class EdayunAdapterTest {
assertTrue(sdk.capabilities(WH).supported().contains(WarehouseCapability.PRODUCT)); assertTrue(sdk.capabilities(WH).supported().contains(WarehouseCapability.PRODUCT));
} }
/** 未声明能力时门面显式拒绝,不返回空列表。 */ /**
* 出库已声明,但查询需要来源单号或仓单号;两者都没有时本地拒绝,
* 不发请求(不是能力异常——能力是有的)。
*/
@Test
void outboundQueryWithoutAnyNumberIsRejectedLocally() {
WarehouseSdk sdk = sdk();
WarehouseConnection conn = WarehouseConnection.of(
EdayunConstants.PR_BASE_URL,
common.ecommerce.shared.spi.ChannelSecret.builder().appSecret("k").build());
assertThrows(IllegalArgumentException.class,
() -> sdk.warehouses(WH, conn).outbound().get(
common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("")));
}
/** 未声明能力(如库存查询)时门面显式拒绝,不返回空列表。 */
@Test @Test
void unimplementedCapabilityIsRejected() { void unimplementedCapabilityIsRejected() {
WarehouseSdk sdk = sdk(); WarehouseSdk sdk = sdk();
@ -86,8 +102,9 @@ class EdayunAdapterTest {
common.ecommerce.shared.spi.ChannelSecret.builder().appSecret("k").build()); common.ecommerce.shared.spi.ChannelSecret.builder().appSecret("k").build());
assertThrows(WarehouseUnsupportedCapabilityException.class, assertThrows(WarehouseUnsupportedCapabilityException.class,
() -> sdk.warehouses(WH, conn).outbound().get( () -> sdk.warehouses(WH, conn).inventory().query(
common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("OB-1"))); common.ecommerce.warehouse.model.InventoryQuery.builder()
.pageSize(1).build()));
} }
/** 能力矩阵查询本身可用(不触发真实 API)。 */ /** 能力矩阵查询本身可用(不触发真实 API)。 */

248
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderQueryTest.java

@ -0,0 +1,248 @@
package common.ecommerce.edayun.adapter;
import common.ecommerce.edayun.dto.EdayunGetOrderDtos;
import common.ecommerce.edayun.dto.EdayunGetOrderLabelDtos;
import common.ecommerce.edayun.enums.EdayunOrderStatus;
import common.ecommerce.warehouse.enums.OutboundStatus;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.OutboundOrder;
import common.ecommerce.warehouse.model.PackageResult;
import org.junit.jupiter.api.Test;
import java.time.Instant;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* 查询出库单({@code getOrderInfo})与面单({@code getOrderLabel})的映射。
*/
class EdayunOrderQueryTest {
// ------------------------------------------------------------ 状态映射
/** 文档口径:已发货 = Shipped / Online / Delivered / Returns。 */
@Test
void shippedStatuses() {
for (String s : new String[] {"Shipped", "Online", "Delivered", "Returns"}) {
assertEquals(OutboundStatus.SHIPPED, EdayunOrderStatus.toCore(s), s);
assertTrue(EdayunOrderStatus.isShipped(s), s);
}
}
/** 文档口径:已取消 = Cancelled / InterceptSuccess。 */
@Test
void cancelledStatuses() {
for (String s : new String[] {"Cancelled", "InterceptSuccess"}) {
assertEquals(OutboundStatus.CANCELLED, EdayunOrderStatus.toCore(s), s);
assertTrue(EdayunOrderStatus.isCancelled(s), s);
}
}
/** 异常类全部折叠到 EXCEPTION,具体原因看 errorMsg / rawStatus。 */
@Test
void exceptionStatuses() {
for (String s : new String[] {"DistrError", "NoCarrier", "NoMapping", "ShipmentError",
"LabelError", "ManualReview", "InvError", "StockLack", "BillLate",
"BalanceNotEnough", "VerifyNotPass", "StockException"}) {
assertEquals(OutboundStatus.EXCEPTION, EdayunOrderStatus.toCore(s), s);
}
}
@Test
void unknownStatusIsNotGuessed() {
assertEquals(OutboundStatus.UNKNOWN, EdayunOrderStatus.toCore("SomeNewStatus"));
assertEquals(OutboundStatus.UNKNOWN, EdayunOrderStatus.toCore(null));
assertEquals(OutboundStatus.UNKNOWN, EdayunOrderStatus.toCore(""));
}
/** 大小写不敏感,但仍是精确匹配(不是子串)。 */
@Test
void matchingIsExactButCaseInsensitive() {
assertEquals(OutboundStatus.SHIPPED, EdayunOrderStatus.toCore("shipped"));
// 子串不算:Shipment 是「发货中」,不能因为含 Ship 就判已发货
assertEquals(OutboundStatus.PICKING, EdayunOrderStatus.toCore("Shipment"));
}
// ------------------------------------------------------------ 订单映射
private static EdayunGetOrderDtos.OrderInfo fullOrder() {
EdayunGetOrderDtos.OrderInfo info = new EdayunGetOrderDtos.OrderInfo();
info.orderNo = "EDA-1";
info.poNumber = "P-20261112";
info.orderStatus = "Shipped";
info.warehouseCode = "US-WH-1";
info.carrierName = "UPS";
info.carrierId = "3";
info.trackingNo = "1Z999";
info.currency = "USD";
info.estimatedCost = 8.5;
info.createTime = "1762764000000";
info.shippedTime = 1762800000000L;
info.errorMsg = null;
EdayunGetOrderDtos.OrderInfo.OrderAddress addr =
new EdayunGetOrderDtos.OrderInfo.OrderAddress();
addr.buyerName = "张三";
addr.buyerPhone = "+1-555-0100";
addr.email = "a@b.com";
addr.destCountry = "US";
addr.destProvince = "CA";
addr.destProvinceName = "California";
addr.destCity = "LA";
addr.destFirstAddress = "1 Main St";
addr.destSecondAddress = "Apt 2";
addr.zipCode = "90001";
info.orderAddressVO = addr;
EdayunGetOrderDtos.OrderInfo.ProductItem item =
new EdayunGetOrderDtos.OrderInfo.ProductItem();
item.productSku = "DM00001";
item.quantity = 2;
item.unitPrice = 9.99;
item.snCodeList = java.util.Arrays.asList("SN001", "SN002");
info.productItemVOList = java.util.Collections.singletonList(item);
EdayunGetOrderDtos.OrderInfo.OrderAttribute attr =
new EdayunGetOrderDtos.OrderInfo.OrderAttribute();
attr.signatureFlag = 1;
attr.insuranceFlag = 0;
info.orderAttribute = attr;
return info;
}
@Test
void mapsHeaderFields() {
OutboundOrder order = EdayunOrderQueryMapper.toOrder(fullOrder(), "OMS-WH", "P-20261112");
assertEquals("P-20261112", order.outboundRequestNo()); // poNumber 是来源单号
assertEquals("EDA-1", order.providerOrderId()); // orderNo 是仓侧单号
assertEquals("US-WH-1", order.warehouseCode());
assertEquals(OutboundStatus.SHIPPED, order.status());
assertEquals("Shipped", order.rawStatus());
assertEquals("UPS", order.carrier());
assertEquals("1Z999", order.trackingNumber());
assertEquals(WarehouseProvider.EDAYUN, order.sourceProvider());
assertEquals(Instant.ofEpochMilli(1762764000000L), order.requestedAt());
assertEquals(Instant.ofEpochMilli(1762800000000L), order.shippedAt());
}
@Test
void mapsAddressPreferringTwoLetterCode() {
OutboundOrder order = EdayunOrderQueryMapper.toOrder(fullOrder(), "W", "P");
assertEquals("US", order.shipTo().countryCode());
// 易达云同时给二字码与全称;标准模型口径是二字码
assertEquals("CA", order.shipTo().stateOrProvince());
assertEquals("LA", order.shipTo().city());
assertEquals("Apt 2", order.shipTo().addressLine2());
}
@Test
void mapsLinesAndSerialNumbers() {
OutboundOrder order = EdayunOrderQueryMapper.toOrder(fullOrder(), "W", "P");
assertEquals(1, order.lines().size());
assertEquals(Integer.valueOf(2), Integer.valueOf(order.lines().get(0).quantity()));
assertEquals("DM00001", order.lines().get(0).providerSku());
assertEquals(2, order.serialNumbers().size());
assertEquals("SN001", order.serialNumbers().get(0).snCode());
assertEquals("DM00001", order.serialNumbers().get(0).providerSku());
}
/** 0/1 旗标:null 保持 null,不猜成 false。 */
@Test
void flagsStayNullWhenAbsent() {
EdayunGetOrderDtos.OrderInfo noAttr = fullOrder();
noAttr.orderAttribute = null;
OutboundOrder order = EdayunOrderQueryMapper.toOrder(noAttr, "W", "P");
assertNull(order.signatureRequired());
assertNull(order.insured());
}
@Test
void mapsFlags() {
OutboundOrder order = EdayunOrderQueryMapper.toOrder(fullOrder(), "W", "P");
assertEquals(Boolean.TRUE, order.signatureRequired());
assertEquals(Boolean.FALSE, order.insured());
}
/** 异常类状态把 errorMsg 带出来。 */
@Test
void errorMessageBecomesExceptionCode() {
EdayunGetOrderDtos.OrderInfo failed = fullOrder();
failed.orderStatus = "DistrError";
failed.errorMsg = "no warehouse for zip 90001";
OutboundOrder order = EdayunOrderQueryMapper.toOrder(failed, "W", "P");
assertEquals(OutboundStatus.EXCEPTION, order.status());
assertEquals("no warehouse for zip 90001", order.exceptionCode());
}
// ------------------------------------------------------------ 面单映射
private static EdayunGetOrderLabelDtos.LabelData twoPackageLabel() {
EdayunGetOrderLabelDtos.LabelData data = new EdayunGetOrderLabelDtos.LabelData();
data.orderNo = "EDA-1";
data.poNumber = "P-20261112";
data.carrierName = "UPS";
data.carrierId = "3";
data.trackingNo = "1Z111,1Z222";
data.labels = "https://oss/1.png,https://oss/2.png";
return data;
}
/** 多包裹:trackingNo 与 labels 按位置一一对应。 */
@Test
void packagesZipTrackingWithLabels() {
List<PackageResult> packages = EdayunOrderQueryMapper.toPackages(twoPackageLabel(), "P");
assertEquals(2, packages.size());
assertEquals("1Z111", packages.get(0).trackingNumber());
assertEquals("https://oss/1.png", packages.get(0).labelRef());
assertEquals("1Z222", packages.get(1).trackingNumber());
assertEquals("https://oss/2.png", packages.get(1).labelRef());
assertEquals("UPS", packages.get(0).carrier());
assertEquals("3", packages.get(0).carrierCode());
}
@Test
void singlePackageWorks() {
EdayunGetOrderLabelDtos.LabelData data = new EdayunGetOrderLabelDtos.LabelData();
data.trackingNo = "1Z999";
data.labels = "https://oss/1.png";
List<PackageResult> packages = EdayunOrderQueryMapper.toPackages(data, "P");
assertEquals(1, packages.size());
assertEquals("1Z999", packages.get(0).trackingNumber());
}
/** 没有面单时返回空列表,不是错误。 */
@Test
void emptyLabelIsEmptyList() {
EdayunGetOrderLabelDtos.LabelData data = new EdayunGetOrderLabelDtos.LabelData();
assertTrue(EdayunOrderQueryMapper.toPackages(data, "P").isEmpty());
assertTrue(EdayunOrderQueryMapper.toPackages(null, "P").isEmpty());
}
/** 面单 URL 也能转成附件。 */
@Test
void labelsBecomeAttachments() {
List<common.ecommerce.warehouse.model.WarehouseAttachment> atts =
EdayunOrderQueryMapper.attachmentsOf(twoPackageLabel());
assertEquals(2, atts.size());
assertEquals("1Z111", atts.get(0).name());
assertEquals("ShippingLabel", atts.get(0).type());
assertEquals("https://oss/1.png", atts.get(0).url());
}
}
Loading…
Cancel
Save