Browse Source

fix(yqn): 修复出库链路四处参数丢失 / 语义错误

逐字段审计「标准出入参 ↔ 运去哪出入参」后发现的问题,只修能明确判定为
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
chenchuchuan 1 week ago
parent
commit
4184b5aeaa
  1. 8
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/InventoryCapable.java
  2. 7
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java
  3. 14
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/PackageResult.java
  4. 28
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java
  5. 102
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java
  6. 10
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java
  7. 172
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java

8
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/InventoryCapable.java

@ -18,7 +18,13 @@ public interface InventoryCapable extends WarehouseAdapter { @@ -18,7 +18,13 @@ public interface InventoryCapable extends WarehouseAdapter {
/** 本仓支持的同步策略。 */
InventorySyncStrategy syncStrategy();
/** 查库存;{@code updatedAfter} 仅在 {@link InventorySyncStrategy#TIME_WINDOW} 下生效。 */
/**
* 查库存。
*
* <p>{@code updatedAfter} 仅在 {@link InventorySyncStrategy#TIME_WINDOW} 下生效。
* {@code providerSkus} 是<b>可选</b>过滤:不支持的仓会忽略它并返回整仓库存,
* 调用方不能假定过滤一定生效。</p>
*/
Page<InventorySnapshot> query(WarehouseContext ctx, InventoryQuery query);
/** 其他出入库 / 调拨;信仓无此能力,会抛 {@code WarehouseUnsupportedCapabilityException}。 */

7
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundQuery.java

@ -55,7 +55,12 @@ public final class OutboundQuery { @@ -55,7 +55,12 @@ public final class OutboundQuery {
return providerOrderId;
}
/** 按业务订单引用查。 */
/**
* 按业务订单引用(平台订单号)查。
*
* <p><b>并非所有仓都支持</b>:只按来源单号查的仓会忽略该条件,
* 因此查不到时不要断定「单不存在」。</p>
*/
public String orderRef() {
return orderRef;
}

14
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/PackageResult.java

@ -16,6 +16,8 @@ public final class PackageResult { @@ -16,6 +16,8 @@ public final class PackageResult {
private final String outboundRequestNo;
private final String trackingNumber;
private final String carrier;
/** 承运商 code(仓方口径);只有承运商名称时为 null。 */
private final String carrierCode;
private final String labelRef;
private final Money weight;
private final Instant shippedAt;
@ -31,6 +33,7 @@ public final class PackageResult { @@ -31,6 +33,7 @@ public final class PackageResult {
this.outboundRequestNo = requireText(b.outboundRequestNo, "outboundRequestNo");
this.trackingNumber = b.trackingNumber;
this.carrier = b.carrier;
this.carrierCode = b.carrierCode;
this.labelRef = b.labelRef;
this.weight = b.weight;
this.shippedAt = b.shippedAt;
@ -61,6 +64,11 @@ public final class PackageResult { @@ -61,6 +64,11 @@ public final class PackageResult {
}
/** 面单引用(面单 ID / 下载地址);面单本体用 {@code labels()} 取。 */
/** 承运商 code;仓方未给时为 null。 */
public String carrierCode() {
return carrierCode;
}
public String labelRef() {
return labelRef;
}
@ -101,6 +109,7 @@ public final class PackageResult { @@ -101,6 +109,7 @@ public final class PackageResult {
private String outboundRequestNo;
private String trackingNumber;
private String carrier;
private String carrierCode;
private String labelRef;
private Money weight;
private Instant shippedAt;
@ -128,6 +137,11 @@ public final class PackageResult { @@ -128,6 +137,11 @@ public final class PackageResult {
return this;
}
public Builder carrierCode(String carrierCode) {
this.carrierCode = carrierCode;
return this;
}
public Builder labelRef(String labelRef) {
this.labelRef = labelRef;
return this;

28
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java

@ -116,13 +116,13 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -116,13 +116,13 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
return java.util.EnumSet.of(
WarehouseCapability.PRODUCT,
WarehouseCapability.OUTBOUND,
WarehouseCapability.SPLIT,
WarehouseCapability.FEE_SETTLEMENT,
WarehouseCapability.FEE_ESTIMATE,
WarehouseCapability.INVENTORY_QUERY,
WarehouseCapability.INBOUND,
WarehouseCapability.BOX_LABEL,
WarehouseCapability.SKU_LABEL,
WarehouseCapability.PLATFORM_LABEL_DELIVERY,
WarehouseCapability.LOGISTICS_PRODUCT,
WarehouseCapability.WAREHOUSE_DIRECTORY,
WarehouseCapability.TRANSFER,
@ -153,6 +153,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -153,6 +153,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
@Override
public OutboundReceipt create(WarehouseContext ctx, OutboundCommand cmd) {
requirePlatformLabelSupported(ctx, cmd.labelMode());
requireLabelContentForPlatformLabel(cmd);
YqnDtos.CreateOrderRequest body = YqnOutboundMapper.toRequest(cmd, warehouseId(ctx, cmd.warehouseId()));
String raw = execute(ctx, YqnConstants.PATH_ORDER_CREATE, body, "warehouse.outbound.create");
@ -178,7 +179,8 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -178,7 +179,8 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
// API 128 只按来源单号查;仓内部 id 查不了,调用方要给 outboundRequestNo
String orderNo = orderNoOf(ref);
YqnDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.get");
return detail == null ? null : YqnOutboundMapper.toOrder(detail, ctx.warehouseCode(), zoneOf(ctx));
return detail == null ? null
: YqnOutboundMapper.toOrder(detail, null, null, ctx.warehouseCode(), zoneOf(ctx));
}
/**
@ -190,11 +192,14 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -190,11 +192,14 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public Page<OutboundOrder> query(WarehouseContext ctx, OutboundQuery query) {
String orderNo = firstNonBlank(query.providerOrderId(), query.orderRef());
// API 128 只能按「来源单号」查:仓内部 id 与平台单号都查不了。
// orderRef 是平台单号,拿它当来源单号查会查不到或查错单,因此不参与查询。
String orderNo = firstNonBlank(query.providerOrderId(), null);
if (orderNo == null) {
throw new common.ecommerce.shared.error.ValidationException(
WarehouseException.builder()
.message("yqn has no order list API; query requires providerOrderId or orderRef")
.message("yqn has no order list API; query requires providerOrderId "
+ "(orderRef is a platform order number and is not queryable here)")
.operation("warehouse.outbound.query")
.warehouseCode(ctx.warehouseCode())
.provider(provider().name())
@ -204,7 +209,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -204,7 +209,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
YqnDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.query");
return detail == null ? Page.<OutboundOrder>empty()
: Page.last(java.util.Collections.singletonList(
YqnOutboundMapper.toOrder(detail, ctx.warehouseCode(), zoneOf(ctx))));
YqnOutboundMapper.toOrder(detail, null, null, ctx.warehouseCode(), zoneOf(ctx))));
}
/** 调 findOne 并解析 data;订单不存在时返回 null。 */
@ -726,6 +731,19 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -726,6 +731,19 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
// ------------------------------------------------------------------ internals
/** 面单模式必须与仓能力匹配;不支持时拒绝,不静默降级。 */
/**
* 平台面单必须带面单文件:只声明 {@code PLATFORM_LABEL} 却不给
* {@code labelContentBase64},仓没有面单可打,等于静默失败。
*/
private static void requireLabelContentForPlatformLabel(OutboundCommand cmd) {
if (cmd.labelMode() == LabelMode.PLATFORM_LABEL
&& (cmd.labelContentBase64() == null || cmd.labelContentBase64().trim().isEmpty())) {
throw new IllegalArgumentException(
"labelContentBase64 is required when labelMode=PLATFORM_LABEL for "
+ cmd.outboundRequestNo());
}
}
private void requirePlatformLabelSupported(WarehouseContext ctx, LabelMode mode) {
if (mode == LabelMode.PLATFORM_LABEL && !supports(ctx.warehouseCode(),
WarehouseCapability.PLATFORM_LABEL_DELIVERY)) {

102
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java

@ -2,6 +2,7 @@ package common.ecommerce.yqn.adapter; @@ -2,6 +2,7 @@ package common.ecommerce.yqn.adapter;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.enums.CancelEligibility;
import common.ecommerce.warehouse.enums.LabelMode;
import common.ecommerce.warehouse.model.OutboundCommand;
import common.ecommerce.warehouse.model.OutboundLine;
import common.ecommerce.warehouse.model.OutboundOrder;
@ -37,6 +38,9 @@ public final class YqnOutboundMapper { @@ -37,6 +38,9 @@ public final class YqnOutboundMapper {
/** 运去哪时间按仓所在地解释;账户未配时回退北京时区。 */
private static final ZoneId DEFAULT_ZONE = ZoneId.of("Asia/Shanghai");
/** 附件类型:0 面单 / 1 装箱单 / 2 BOL / 3 其他 / 4 箱标 / 5 托盘标 / 6 商品标 / 7 发票 / 8 发货计划。 */
private static final int ATTACH_TYPE_SHIPPING_LABEL = 0;
/** 运去哪下单币种默认 USD。 */
private static final String DEFAULT_CURRENCY = "USD";
@ -57,6 +61,10 @@ public final class YqnOutboundMapper { @@ -57,6 +61,10 @@ public final class YqnOutboundMapper {
req.estimatedDeliveryTime = formatTime(cmd.estimatedDeliveryTime());
req.salesPlatform = salesPlatformOf(cmd.salesPlatform());
req.remark = cmd.remark();
// 店铺:仓方按店铺做路由/计费;标准模型对应 shopName
req.channelAccount = cmd.shopName();
// SFP / VC 标识:1=SFP 2=VC;不传由仓按非 SFP 处理
req.isPrime = isPrimeOf(cmd.sfp());
ShipTo shipTo = cmd.shipTo();
req.shipToCountry = shipTo.countryCode();
@ -73,6 +81,7 @@ public final class YqnOutboundMapper { @@ -73,6 +81,7 @@ public final class YqnOutboundMapper {
req.productItems = toProductItems(cmd.lines());
req.packageItems = toPackageItems(cmd.packages());
req.attachInfoItems = toAttachInfoItems(cmd, warehouseCode);
return req;
}
@ -161,6 +170,78 @@ public final class YqnOutboundMapper { @@ -161,6 +170,78 @@ public final class YqnOutboundMapper {
return out;
}
/** SFP 标识 → 运去哪 isPrime:SFP=1 / VC=2;null 不传(仓按非 SFP 处理)。 */
static Integer isPrimeOf(Boolean sfp) {
return sfp == null ? null : (sfp ? 1 : 0);
}
/**
* 平台面单 → 运去哪附件 {@code attachInfoItems}。
*
* <p>这是 {@link LabelMode#PLATFORM_LABEL} 的实际落点:面单文件必须随单下发,
* 否则仓没有面单可打印。{@code packageNo} 与包裹的 {@code refNo} 一致,
* 只有一个包裹时把 {@code refNo} 带过去。</p>
*
* <p>仓自有面单({@link LabelMode#WAREHOUSE_LABEL})或未给内容时返回 null。</p>
*/
private static List<YqnDtos.CreateOrderRequest.AttachInfoItem> toAttachInfoItems(
OutboundCommand cmd, String warehouseCode) {
String content = cmd.labelContentBase64();
if (content == null || content.trim().isEmpty()) {
return null;
}
if (cmd.labelMode() != LabelMode.PLATFORM_LABEL) {
// 给了面单内容却不是平台面单模式:不静默丢弃,直接拒绝
throw new IllegalArgumentException(
"labelContentBase64 requires labelMode=PLATFORM_LABEL for "
+ cmd.outboundRequestNo() + " (warehouse " + warehouseCode + ")");
}
YqnDtos.CreateOrderRequest.AttachInfoItem item =
new YqnDtos.CreateOrderRequest.AttachInfoItem();
// 附件名建议用 TrackingNo 且不带后缀;没有运单号时退回出库单号
item.name = firstNonBlank(cmd.trackingNumber(), cmd.outboundRequestNo());
String base64 = stripDataUri(content);
String format = dataUriFormat(content);
item.file = base64;
item.fileType = format == null ? "pdf" : format;
item.type = ATTACH_TYPE_SHIPPING_LABEL;
List<OutboundPackageSpec> packages = cmd.packages();
if (packages != null && packages.size() == 1) {
item.packageNo = packages.get(0).refNo();
}
List<YqnDtos.CreateOrderRequest.AttachInfoItem> out =
new ArrayList<YqnDtos.CreateOrderRequest.AttachInfoItem>(1);
out.add(item);
return out;
}
/** 去掉 {@code data:xxx/base64,} 头;没有头时原样返回。 */
static String stripDataUri(String content) {
if (content == null) {
return null;
}
int comma = content.indexOf(',');
if (content.startsWith("data:") && comma > 0) {
return content.substring(comma + 1);
}
return content;
}
/** 从 {@code data:application/pdf;base64,} 里取格式;取不到返回 null。 */
static String dataUriFormat(String content) {
if (content == null || !content.startsWith("data:")) {
return null;
}
int semi = content.indexOf(';');
int comma = content.indexOf(',');
if (semi <= 5 || comma < 0) {
return null;
}
String mime = content.substring(5, semi);
int slash = mime.indexOf('/');
return slash < 0 || slash == mime.length() - 1 ? null : mime.substring(slash + 1);
}
/** 运去哪时间格式 {@code yyyy-MM-dd HH:mm:ss}。 */
static String formatTime(Instant instant) {
return instant == null ? null : TIME_FORMAT.format(instant.atZone(DEFAULT_ZONE));
@ -168,11 +249,25 @@ public final class YqnOutboundMapper { @@ -168,11 +249,25 @@ public final class YqnOutboundMapper {
/** 订单详情 → 统一出库单(API 128)。 */
public static OutboundOrder toOrder(YqnDtos.OrderDetail detail, String warehouseCode, ZoneId zone) {
return toOrder(detail, null, null, warehouseCode, zone);
}
/**
* 订单详情 → 统一出库单(API 128)。
*
* @param requestedLabelMode 下单时的面单模式;API 128 不回传,查询侧无法得知,
* 只能由调用方带过来(null 时按仓自有面单兜底)
* @param requestedAt 下单时间;API 128 不回传,同样由调用方带过来
*/
public static OutboundOrder toOrder(YqnDtos.OrderDetail detail, LabelMode requestedLabelMode,
Instant requestedAt, String warehouseCode, ZoneId zone) {
List<YqnDtos.OrderDetail.ShipmentPackage> shippedPackages = shippedPackagesOf(detail);
return OutboundOrder.builder()
OutboundOrder.Builder builder = OutboundOrder.builder()
.warehouseCode(firstNonBlank(detail.warehouseCode, warehouseCode))
.outboundRequestNo(firstNonBlank(detail.orderNo, null))
.orderRef(null) // API 128 不返回平台单号
.labelMode(requestedLabelMode)
.requestedAt(requestedAt)
.status(YqnOutboundStatus.of(detail.orderStatusEnum).toCore())
.rawStatus(detail.orderStatusEnum)
.carrier(packagesCarrierOf(shippedPackages, detail.carrierCode))
@ -185,8 +280,8 @@ public final class YqnOutboundMapper { @@ -185,8 +280,8 @@ public final class YqnOutboundMapper {
.shipTo(toShipTo(detail))
.exceptionCode(exceptionOf(detail.errorCode))
.estimatedShippingFee(moneyOrNull(detail.estimatedShippingFee, detail.currency))
.sourceProvider(WarehouseProvider.YQN)
.build();
.sourceProvider(WarehouseProvider.YQN);
return builder.build();
}
/**
@ -228,6 +323,7 @@ public final class YqnOutboundMapper { @@ -228,6 +323,7 @@ public final class YqnOutboundMapper {
.outboundRequestNo(orderNo)
.trackingNumber(tracking)
.carrier(pkg.carrier)
.carrierCode(pkg.carrierCode)
.carrierServiceCode(pkg.carrierServiceCode)
.erpSku(pkg.erpSku)
.shippedQuantity(pkg.shipedQuantity)

10
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java

@ -98,14 +98,18 @@ class YqnAdapterTest { @@ -98,14 +98,18 @@ class YqnAdapterTest {
assertEquals("token-1", transport.recorded().get(0).headers().get(YqnConstants.TOKEN_HEADER));
}
/**
* 平台面单能力已声明(面单内容会作为附件下发,见 YqnOutboundPayloadTest);
* 但没给面单文件时必须拒绝,否则仓拿不到面单可打。
*/
@Test
void platformLabelWithoutCapabilityIsRejected() {
void platformLabelWithoutContentIsRejected() {
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec());
assertFalse(adapter.capabilities().contains(WarehouseCapability.PLATFORM_LABEL_DELIVERY));
assertTrue(adapter.capabilities().contains(WarehouseCapability.PLATFORM_LABEL_DELIVERY));
RuntimeException ex = org.junit.jupiter.api.Assertions.assertThrows(RuntimeException.class,
() -> adapter.create(ctx(), command("OB-2", LabelMode.PLATFORM_LABEL)));
assertTrue(ex.getMessage().contains("PLATFORM_LABEL_DELIVERY"), ex.getMessage());
assertTrue(ex.getMessage().contains("labelContentBase64"), ex.getMessage());
}
@Test

172
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOutboundPayloadTest.java

@ -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…
Cancel
Save