diff --git a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java index f678d79..157f01b 100644 --- a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java +++ b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java @@ -82,8 +82,10 @@ public final class EdayunInventoryMapper { .inventoryType(0) .asOfUtc(asOf) .productName(blankToNull(row.skuName)) - .pendingOutbound(intOf(row.toDeliverStock)) - .alertQuantity(intOf(row.safeStock)) + // 这两个字段仓方会缺:真机 500 行里 430 行 safeStock 为 null。 + // 统一模型的约定是「仓方未给时为 -1」,不能和真实的 0 混为一谈 + .pendingOutbound(intOfUnknown(row.toDeliverStock)) + .alertQuantity(intOfUnknown(row.safeStock)) .build()); } return Page.of(out, nextCursor(response.total, currentPage, pageSize, out.size())); @@ -141,6 +143,11 @@ public final class EdayunInventoryMapper { return v == null ? 0 : v; } + /** 可缺省的数量:null 记 -1(统一模型对「仓方未给」的约定)。 */ + private static int intOfUnknown(Integer v) { + return v == null ? -1 : v; + } + private static String firstNonBlank(String a, String b) { if (hasText(a)) { return a.trim(); diff --git a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderMapper.java b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderMapper.java index 83cf061..635da78 100644 --- a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderMapper.java +++ b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderMapper.java @@ -104,15 +104,37 @@ public final class EdayunOrderMapper { req.carrierName = firstNonBlank(cmd.carrier(), cmd.carrierCode()); } - /** 物流增值:签收 / 保价。 */ + /** + * 物流增值:签收 / 保价。 + * + *
签收取命令级的 {@code signatureRequired};保价取任意商品行的 + * {@code insuredAmount}——易达云的 {@code addService} 是订单级开关, + * 只要有一行保价就整单开保价。
+ */ private static List只断言「始终存在」与「始终不存在」的能力位,避免每加一个接口就要改这里。
+ */ @Test void declaresOnlyImplementedCapabilities() { EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec()); assertTrue(adapter.capabilities().contains(WarehouseCapability.PRODUCT)); assertTrue(adapter.capabilities().contains(WarehouseCapability.OUTBOUND)); - // 未实现的仍然不声明 - assertTrue(!adapter.capabilities().contains(WarehouseCapability.TRACKING)); + // 易达云没有调拨 / 换货,永远不声明 + assertFalse(adapter.capabilities().contains(WarehouseCapability.TRANSFER)); } /** 注册到门面后能按 provider 解析到适配器。 */ @@ -93,7 +98,7 @@ class EdayunAdapterTest { common.ecommerce.warehouse.model.OutboundRef.ofRequestNo(""))); } - /** 未声明能力(如退货)时门面显式拒绝,不返回空列表。 */ + /** 未声明能力时门面显式拒绝,不返回空列表。 */ @Test void unimplementedCapabilityIsRejected() { WarehouseSdk sdk = sdk(); @@ -102,7 +107,7 @@ class EdayunAdapterTest { common.ecommerce.shared.spi.ChannelSecret.builder().appSecret("k").build()); assertThrows(WarehouseUnsupportedCapabilityException.class, - () -> sdk.warehouses(WH, conn).returns().query(null)); + () -> sdk.warehouses(WH, conn).warehouses()); } /** 能力矩阵查询本身可用(不触发真实 API)。 */ @@ -111,6 +116,6 @@ class EdayunAdapterTest { EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec()); assertTrue(adapter.capabilities().contains(WarehouseCapability.INBOUND)); - assertTrue(!adapter.capabilities().contains(WarehouseCapability.TRACKING)); + assertFalse(adapter.capabilities().contains(WarehouseCapability.TRANSFER)); } } diff --git a/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java b/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java index aabf4f1..1e33d4d 100644 --- a/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java +++ b/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java @@ -136,10 +136,36 @@ class EdayunInventoryTest { assertTrue(s.sellable()); } - /** 仓编码缺失时回退 OMS 仓编码,快照必须有 warehouseCode。 */ + /** + * 仓方会缺字段:真机 500 行里 430 行 {@code safeStock} 为 null。 + * 统一模型对「仓方未给」的约定是 -1,不能与真实的 0 混为一谈。 + */ + @Test + void missingSafeStockIsMinusOne() { + EdayunInventoryDtos.InventoryRow r = row(); + r.safeStock = null; + r.toDeliverStock = null; + + InventorySnapshot s = EdayunInventoryMapper.toPage( + response(1L, r), "W", AS_OF, 1, 100).items().get(0); + + assertEquals(-1, s.alertQuantity()); + assertEquals(-1, s.pendingOutbound()); + } + + /** 真实值为 0 时仍然是 0,不能被当成「未给」。 */ @Test - void warehouseCodeFallsBack() { + void zeroSafeStockStaysZero() { EdayunInventoryDtos.InventoryRow r = row(); + r.safeStock = 0; + + assertEquals(0, EdayunInventoryMapper.toPage( + response(1L, r), "W", AS_OF, 1, 100).items().get(0).alertQuantity()); + } + + /** 仓编码缺失时回退 OMS 仓编码,快照必须有 warehouseCode。 */ + @Test + void warehouseCodeFallsBack() { EdayunInventoryDtos.InventoryRow r = row(); r.warehouseCode = null; assertEquals("EDY-WH", EdayunInventoryMapper.toPage( @@ -147,8 +173,7 @@ class EdayunInventoryTest { .items().get(0).warehouseCode()); } - /** 没有 SKU 的行跳过,不应让整页失败。 */ - @Test + /** 没有 SKU 的行跳过,不应让整页失败。 */ @Test void rowsWithoutSkuAreSkipped() { EdayunInventoryDtos.InventoryRow dirty = row(); dirty.skuCode = " "; diff --git a/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderTest.java b/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderTest.java index fc601fa..60756cb 100644 --- a/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderTest.java +++ b/warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderTest.java @@ -10,6 +10,7 @@ import common.ecommerce.warehouse.model.ShipTo; 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; @@ -171,4 +172,68 @@ class EdayunOrderTest { assertNull(EdayunOrderMapper.toCreateRequest(base().build(), "2").addService); } + + /** 任意商品行带保价金额 → 整单开保价(addService 是订单级开关)。 */ + @Test + void insuredLineMapsToInsuranceService() { + OutboundCommand insured = OutboundCommand.builder() + .outboundRequestNo("OB-3") + .salesPlatform(Platform.AMAZON_SC) + .shipTo(ShipTo.builder().name("a").phone("p") + .countryCode("US").stateOrProvince("CA").city("c") + .addressLine1("a1").postalCode("1").build()) + .line(OutboundLine.builder().lineNo("1").omsSku("S").quantity(1) + .insuredAmount(Money.of("100.00", "USD")).build()) + .build(); + + EdayunCreateOrderDtos.CreateOrderRequest req = + EdayunOrderMapper.toCreateRequest(insured, "2"); + + assertEquals(1, req.addService.size()); + assertEquals("is_insurance", req.addService.get(0)); + } + + /** 签收 + 保价可同时下发。 */ + @Test + void signatureAndInsuranceCanCoexist() { + OutboundCommand both = OutboundCommand.builder() + .outboundRequestNo("OB-4") + .salesPlatform(Platform.AMAZON_SC) + .signatureRequired(true) + .shipTo(ShipTo.builder().name("a").phone("p") + .countryCode("US").stateOrProvince("CA").city("c") + .addressLine1("a1").postalCode("1").build()) + .line(OutboundLine.builder().lineNo("1").omsSku("S").quantity(1) + .insuredAmount(Money.of("50.00", "USD")).build()) + .build(); + + List