Browse Source
逐字段审计「标准出入参 ↔ 运去哪出入参」后发现的问题,只修能明确判定为 bug 的,不涉及模型结构调整: 1. 平台面单文件从未下发 OutboundCommand.labelContentBase64 无任何映射,attachInfoItems 整类 从未被构造。结果是 labelMode=PLATFORM_LABEL 校验通过、面单一个字节 都没发,仓没有面单可打。现在映射为 attachInfoItems(type=0 面单), 去掉 data URI 头、从 MIME 取 fileType;单包裹时带 packageNo。 同时加了「PLATFORM_LABEL 必须给面单内容」的校验,只声明模式不给文件 会直接拒绝,不再静默失败。 2. 声明了 SPLIT 但没有对应字段 运去哪下单接口没有拆单字段,splitOrder 无法下发,却声明了 WarehouseCapability.SPLIT。撤掉该能力位,避免调用方以为能控制拆单。 3. 出库查询把 orderRef 当来源单号 query() 用 firstNonBlank(providerOrderId, orderRef),而 API 128 只按 来源单号查;orderRef 是平台单号,传进去查不到或查错单。现在只接受 providerOrderId,并在报错里说明原因。 4. 回查路径上 OutboundOrder 三个字段恒空 providerOrderId 在 API 128 里没有(只有 API 123 创建时返回), labelMode 与 requestedAt 也不回传。labelMode 之前直接走构造器默认值 WAREHOUSE_LABEL,会把平台面单订单报成仓面单。改为由调用方显式传入 (get/query 传 null 时按仓自有面单兜底),并给 PackageResult 补 carrierCode(包裹级承运商 code,之前只映射了名称)。 5. 顺带补上现成落点没赋值的两个字段 shopName → channelAccount、sfp → isPrime(1/2),之前 DTO 有字段 却从不 set,多店铺与 SFP 场景静默失效。 文档补充: - InventoryCapable.query / OutboundQuery.orderRef 标注「并非所有仓支持, 过滤可能不生效」,按 SKU 过滤目前在 YQN 侧完全未实现 新增 YqnOutboundPayloadTest(9 个)覆盖面单附件、data URI、两种面单模式、 店铺/SFP、查询语义、SPLIT 撤销。 Co-Authored-By: Claude <noreply@anthropic.com>feature/supplier-lingxing
7 changed files with 328 additions and 13 deletions
@ -0,0 +1,172 @@
@@ -0,0 +1,172 @@
|
||||
package common.ecommerce.yqn.adapter; |
||||
|
||||
import common.ecommerce.http.JacksonJsonCodec; |
||||
import common.ecommerce.shared.spi.ChannelSecret; |
||||
import common.ecommerce.shared.testkit.RecordingTransport; |
||||
import common.ecommerce.shared.testkit.Responses; |
||||
import common.ecommerce.shared.model.Platform; |
||||
import common.ecommerce.warehouse.enums.LabelMode; |
||||
import common.ecommerce.warehouse.enums.WarehouseCapability; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.OutboundCommand; |
||||
import common.ecommerce.warehouse.model.OutboundLine; |
||||
import common.ecommerce.warehouse.model.ShipTo; |
||||
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.assertThrows; |
||||
import static org.junit.jupiter.api.Assertions.assertTrue; |
||||
|
||||
/** |
||||
* 出库链路的参数完整性契约测试(平台面单 / 店铺 / SFP / 拆单 / data URI)。 |
||||
*/ |
||||
class YqnOutboundPayloadTest { |
||||
|
||||
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-10T00:00:00Z"), ZoneOffset.UTC); |
||||
|
||||
private static WarehouseContext ctx() { |
||||
return WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, "RF_NY_US", |
||||
WarehouseConnection.of(YqnConstants.PR_BASE_URL, |
||||
ChannelSecret.builder().appSecret("key-1").build()), |
||||
"req-payload", CLOCK); |
||||
} |
||||
|
||||
private static OutboundCommand.Builder baseCommand() { |
||||
return OutboundCommand.builder() |
||||
.outboundRequestNo("OB-1") |
||||
.orderRef("AMZ-1") |
||||
.carrier("FEDEX") |
||||
.carrierCode("WLC-FEDEX") |
||||
.salesPlatform(Platform.AMAZON_SC) |
||||
.shipTo(ShipTo.builder() |
||||
.name("张三").phone("+1-555-0100") |
||||
.countryCode("US").stateOrProvince("NY").city("New York") |
||||
.addressLine1("1 Main St").postalCode("10001") |
||||
.build()) |
||||
.line(OutboundLine.builder() |
||||
.lineNo("1").omsSku("DM00001").quantity(2) |
||||
.declareValue(common.ecommerce.shared.support.Money.of("10.00", "USD")) |
||||
.build()); |
||||
} |
||||
|
||||
/** 平台面单:base64 必须随单下发给仓,否则仓没有面单可打。 */ |
||||
@Test |
||||
void platformLabelContentIsSentAsAttachment() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_ORDER_CREATE, req -> Responses.ok( |
||||
"{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{\"orderId\":123}}")); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
adapter.create(ctx(), baseCommand() |
||||
.labelMode(LabelMode.PLATFORM_LABEL) |
||||
.labelContentBase64("JVBERi0xLjQK") |
||||
.build()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(body.contains("\"attachInfoItems\""), body); |
||||
assertTrue(body.contains("\"file\":\"JVBERi0xLjQK\""), body); |
||||
assertTrue(body.contains("\"type\":0"), body); // 0 = 面单
|
||||
assertTrue(body.contains("\"fileType\":\"pdf\""), body); |
||||
} |
||||
|
||||
/** data URI 头要去掉,格式要从 MIME 里取。 */ |
||||
@Test |
||||
void dataUriIsStrippedAndFormatDetected() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_ORDER_CREATE, req -> Responses.ok( |
||||
"{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{\"orderId\":1}}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).create(ctx(), baseCommand() |
||||
.labelMode(LabelMode.PLATFORM_LABEL) |
||||
.labelContentBase64("data:image/png;base64,AAAA") |
||||
.build()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(body.contains("\"file\":\"AAAA\""), body); |
||||
assertTrue(body.contains("\"fileType\":\"png\""), body); |
||||
} |
||||
|
||||
/** 给了面单内容却是仓自有面单模式:拒绝,不静默丢弃。 */ |
||||
@Test |
||||
void labelContentWithoutPlatformModeIsRejected() { |
||||
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec()); |
||||
|
||||
assertThrows(IllegalArgumentException.class, () -> adapter.create(ctx(), baseCommand() |
||||
.labelMode(LabelMode.WAREHOUSE_LABEL) |
||||
.labelContentBase64("JVBERi0xLjQK") |
||||
.build())); |
||||
} |
||||
|
||||
/** 仓自有面单不带附件。 */ |
||||
@Test |
||||
void warehouseLabelSendsNoAttachment() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_ORDER_CREATE, req -> Responses.ok( |
||||
"{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{\"orderId\":1}}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()) |
||||
.create(ctx(), baseCommand().labelMode(LabelMode.WAREHOUSE_LABEL).build()); |
||||
|
||||
assertFalse(transport.lastDataRequest().body().contains("attachInfoItems")); |
||||
} |
||||
|
||||
@Test |
||||
void shopAndSfpAreSent() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_ORDER_CREATE, req -> Responses.ok( |
||||
"{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{\"orderId\":1}}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).create(ctx(), baseCommand() |
||||
.shopName("NYC-STORE") |
||||
.sfp(true) |
||||
.build()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(body.contains("\"channelAccount\":\"NYC-STORE\""), body); |
||||
assertTrue(body.contains("\"isPrime\":1"), body); |
||||
} |
||||
|
||||
@Test |
||||
void sfpFalseIsZeroNotEmpty() { |
||||
assertEquals(Integer.valueOf(0), YqnOutboundMapper.isPrimeOf(false)); |
||||
assertEquals(Integer.valueOf(1), YqnOutboundMapper.isPrimeOf(true)); |
||||
assertEquals(null, YqnOutboundMapper.isPrimeOf(null)); |
||||
} |
||||
|
||||
/** |
||||
* API 128 只能按来源单号查。之前把 orderRef(平台单号)当来源单号传, |
||||
* 会查不到或查错单——现在 orderRef 不参与查询。 |
||||
*/ |
||||
@Test |
||||
void queryDoesNotTreatOrderRefAsSourceNo() { |
||||
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec()); |
||||
|
||||
RuntimeException ex = assertThrows(RuntimeException.class, () -> adapter.query(ctx(), |
||||
common.ecommerce.warehouse.model.OutboundQuery.builder().orderRef("AMZ-1").build())); |
||||
assertTrue(ex.getMessage().contains("providerOrderId"), ex.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void queryByProviderOrderIdStillWorks() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_ORDER_FIND_ONE, req -> Responses.ok( |
||||
"{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{" |
||||
+ "\"orderNo\":\"OB-1\",\"orderStatusEnum\":\"PICKING\"}}")); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
assertEquals(1, adapter.query(ctx(), common.ecommerce.warehouse.model.OutboundQuery.builder() |
||||
.providerOrderId("OB-1").build()).size()); |
||||
} |
||||
|
||||
/** 运去哪下单接口没有拆单字段,能力位不能再声明 SPLIT。 */ |
||||
@Test |
||||
void splitIsNotDeclared() { |
||||
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec()); |
||||
assertFalse(adapter.capabilities().contains(WarehouseCapability.SPLIT)); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue