diff --git a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java index 74ff70b..38a8ebd 100644 --- a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java +++ b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunAdapter.java @@ -14,6 +14,7 @@ import common.ecommerce.edayun.dto.EdayunGetOrderLabelDtos; import common.ecommerce.edayun.dto.EdayunInboundDtos; 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.EdayunRentDetailDtos; import common.ecommerce.edayun.dto.EdayunReturnDetailDtos; @@ -34,6 +35,7 @@ import common.ecommerce.shared.support.Page; import common.ecommerce.warehouse.capability.BolCapable; import common.ecommerce.warehouse.capability.InboundCapable; import common.ecommerce.warehouse.capability.InventoryCapable; +import common.ecommerce.warehouse.capability.LogisticsProductCapable; import common.ecommerce.warehouse.capability.OutboundCapable; import common.ecommerce.warehouse.capability.WarehouseFeeCapable; import common.ecommerce.warehouse.capability.WarehouseFeeEstimateCapable; @@ -59,6 +61,7 @@ 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.LogisticsProduct; import common.ecommerce.warehouse.model.OutboundCommand; import common.ecommerce.warehouse.model.OutboundOrder; import common.ecommerce.warehouse.model.OutboundQuery; @@ -88,7 +91,10 @@ import java.util.List; */ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCapable, OutboundCapable, WarehouseFeeCapable, WarehouseFeeEstimateCapable, InventoryCapable, - InboundCapable, WarehouseReturnCapable, BolCapable { + InboundCapable, WarehouseReturnCapable, BolCapable, LogisticsProductCapable { + + /** 物流产品查询的适用业务:1 店铺订单(默认口径)。 */ + private static final int APPLICABLE_BUSINESS_STORE_ORDER = 1; private final HttpTransport transport; private final JacksonJsonCodec json; @@ -141,7 +147,8 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa return EnumSet.of(WarehouseCapability.PRODUCT, WarehouseCapability.OUTBOUND, WarehouseCapability.FEE_SETTLEMENT, WarehouseCapability.FEE_ESTIMATE, WarehouseCapability.INVENTORY_QUERY, WarehouseCapability.INBOUND, - WarehouseCapability.RETURN, WarehouseCapability.BOL); + WarehouseCapability.RETURN, WarehouseCapability.BOL, + WarehouseCapability.LOGISTICS_PRODUCT); } /** @@ -870,6 +877,30 @@ public final class EdayunAdapter implements WarehouseAdapter, WarehouseProductCa return EdayunBolMapper.toDocuments(parsed); } + /** + * 查物流产品清单 + * ({@code POST /webApi/order/listByLogisticProductHasPerm})。 + * + *
{@code productId = -998}(使用分物流规则)不是真实产品,映射时跳过。
+ */ + @Override + public List统一模型 {@link LogisticsProduct} 只有「编码 / 名称 / 是否跨国」三个可填字段; + * 承运商类型、派单方式、增值服务选项这些只在 DTO 里。
+ * + *{@code productId = -998} 是「使用分物流规则」的哨兵值,不是真实产品—— + * 映射时跳过,否则宿主的渠道清单里会多一个查不到的产品。
+ */ +public final class EdayunLogisticsProductMapper { + + /** 「智能分物流」哨兵值。 */ + static final String ID_AUTO_ROUTE = "-998"; + + private EdayunLogisticsProductMapper() { + } + + /** 查询请求。 */ + public static EdayunLogisticsProductDtos.ListProductRequest toRequest( + String providerWarehouseId, Integer applicableBusiness) { + EdayunLogisticsProductDtos.ListProductRequest req = + new EdayunLogisticsProductDtos.ListProductRequest(); + req.warehouseId = warehouseIdOf(providerWarehouseId); + req.applicableBusiness = applicableBusiness; + return req; + } + + /** 响应 → 统一产品清单;跳过 {@code -998} 与无效行。 */ + public static List编码用 {@code productId}(字符串化的数字),名称用 {@code productName}。 + * {@code crossCountry} 易达云不回,恒 false。
+ */ + static LogisticsProduct toProduct(EdayunLogisticsProductDtos.Product row, String warehouseCode) { + if (row == null || row.productId == null || row.productId.trim().isEmpty()) { + return null; + } + String id = row.productId.trim(); + if (ID_AUTO_ROUTE.equals(id)) { + // 「使用分物流规则」不是可选的物流产品 + return null; + } + return LogisticsProduct.builder() + .sourceProvider(WarehouseProvider.EDAYUN) + .warehouseCode(warehouseCode) + .logisticsProductCode(id) + .logisticsProductName(row.productName) + .crossCountry(false) + .build(); + } + + /** 仓方仓 id 是数字;非数字/为空返回 null(不传,仓方返回全部仓)。 */ + static Long warehouseIdOf(String providerWarehouseId) { + if (providerWarehouseId == null || providerWarehouseId.trim().isEmpty()) { + return null; + } + try { + return Long.valueOf(providerWarehouseId.trim()); + } catch (NumberFormatException e) { + return null; + } + } +} diff --git a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunLogisticsProductDtos.java b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunLogisticsProductDtos.java new file mode 100644 index 0000000..182aa80 --- /dev/null +++ b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/dto/EdayunLogisticsProductDtos.java @@ -0,0 +1,79 @@ +package common.ecommerce.edayun.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import java.util.List; + +/** + * 易达云报文结构:根据仓库查询物流产品列表 + * ({@code POST /webApi/order/listByLogisticProductHasPerm})。 + * + *一个文件对应一个接口。用于「出库单 / 退货单能选哪些物流产品」。 + * 最后一条可能是 {@code productId = -998}(智能分物流),此时其余字段全是 null。
+ */ +public final class EdayunLogisticsProductDtos { + + private EdayunLogisticsProductDtos() { + } + + /** 查询请求。 */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class ListProductRequest { + /** 适用业务:1 店铺订单 / 2 平台仓订单 / 3 退货单。 */ + public Integer applicableBusiness; + /** 仓库 id。文档标必填,实测不传返回全部仓的产品。 */ + public Long warehouseId; + } + + /** 查询响应。 */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class ListProductResponse { + public Integer code; + public String msg; + public List重点:{@code -998}(使用分物流规则)不是真实产品,要跳过。
+ */ +class EdayunLogisticsProductTest { + + private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-16T00: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-lp", CLOCK); + } + + private static EdayunLogisticsProductDtos.Product product(String id, String name) { + EdayunLogisticsProductDtos.Product p = new EdayunLogisticsProductDtos.Product(); + p.productId = id; + p.productName = name; + return p; + } + + @Test + void mapsProduct() { + LogisticsProduct lp = EdayunLogisticsProductMapper.toProduct( + product("133", "美国USPS-Priority Mail"), "USLA"); + + assertEquals("133", lp.logisticsProductCode()); + assertEquals("美国USPS-Priority Mail", lp.logisticsProductName()); + assertEquals("USLA", lp.warehouseCode()); + assertEquals(WarehouseProvider.EDAYUN, lp.sourceProvider()); + // 易达云不回跨国标记,恒 false + assertTrue(!lp.crossCountry()); + } + + /** -998 是「使用分物流规则」的哨兵值,不是可选产品。 */ + @Test + void autoRouteSentinelIsSkipped() { + List+ * # 只看报文(不联网) + * mvn -pl warehouse-sdk-edayun -DfailIfNoTests=false \ + * -Dedayun.probe.bol=true -Dtest=EdayunBolProbeTest test + * + * # 真查(只读) + * ... -Dedayun.probe.bol=true -Dedayun.probe.call=true \ + * -Dedayun.probe.clientId=... -Dedayun.probe.clientSecret=... \ + * -Dedayun.probe.appKey=... -Dedayun.probe.appSecret=... \ + * [-Dedayun.probe.warehouseId=2] [-Dedayun.probe.orderNo=FBA473182144] + *+ */ +@EnabledIfSystemProperty(named = "edayun.probe.bol", matches = "true") +class EdayunBolProbeTest { + + 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 WAREHOUSE_ID = System.getProperty("edayun.probe.warehouseId", ""); + private static final String ORDER_NO = opt("edayun.probe.orderNo", "FBA473182144"); + private static final boolean CALL = Boolean.getBoolean("edayun.probe.call"); + + @Test + void probeBolAndProducts() { + EdayunBolDtos.GetBolRequest bolBody = EdayunBolMapper.toRequest(ORDER_NO); + EdayunLogisticsProductDtos.ListProductRequest lpBody = + EdayunLogisticsProductMapper.toRequest(emptyToNull(WAREHOUSE_ID), 1); + + System.out.println("\n================ edayun / POST " + + EdayunConstants.PATH_BOL_LIST + " ================"); + System.out.println("[request] " + new JacksonJsonCodec().toJson(bolBody)); + System.out.println("\n================ edayun / POST " + + EdayunConstants.PATH_LOGISTICS_PRODUCTS + " ================"); + System.out.println("[request] " + new JacksonJsonCodec().toJson(lpBody)); + + 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, + emptyToNull(WAREHOUSE_ID), + 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()); + + List