Browse Source

fix(edayun): 库存 safeStock 缺失记 -1、出库单补保价映射

库存查询真机实测(500 行采样):
- safeStock 有 430 行为 null,原实现映射成 0,与「安全库存真的是 0」无法区分。
  统一模型的约定是「仓方未给时为 -1」,改成 -1 并补两个用例。
- 其余数字字段虽然文档标 number,真机全是字符串("15499"),DTO 用 Integer
  由 Jackson 自动转换,无需改动。

创建出库单:
- 文档的 addService 支持 is_insurance,标准模型有 OutboundLine.insuredAmount。
  任意商品行带保价即整单下发 is_insurance(addService 是订单级开关,
  易达云没有行级保价)。

顺带把 EdayunAdapterTest 的能力位断言改成「只断言恒有 / 恒无的能力」,
避免每加一个接口都要改它。

测试:EdayunInventoryTest +2、EdayunOrderTest +3。

Co-Authored-By: Claude <noreply@anthropic.com>
master
chenchuchuan 4 days ago
parent
commit
8b3fa466af
  1. 11
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java
  2. 24
      warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunOrderMapper.java
  3. 17
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunAdapterTest.java
  4. 33
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java
  5. 65
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunOrderTest.java

11
warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java

@ -82,8 +82,10 @@ public final class EdayunInventoryMapper {
.inventoryType(0) .inventoryType(0)
.asOfUtc(asOf) .asOfUtc(asOf)
.productName(blankToNull(row.skuName)) .productName(blankToNull(row.skuName))
.pendingOutbound(intOf(row.toDeliverStock)) // 这两个字段仓方会缺:真机 500 行里 430 行 safeStock 为 null。
.alertQuantity(intOf(row.safeStock)) // 统一模型的约定是「仓方未给时为 -1」,不能和真实的 0 混为一谈
.pendingOutbound(intOfUnknown(row.toDeliverStock))
.alertQuantity(intOfUnknown(row.safeStock))
.build()); .build());
} }
return Page.of(out, nextCursor(response.total, currentPage, pageSize, out.size())); return Page.of(out, nextCursor(response.total, currentPage, pageSize, out.size()));
@ -141,6 +143,11 @@ public final class EdayunInventoryMapper {
return v == null ? 0 : v; 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) { private static String firstNonBlank(String a, String b) {
if (hasText(a)) { if (hasText(a)) {
return a.trim(); return a.trim();

24
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()); req.carrierName = firstNonBlank(cmd.carrier(), cmd.carrierCode());
} }
/** 物流增值:签收 / 保价。 */ /**
* 物流增值:签收 / 保价。
*
* <p>签收取命令级的 {@code signatureRequired};保价取<b>任意商品行</b>的
* {@code insuredAmount}——易达云的 {@code addService} 是订单级开关,
* 只要有一行保价就整单开保价。</p>
*/
private static List<String> addServicesOf(OutboundCommand cmd) { private static List<String> addServicesOf(OutboundCommand cmd) {
List<String> services = new ArrayList<String>(2); List<String> services = new ArrayList<String>(2);
if (Boolean.TRUE.equals(cmd.signatureRequired())) { if (Boolean.TRUE.equals(cmd.signatureRequired())) {
services.add(EdayunConstants.ADD_SERVICE_SIGNATURE); services.add(EdayunConstants.ADD_SERVICE_SIGNATURE);
} }
if (hasInsuredLine(cmd)) {
services.add(EdayunConstants.ADD_SERVICE_INSURANCE);
}
return services.isEmpty() ? null : services; return services.isEmpty() ? null : services;
} }
/** 任意商品行带保价金额即为保价单。 */
private static boolean hasInsuredLine(OutboundCommand cmd) {
if (cmd.lines() == null) {
return false;
}
for (OutboundLine line : cmd.lines()) {
if (line != null && line.insuredAmount() != null) {
return true;
}
}
return false;
}
/** 地址:注意运去哪用州二字码,易达云要州全称。 */ /** 地址:注意运去哪用州二字码,易达云要州全称。 */
private static EdayunCreateOrderDtos.CreateOrderRequest.OrderAddress toAddress(ShipTo shipTo) { private static EdayunCreateOrderDtos.CreateOrderRequest.OrderAddress toAddress(ShipTo shipTo) {
EdayunCreateOrderDtos.CreateOrderRequest.OrderAddress addr = EdayunCreateOrderDtos.CreateOrderRequest.OrderAddress addr =

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

@ -17,6 +17,7 @@ import java.time.Instant;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@ -58,15 +59,19 @@ class EdayunAdapterTest {
assertEquals(WarehouseProvider.EDAYUN, adapter.provider()); assertEquals(WarehouseProvider.EDAYUN, adapter.provider());
} }
/** 已实现能力:商品建档。声明了就必须有实现。 */ /**
* 已实现能力:商品建档 / 出库。声明了就必须有实现。
*
* <p>只断言「始终存在」与「始终不存在」的能力位,避免每加一个接口就要改这里。</p>
*/
@Test @Test
void declaresOnlyImplementedCapabilities() { void declaresOnlyImplementedCapabilities() {
EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec()); EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec());
assertTrue(adapter.capabilities().contains(WarehouseCapability.PRODUCT)); assertTrue(adapter.capabilities().contains(WarehouseCapability.PRODUCT));
assertTrue(adapter.capabilities().contains(WarehouseCapability.OUTBOUND)); assertTrue(adapter.capabilities().contains(WarehouseCapability.OUTBOUND));
// 未实现的仍然不声明 // 易达云没有调拨 / 换货,永远不声明
assertTrue(!adapter.capabilities().contains(WarehouseCapability.TRACKING)); assertFalse(adapter.capabilities().contains(WarehouseCapability.TRANSFER));
} }
/** 注册到门面后能按 provider 解析到适配器。 */ /** 注册到门面后能按 provider 解析到适配器。 */
@ -93,7 +98,7 @@ class EdayunAdapterTest {
common.ecommerce.warehouse.model.OutboundRef.ofRequestNo(""))); common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("")));
} }
/** 未声明能力(如退货)时门面显式拒绝,不返回空列表。 */ /** 未声明能力时门面显式拒绝,不返回空列表。 */
@Test @Test
void unimplementedCapabilityIsRejected() { void unimplementedCapabilityIsRejected() {
WarehouseSdk sdk = sdk(); WarehouseSdk sdk = sdk();
@ -102,7 +107,7 @@ 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).returns().query(null)); () -> sdk.warehouses(WH, conn).warehouses());
} }
/** 能力矩阵查询本身可用(不触发真实 API)。 */ /** 能力矩阵查询本身可用(不触发真实 API)。 */
@ -111,6 +116,6 @@ class EdayunAdapterTest {
EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec()); EdayunAdapter adapter = new EdayunAdapter(RecordingTransport.create(), new JacksonJsonCodec());
assertTrue(adapter.capabilities().contains(WarehouseCapability.INBOUND)); assertTrue(adapter.capabilities().contains(WarehouseCapability.INBOUND));
assertTrue(!adapter.capabilities().contains(WarehouseCapability.TRACKING)); assertFalse(adapter.capabilities().contains(WarehouseCapability.TRANSFER));
} }
} }

33
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunInventoryTest.java

@ -136,10 +136,36 @@ class EdayunInventoryTest {
assertTrue(s.sellable()); 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 @Test
void warehouseCodeFallsBack() { void zeroSafeStockStaysZero() {
EdayunInventoryDtos.InventoryRow r = row(); 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; r.warehouseCode = null;
assertEquals("EDY-WH", EdayunInventoryMapper.toPage( assertEquals("EDY-WH", EdayunInventoryMapper.toPage(
@ -147,8 +173,7 @@ class EdayunInventoryTest {
.items().get(0).warehouseCode()); .items().get(0).warehouseCode());
} }
/** 没有 SKU 的行跳过,不应让整页失败。 */ /** 没有 SKU 的行跳过,不应让整页失败。 */ @Test
@Test
void rowsWithoutSkuAreSkipped() { void rowsWithoutSkuAreSkipped() {
EdayunInventoryDtos.InventoryRow dirty = row(); EdayunInventoryDtos.InventoryRow dirty = row();
dirty.skuCode = " "; dirty.skuCode = " ";

65
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 org.junit.jupiter.api.Test;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
@ -171,4 +172,68 @@ class EdayunOrderTest {
assertNull(EdayunOrderMapper.toCreateRequest(base().build(), "2").addService); 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<String> services = EdayunOrderMapper.toCreateRequest(both, "2").addService;
assertEquals(2, services.size());
assertTrue(services.contains("is_signature"));
assertTrue(services.contains("is_insurance"));
}
/** 增补:平台单号同时带 eBay Transaction ID 与商品级 itemId。 */
@Test
void ebayIdsAreNotMappedYet() {
// 标准模型没有 ebayTransactionId / ebayItemId;
// 商品级的 platformOrderItemIds 目前只映射到 platformItemId(亚马逊口径)
OutboundCommand cmd = OutboundCommand.builder()
.outboundRequestNo("OB-5")
.salesPlatform(Platform.EBAY)
.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)
.platformOrderItemId("EBAY-ITEM-1").build())
.build();
EdayunCreateOrderDtos.CreateOrderRequest req =
EdayunOrderMapper.toCreateRequest(cmd, "2");
assertEquals("eBay", req.channelName);
assertNull(req.ebayTransactionId);
assertEquals("EBAY-ITEM-1", req.productItemVOList.get(0).platformItemId);
}
} }

Loading…
Cancel
Save