diff --git a/README.md b/README.md index 9b9d0ca..55c4157 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ sequenceDiagram | `warehouse-sdk-testkit` | 仓库域测试替身:InMemory 仓仓库 / 落库 / 去重、FakeWarehouseAdapter | | `common-ecommerce-lingxing` | 领星聚合适配器(多子平台)。DTO 用 Lombok 生成访问器 | | `warehouse-sdk-yqn` | 运去哪三方仓适配器(P1 出库闭环,组织级固定 token 鉴权) | -| `warehouse-sdk-xincang` | 信仓三方仓适配器(本轮只落地登录换 token;能力位留空) | +| `warehouse-sdk-xincang` | 信仓三方仓适配器(登录换 token、商品建档、一单多件下单、转运创建 / 审核) | 依赖方向: ``` @@ -329,11 +329,12 @@ common.ecommerce │ └── http YqnRequestFactory / YqnEnvelope / YqnRateLimiter │ └── xincang 信仓三方仓(warehouse-sdk-xincang) - ├── XincangConstants 测试基址、登录路径、query 参数名、限流 + ├── XincangConstants 测试基址、路径、query 参数名、单位换算常量、限流 ├── auth XincangTokenClient(GET /api.login,无 refresh) - ├── adapter XincangAdapter(本轮仅登录) / XincangAdapterFactory - ├── dto XincangDtos.LoginResponse - └── http XincangRequestFactory / XincangEnvelope / XincangRateLimiter + ├── adapter XincangAdapter / XincangAdapterFactory / + │ XincangProductMapper / XincangOrderMapper / XincangTransferMapper + ├── dto XincangDtos(登录 / 商品) + └── http XincangRequestFactory / XincangMultipart / XincangEnvelope / XincangRateLimiter ``` 包名统一前缀 `common.ecommerce.`,下表省略前缀。 @@ -923,7 +924,7 @@ mvn test # 全部 mvn -pl lingxing test # 单模块 mvn -pl lingxing -Dtest=LingxingSdkListingCallTest test mvn -pl warehouse-sdk-yqn test # 运去哪 P1 契约测试 -mvn -pl warehouse-sdk-xincang -am test # 信仓登录 / 令牌缓存 +mvn -pl warehouse-sdk-xincang -am test # 信仓登录 / 商品 / 下单 / 转运 ``` --- diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/TransferCapable.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/TransferCapable.java index 7c91790..ff69988 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/TransferCapable.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/capability/TransferCapable.java @@ -21,4 +21,19 @@ public interface TransferCapable extends WarehouseAdapter { * 仓不支持该调拨类型 */ TransferOrder create(WarehouseContext ctx, TransferCommand cmd); + + /** + * 审核通过调拨单。写操作,幂等键 + * {@code warehouseCode + transferRequestNo + "approve"}。 + * + *
信仓的「转运审核」({@code POST fba.do_approve})走这里: + * {@code transferRequestNo} 传仓侧转运单号(信仓 {@code order_no}, + * 即 {@code create} 返回的 {@code providerTransferNo})。
+ * + *没有审核环节的仓默认拒绝,不静默当作成功。
+ */ + default void approve(WarehouseContext ctx, String transferRequestNo) { + throw new common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException( + common.ecommerce.warehouse.enums.WarehouseCapability.TRANSFER); + } } diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundCommand.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundCommand.java index f056693..f662b0f 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundCommand.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundCommand.java @@ -40,6 +40,13 @@ public final class OutboundCommand { private final Instant estimatedDeliveryTime; /** 下单币种;null 时为 USD。 */ private final String currency; + /** + * 仓侧拆单开关;null 表示按仓的默认规则。 + * + *仅对声明了 {@code WarehouseCapability.SPLIT} 的仓有意义。 + * 信仓 {@code is_split}:true 拆成一单一品(每件一张面单),false 打包成一张面单。
+ */ + private final Boolean splitOrder; private OutboundCommand(Builder b) { if (b.outboundRequestNo == null || b.outboundRequestNo.trim().isEmpty()) { @@ -65,6 +72,7 @@ public final class OutboundCommand { this.latestShipDate = b.latestShipDate; this.estimatedDeliveryTime = b.estimatedDeliveryTime; this.currency = b.currency; + this.splitOrder = b.splitOrder; } public static Builder builder() { @@ -146,6 +154,16 @@ public final class OutboundCommand { return currency; } + /** + * 仓侧拆单开关;null 表示按仓默认规则。 + * + *只有声明了 {@code WarehouseCapability.SPLIT} 的仓会解释该值, + * 其余适配器应忽略它,不得自行编造拆单行为。
+ */ + public Boolean splitOrder() { + return splitOrder; + } + public static final class Builder { private String outboundRequestNo; @@ -164,6 +182,7 @@ public final class OutboundCommand { private Instant latestShipDate; private Instant estimatedDeliveryTime; private String currency; + private Boolean splitOrder; public Builder outboundRequestNo(String outboundRequestNo) { this.outboundRequestNo = outboundRequestNo; @@ -253,6 +272,12 @@ public final class OutboundCommand { return this; } + /** 仓侧拆单开关;null 表示按仓默认规则。 */ + public Builder splitOrder(Boolean splitOrder) { + this.splitOrder = splitOrder; + return this; + } + public OutboundCommand build() { return new OutboundCommand(this); } diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/TransferCommand.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/TransferCommand.java index cbedd86..c79f690 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/TransferCommand.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/TransferCommand.java @@ -2,6 +2,8 @@ package common.ecommerce.warehouse.model; import common.ecommerce.warehouse.enums.TransferType; +import java.util.List; + /** * 调拨单创建命令。写操作,幂等键是 {@link #transferRequestNo()}(仓方的 {@code sourceNo})。 * @@ -39,6 +41,32 @@ public final class TransferCommand { private final java.util.List仓侧只接受它自己字典里的值,因此这里保存仓方原文(由调用方从仓的字典接口取), + * SDK 不做枚举归一,免得联想出仓方不认的标签名。
+ */ + private final List文档确认的鉴权方式:{@code GET /api.login?appkey=&secret=} 换取客户级 token, - * 有效期 2 小时、无 refresh 接口;业务请求把 token 放在 query 参数 {@code token} 里。 - * 本轮只落地登录与令牌缓存,出库 / 库存 / 预报等能力位一律不声明, - * 门面调用这些能力会显式抛 {@code WarehouseUnsupportedCapabilityException}。
+ * 有效期 2 小时、无 refresh 接口;业务请求把 token 放在 query 参数 {@code token} 里 + * (新增 / 更新产品的请求体 schema 里也要求一份,见 {@link XincangRequestFactory})。 + * + *已实现能力:商品建档 / 更新({@code PRODUCT})、出库下单({@code OUTBOUND})、 + * 转运创建 / 审核({@code TRANSFER})。出库的查询 / 取消 / 包裹字段未接入, + * 调用会显式抛不支持异常,不返回空集合。
* *适配器只持有协议与基础设施,不持有端点与凭据——两者随每次调用经 * {@code WarehouseConnection} 传入。
*/ -public final class XincangAdapter implements WarehouseAdapter { +public final class XincangAdapter implements WarehouseProductCapable, OutboundCapable, + TransferCapable { + + private static final String OP_PRODUCT_QUERY = "warehouse.product.query"; + private static final String OP_PRODUCT_ADD = "warehouse.product.add"; + private static final String OP_PRODUCT_UPDATE = "warehouse.product.update"; + + /** 查重时只取一页;按 SKU 过滤后通常 0~1 条。 */ + private static final int PRODUCT_QUERY_LIMIT = 100; + /** 信仓产品状态:0 临时产品。 */ + private static final String STATE_TEMPORARY = XincangConstants.PRODUCT_STATE_TEMPORARY; + private final HttpTransport transport; + private final JacksonJsonCodec json; private final XincangTokenClient tokenClient; private final TokenManager tokenManager; + private final XincangRequestFactory requestFactory; + private final XincangRateLimiter rateLimiter; - public XincangAdapter(HttpTransport transport, JsonCodec json, + public XincangAdapter(HttpTransport transport, JacksonJsonCodec json, TokenStore tokenStore, LockProvider lockProvider, Clock clock) { + this.transport = transport; + this.json = json; this.tokenClient = new XincangTokenClient(transport, json, clock); // 信仓 token 2h、无 refresh 接口:到期前 10 分钟重新登录换取; // TokenManager 负责锁内防击穿与缓存读写,缓存键按 appkey(客户级)。 @@ -45,6 +91,8 @@ public final class XincangAdapter implements WarehouseAdapter { return tokenClient.fetch(secret.endpointBaseUrl(), secret.appKey(), secret.appSecret()); } }; + this.requestFactory = new XincangRequestFactory(json); + this.rateLimiter = new XincangRateLimiter(); } @Override @@ -57,10 +105,10 @@ public final class XincangAdapter implements WarehouseAdapter { return WarehouseProvider.XINCANG; } - /** 本期没有已实现的能力;后续接入业务接口时再逐个声明。 */ @Override public EnumSet信仓没有 upsert 接口,按「先查临时产品、有则更新、无则新增」实现:
+ *{@code api.productlist} 的 {@code key} 是 SKU 过滤条件,但文档没说是否精确匹配, + * 这里再按 {@code product_no} 精确比对一次。
+ */ + private XincangDtos.ProductListItem findTemporaryProduct(WarehouseContext ctx, AccessToken token, + String sku) { + Map信仓下单有两个接口:{@code api.add_order}(一票一件)与 + * {@code api.add_order_multiple}(一单多件)。统一模型允许一单多行, + * 所以这里固定走多件接口;单行订单也走它。
+ * + *该接口是 {@code multipart/form-data},{@code products} 字段本身是一段 JSON; + * 返回的 {@code rst.order_no} 是信仓系统单号({@code DS-...}), + * {@code rst.order_id} 是内部 id,优先取单号。
+ * + *查询 / 取消 / 包裹等接口本轮未接入,调用会显式抛不支持异常。
+ */ + @Override + public OutboundReceipt create(WarehouseContext ctx, OutboundCommand cmd) { + Map信仓的转运是从信仓发往平台仓,统一模型里用 {@code TransferType.OUTBOUND}。 + * 字典字段(订单类型 / 转运类型 / 转运方式 / 标签需求)只接受信仓字典原值, + * 由调用方传入,SDK 不做归一。
+ */ + @Override + public TransferOrder create(WarehouseContext ctx, TransferCommand cmd) { + String productsJson = json.toJson(XincangTransferMapper.products(cmd)); + XincangDtos.TransferRequest body = XincangTransferMapper.toRequest(cmd, ctx, productsJson); + String raw = execute(ctx, XincangConstants.PATH_TRANSFER_CREATE, body, login(ctx), + "warehouse.transfer.create"); + XincangDtos.TransferResult result = json.fromJson(raw, XincangDtos.TransferResponse.class).rst; + if (result == null || blank(result.orderNo)) { + throw WarehouseException.builder() + .message("xincang transfer returned no rst.order_no: " + safeRelay(raw)) + .operation("warehouse.transfer.create") + .warehouseCode(ctx.warehouseCode()) + .provider(provider().name()) + .requestId(ctx.requestId()) + .retryable(false) + .rawResponse(safeRelay(raw)) + .build(); + } + return XincangTransferMapper.toCreated(cmd, result.orderNo); + } + + /** + * 转运审核({@code POST fba.do_approve?token=&order_no=})。 + * + *注意是 POST 但无请求体,参数全在 query。
+ * + * @param transferRequestNo 信仓转运单号,即 {@link #create} 返回的 {@code providerTransferNo} + */ + @Override + public void approve(WarehouseContext ctx, String transferRequestNo) { + Map该接口是 {@code multipart/form-data},{@code products} 字段本身是一段 JSON 字符串。 + * 平台字段名只出现在本类与 {@link XincangDtos}。
+ * + *文档没有对应字段的就不发:申报信息(HS / 原产国 / 申报价值)、包裹尺寸等 + * 统一模型里有,但信仓这版接口不收,硬塞只会被忽略或报错。
+ */ +public final class XincangOrderMapper { + + /** 信仓要求发货时间格式 {@code yyyy-MM-dd HH:mm:ss}(北京时间)。 */ + private static final DateTimeFormatter REQUIRED_DELIVERY_TIME = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + /** 地址 1 上限 32 字符,超出部分走 address2。 */ + private static final int ADDRESS_MAX = 32; + /** 订单类型:信仓只接受 common / wayfair。 */ + static final String ORDER_TYPE_COMMON = "common"; + static final String ORDER_TYPE_WAYFAIR = "wayfair"; + /** 签名服务:信仓只收「是 / 否」,模型里没有该字段,默认否。 */ + private static final String SIGN_NOT_REQUIRED = "否"; + + private XincangOrderMapper() { + } + + /** + * 统一命令 → 信仓一单多件下单表单。 + * + * @param ctx 本次调用上下文(取仓编码) + * @param cmd 出库命令 + * @param json 用于序列化 {@code products} + * @throws ValidationException 缺少仓编码或收件人必填项 + */ + public static MapWayfair 渠道走 {@code wayfair};其余平台走 {@code common}。 + * 信仓不区分其它平台,不做臆造映射。
+ */ + static String orderTypeOf(Platform platform) { + return platform == Platform.WAYFAIR ? ORDER_TYPE_WAYFAIR : ORDER_TYPE_COMMON; + } + + /** 地址超过 32 字符的部分截到 address2,避免被仓侧截断丢信息。 */ + static Address splitAddress(String address) { + String trimmed = address.trim(); + if (trimmed.length() <= ADDRESS_MAX) { + return new Address(trimmed, null); + } + return new Address(trimmed.substring(0, ADDRESS_MAX), trimmed.substring(ADDRESS_MAX)); + } + + /** 拆好的地址。 */ + static final class Address { + final String line1; + final String line2; + + Address(String line1, String line2) { + this.line1 = line1; + this.line2 = line2; + } + } + + private static void putIfPresent(Map平台字段名只出现在本类与 {@link XincangDtos}。单位换算也在这里: + * 统一模型用 cm / g,信仓用 inch / lbs,按 {@link XincangConstants} 里的常量换算并保留 4 位小数 + * (文档「最长四位小数」)。
+ * + *文档未定义「包装方式 / 是否 SN / 客退处理 / 海关信息」等字段,这些统一模型字段 + * 不发送,避免自行编造平台不认的键。
+ */ +public final class XincangProductMapper { + + /** 文档限制:数量类字段最长四位小数。 */ + private static final int SCALE = 4; + /** 金额最长两位小数。 */ + private static final int AMOUNT_SCALE = 2; + /** 装箱率未提供时按 1 发送(必填项)。 */ + private static final int DEFAULT_PACKING_RATE = 1; + + private XincangProductMapper() { + } + + /** + * 统一商品 → 信仓新增 / 更新请求。 + * + * @param product 已通过 {@link WarehouseProduct} 构造期校验的商品 + * @param token 业务令牌;两个接口的请求体都要求 + * @throws IllegalArgumentException 申报价值不是美元(信仓 amount 固定 USD) + */ + public static XincangDtos.ProductRequest toRequest(WarehouseProduct product, String token) { + XincangDtos.ProductRequest req = new XincangDtos.ProductRequest(); + req.token = token; + req.productNo = skuOf(product); + req.chnName = product.name(); + req.amount = amount(product.declaredValue()); + req.barCode = barcodeOf(product); + req.weightLbs = decimal(product.weightGrams()) + .divide(decimal(XincangConstants.GRAMS_PER_POUND), SCALE, RoundingMode.HALF_UP); + req.packingRate = DEFAULT_PACKING_RATE; + req.sizeLLn = inches(product.lengthCm()); + req.sizeWLn = inches(product.widthCm()); + req.sizeHLn = inches(product.heightCm()); + req.remark = trimToNull(product.remark()); + req.ckm = trimToNull(product.customItemNo()); + req.productType = product.productType() > 0 ? product.productType() : null; + return req; + } + + /** 仓侧 SKU 优先;没有映射时用 OMS 主 SKU。 */ + public static String skuOf(WarehouseProduct product) { + String providerSku = product.providerSku(); + if (providerSku != null && !providerSku.trim().isEmpty()) { + return providerSku.trim(); + } + return product.omsSku(); + } + + /** + * 条码:统一模型未给条码时退回 SKU。 + * + *信仓把 {@code bar_code} 列为必填且查重(重复会报「产品条形码已存在」), + * 用 SKU 兜底可以保证单次建档能通过;调用方应尽量显式给真实条码。
+ */ + public static String barcodeOf(WarehouseProduct product) { + String barcode = product.barcode(); + if (barcode != null && !barcode.trim().isEmpty()) { + return barcode.trim(); + } + return skuOf(product); + } + + /** + * 金额:取申报价值。 + * + *信仓 {@code amount} 固定美元且最多两位小数,其他币种直接拒绝,避免静默按美元记错价。 + * 未给申报价值时按 0.00 发送(文档必填项)。
+ */ + private static BigDecimal amount(Money declaredValue) { + if (declaredValue == null) { + return BigDecimal.ZERO.setScale(AMOUNT_SCALE, RoundingMode.UNNECESSARY); + } + if (!"USD".equalsIgnoreCase(declaredValue.currencyCode())) { + throw new IllegalArgumentException( + "xincang product amount is USD only, got " + declaredValue.currencyCode()); + } + return declaredValue.amount().setScale(AMOUNT_SCALE, RoundingMode.HALF_UP); + } + + private static BigDecimal inches(double cm) { + return decimal(cm).divide(decimal(XincangConstants.CENTIMETERS_PER_INCH), SCALE, RoundingMode.HALF_UP); + } + + private static BigDecimal decimal(double value) { + return BigDecimal.valueOf(value); + } + + private static String trimToNull(String v) { + if (v == null) { + return null; + } + String trimmed = v.trim(); + return trimmed.isEmpty() ? null : trimmed; + } +} diff --git a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangTransferMapper.java b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangTransferMapper.java new file mode 100644 index 0000000..cb78a41 --- /dev/null +++ b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangTransferMapper.java @@ -0,0 +1,154 @@ +package common.ecommerce.xincang.adapter; + +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.error.ValidationException; +import common.ecommerce.warehouse.enums.WarehouseProvider; +import common.ecommerce.warehouse.model.TransferCommand; +import common.ecommerce.warehouse.model.TransferOrder; +import common.ecommerce.warehouse.enums.TransferStatus; +import common.ecommerce.warehouse.enums.TransferType; +import common.ecommerce.warehouse.sdk.WarehouseContext; +import common.ecommerce.xincang.dto.XincangDtos; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + +/** + * 信仓转运 / 调拨报文映射({@code POST fba.do_fba})。 + * + *信仓的「转运」= 从信仓发货到平台仓(FBA / 其它),在统一模型里对应 + * {@link TransferType#OUTBOUND}:发货仓是信仓自己,目的仓是平台仓。
+ * + *字典字段({@code order_type} / {@code delivery_mode} / {@code delivery_way} / + * {@code label_requirement})信仓只认它自己字典的原值,调用方需从字典接口取; + * SDK 不做枚举归一,也不猜测取值。
+ */ +public final class XincangTransferMapper { + + private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + /** 目的仓不在字典里时的固定写法(文档要求)。 */ + static final String OTHER_WAREHOUSE_NAME = "其他仓库"; + /** 标签需求多选分隔符。 */ + private static final String LABEL_SEPARATOR = ","; + + private XincangTransferMapper() { + } + + /** 统一命令 → 信仓新增转运请求。 */ + public static XincangDtos.TransferRequest toRequest(TransferCommand cmd, WarehouseContext ctx, + String productsJson) { + if (cmd.type() != TransferType.OUTBOUND) { + throw validation(ctx, "xincang transfer only supports OUTBOUND (warehouse -> platform), got " + + cmd.type()); + } + XincangDtos.TransferRequest req = new XincangDtos.TransferRequest(); + req.fbaNo = cmd.transferRequestNo(); + req.po = firstNonBlank(cmd.po(), cmd.transferRequestNo()); + req.fromWarehouseName = require(cmd.fromWarehouseCode(), + "fromWarehouseCode (信仓 from_warehouse_name)", ctx); + req.destWarehouseName = require(cmd.toWarehouseCode(), + "toWarehouseCode (信仓 dest_warehouse_name)", ctx); + req.otherWarehouse = blankToNull(cmd.otherWarehouseName()); + req.orderType = blankToNull(cmd.orderType()); + req.deliveryMode = require(cmd.deliveryMode(), "deliveryMode (信仓转运类型字典值)", ctx); + req.deliveryWay = require(cmd.deliveryWay(), "deliveryWay (信仓转运方式字典值)", ctx); + req.preSendTime = formatDate(cmd.estimateOutboundDate()); + if (req.preSendTime == null) { + throw validation(ctx, "estimateOutboundDate is required (信仓 pre_send_time)"); + } + if (cmd.palletRequired() == null) { + throw validation(ctx, "palletRequired is required (信仓 is_pallet)"); + } + req.isPallet = booleanText(cmd.palletRequired()); + req.labelRequirement = cmd.labelRequirements().isEmpty() ? null : join(cmd.labelRequirements()); + req.products = productsJson; + req.remark = blankToNull(cmd.remark()); + req.productPrintCopies = copies(cmd.productLabelCopies()); + req.ctnPrintCopies = copies(cmd.cartonLabelCopies()); + req.palletPrintCopies = copies(cmd.palletLabelCopies()); + return req; + } + + /** 转运单创建结果 → 统一模型;信仓只回 {@code order_no},其余字段留空。 */ + public static TransferOrder toCreated(TransferCommand cmd, String providerTransferNo) { + return TransferOrder.builder() + .transferRequestNo(cmd.transferRequestNo()) + .providerTransferNo(providerTransferNo) + .fromWarehouseCode(cmd.fromWarehouseCode()) + .toWarehouseCode(cmd.toWarehouseCode()) + .type(cmd.type()) + // 新增成功后处于待审核;审核走 approve + .status(TransferStatus.PENDING_REVIEW) + .rawStatus("0") + .build(); + } + + /** 产品明细:{@code [{"product_no":"SKU","sku_count":"1"}]}。 */ + public static List本轮只接入「新增订单」与「转运创建 / 审核」,查询、取消、包裹都还没接。 + * 这里统一抛 {@link ValidationException}({@code retryable=false}),不返回空集合—— + * 静默返回 {@code null} / 空会让调用方以为「仓说没有这单」。
+ */ +final class XincangUnsupportedOutbound { + + private XincangUnsupportedOutbound() { + } + + static ValidationException queryUnsupported(WarehouseContext ctx) { + throw unsupported(ctx, "warehouse.outbound.query"); + } + + static ValidationException getUnsupported(WarehouseContext ctx) { + throw unsupported(ctx, "warehouse.outbound.get"); + } + + static ValidationException checkCancelUnsupported(WarehouseContext ctx) { + throw unsupported(ctx, "warehouse.outbound.checkCancel"); + } + + static ValidationException cancelUnsupported(WarehouseContext ctx) { + throw unsupported(ctx, "warehouse.outbound.cancel"); + } + + static ValidationException packagesUnsupported(WarehouseContext ctx) { + throw unsupported(ctx, "warehouse.outbound.packages"); + } + + private static ValidationException unsupported(WarehouseContext ctx, String operation) { + return new ValidationException(ChannelException.builder() + .message("xincang does not implement " + operation + " yet") + .operation(operation) + .provider(WarehouseProvider.XINCANG.name()) + .requestId(ctx.requestId()) + .retryable(false)); + } +} diff --git a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/dto/XincangDtos.java b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/dto/XincangDtos.java index 4333d81..5cd7db0 100644 --- a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/dto/XincangDtos.java +++ b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/dto/XincangDtos.java @@ -1,8 +1,11 @@ package common.ecommerce.xincang.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; + /** * 信仓报文结构。 * @@ -65,4 +68,265 @@ public final class XincangDtos { @JsonProperty("token") public String token; } + + /** + * 新增 / 更新产品请求({@code POST api.add_product} / {@code api.update_product})。 + * + *信仓这两个接口的 {@code token} 放在 请求体里(文档 required 列表含 {@code token}); + * 新增接口的 query 里同时也收一份,见 {@code XincangRequestFactory}。
+ * + *单位:金额美元、尺寸英寸、重量磅;与统一模型(cm / g)的换算在 + * {@code XincangProductMapper}。
+ */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class ProductRequest { + + /** 令牌。 */ + @JsonProperty("token") + public String token; + + /** 产品 SKU。 */ + @JsonProperty("product_no") + public String productNo; + + /** 中文名。 */ + @JsonProperty("chn_name") + public String chnName; + + /** 金额,美元,最长两位小数。 */ + @JsonProperty("amount") + public BigDecimal amount; + + /** 产品条码。 */ + @JsonProperty("bar_code") + public String barCode; + + /** 毛重,磅,最长四位小数。 */ + @JsonProperty("weight_lbs") + public BigDecimal weightLbs; + + /** 装箱率 / 箱率。 */ + @JsonProperty("packing_rate") + public Integer packingRate; + + /** 长,英寸,最长四位小数。 */ + @JsonProperty("size_l_ln") + public BigDecimal sizeLLn; + + /** 宽,英寸,最长四位小数。 */ + @JsonProperty("size_w_ln") + public BigDecimal sizeWLn; + + /** 高,英寸,最长四位小数。 */ + @JsonProperty("size_h_ln") + public BigDecimal sizeHLn; + + /** 备注。 */ + @JsonProperty("remark") + public String remark; + + /** 仓库码(信仓 {@code ckm})。 */ + @JsonProperty("ckm") + public String ckm; + + /** 产品类型:1 普货 / 2 配件 / 3 危险品;不传默认 1。 */ + @JsonProperty("product_type") + public Integer productType; + + /** 产品品类:0 其它 / 1 家具 / 2 食品 / 3 汽配 / 4 服饰 / 5 化妆品 / 6 鞋类 / 7 玩具 / 8 电子 / 9 数码。 */ + @JsonProperty("product_category") + public Integer productCategory; + + /** 产品图片;需先调 {@code upload.files}。统一模型暂不承载图片,通常为 null。 */ + @JsonProperty("product_image") + public ProductImage productImage; + } + + /** 产品图片(OSS 元数据)。 */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class ProductImage { + + /** 存储类型,如 {@code aliyun_oss}。 */ + @JsonProperty("type") + public String type; + + /** bucket 名。 */ + @JsonProperty("bucket") + public String bucket; + + /** 对象键。 */ + @JsonProperty("file_name") + public String fileName; + + /** 可访问 URL。 */ + @JsonProperty("file_url") + public String fileUrl; + } + + /** + * 产品列表响应({@code GET api.productlist})中 {@code rst.data[]} 的元素。 + * + *只声明判断「是否已存在、处于什么状态」需要的字段。
+ */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class ProductListItem { + + /** 产品 SKU。 */ + @JsonProperty("product_no") + public String productNo; + + /** 产品状态:0 临时产品 / 1 正式产品。 */ + @JsonProperty("state") + public String state; + } + + /** + * 新增订单(一单多件)请求中的一条商品。 + * + *信仓把整组商品 JSON 序列化后放进 multipart 的 {@code products} 字段。
+ */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class OrderProduct { + + /** 产品 SKU。 */ + @JsonProperty("product_sku") + public String productSku; + + /** 数量(字符串)。 */ + @JsonProperty("sku_count") + public String skuCount; + } + + /** + * 新增订单(一单多件)响应中的 {@code rst}。 + */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class OrderResult { + + /** 信仓系统单号(DS-...)。 */ + @JsonProperty("order_no") + public String orderNo; + + /** 信仓内部订单 id。 */ + @JsonProperty("order_id") + public String orderId; + } + + /** + * 新增转运请求({@code POST fba.do_fba})。 + * + *附件字段(产品贴 / 外箱贴 / 托盘贴 / BOL)要求先用 {@code upload.files} 上传, + * 再把它返回的 {@code data.data} 对象原样放进来;统一模型不承载附件,本轮不发送。
+ */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class TransferRequest { + + /** 转运单号(业务侧),必填。 */ + @JsonProperty("fba_no") + public String fbaNo; + + /** PO 号,必填。 */ + @JsonProperty("po") + public String po; + + /** 发货仓(仓方字典名称),必填。 */ + @JsonProperty("from_warehouse_name") + public String fromWarehouseName; + + /** 目的仓(仓方字典名称),必填。 */ + @JsonProperty("dest_warehouse_name") + public String destWarehouseName; + + /** 其它仓库名;目的仓选「其他仓库」时填。 */ + @JsonProperty("other_warehouse") + public String otherWarehouse; + + /** 转运类型(订单类型字典值),必填。 */ + @JsonProperty("order_type") + public String orderType; + + /** 转运类型(转运类型字典值),必填。 */ + @JsonProperty("delivery_mode") + public String deliveryMode; + + /** 转运方式 / 配送方式(字典值),必填。 */ + @JsonProperty("delivery_way") + public String deliveryWay; + + /** 预约发货时间 {@code yyyy-MM-dd}。 */ + @JsonProperty("pre_send_time") + public String preSendTime; + + /** 标签需求,多选用英文逗号分隔,如 {@code 产品贴,外箱标签}。 */ + @JsonProperty("label_requirement") + public String labelRequirement; + + /** 是否需要打托:{@code 是} / {@code 否}。 */ + @JsonProperty("is_pallet") + public String isPallet; + + /** 产品明细 JSON 字符串。 */ + @JsonProperty("products") + public String products; + + /** 备注。 */ + @JsonProperty("remark") + public String remark; + + /** 产品贴打印份数。 */ + @JsonProperty("product_print_copies") + public String productPrintCopies; + + /** 外箱贴打印份数。 */ + @JsonProperty("ctn_print_copies") + public String ctnPrintCopies; + + /** 托盘贴打印份数。 */ + @JsonProperty("pallet_print_copies") + public String palletPrintCopies; + } + + /** 新增转运请求里的产品明细(序列化进 {@code products} 字符串)。 */ + @JsonInclude(JsonInclude.Include.NON_NULL) + public static final class TransferProduct { + + /** 产品 SKU,必填。 */ + @JsonProperty("product_no") + public String productNo; + + /** 数量(字符串),必填。 */ + @JsonProperty("sku_count") + public String skuCount; + + /** 备注。 */ + @JsonProperty("remark") + public String remark; + } + + /** 转运单创建结果 {@code rst}。 */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class TransferResult { + + /** 信仓转运单号(LTL...),审核时传它。 */ + @JsonProperty("order_no") + public String orderNo; + } + + /** 新增订单响应外层,用于取 {@code rst}。 */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class OrderResponse { + + /** 下单结果;业务失败时为 null。 */ + @JsonProperty("rst") + public OrderResult rst; + } + + /** 新增转运响应外层,用于取 {@code rst}。 */ + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class TransferResponse { + + /** 转运结果;业务失败时为 null。 */ + @JsonProperty("rst") + public TransferResult rst; + } } diff --git a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/http/XincangMultipart.java b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/http/XincangMultipart.java new file mode 100644 index 0000000..6d942d5 --- /dev/null +++ b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/http/XincangMultipart.java @@ -0,0 +1,81 @@ +package common.ecommerce.xincang.http; + +import common.ecommerce.http.HttpRequest; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Map; +import java.util.TreeMap; + +/** + * multipart/form-data 请求体构造。 + * + *信仓「新增订单一单多件」要求 {@code multipart/form-data},字段值里的 + * {@code products} 本身就是一段 JSON 字符串。这里用固定 boundary, + * 保证同一份入参生成的报文每次都一样,便于契约测试断言。
+ */ +public final class XincangMultipart { + + /** 固定 boundary:报文可预测。 */ + static final String BOUNDARY = "----commonEcommerceXincangBoundary"; + /** 与 boundary 配套的 Content-Type。 */ + public static final String CONTENT_TYPE = "multipart/form-data; boundary=" + BOUNDARY; + + private XincangMultipart() { + } + + /** 构造一个不带文件、只有文本字段的 multipart 请求。 */ + public static HttpRequest post(String baseUrl, String path, Map值为 null 的字段跳过——可选字段没给就不发,避免把空串误当成业务值。
+ */ + static String body(Map信仓「转运审核」({@code POST fba.do_approve?token=&order_no=})就是这种形态: + * 方法必须是 POST,但文档 body 为 none。
+ */ + public HttpRequest postWithoutBodyWithToken(String baseUrl, String path, Map后续接口(订单 / 库存 / 预报)都要求 token 作为 query 参数,这个方法集中处理, - * 免得各 Source 各写一遍。本轮只落地登录,接入业务接口时直接复用。
+ *订单 / 库存 / 预报 / 产品列表等接口都要求 token 作为 query 参数,这个方法集中处理, + * 免得各处各写一遍。
*/ public HttpRequest getWithToken(String baseUrl, String path, Map信仓的写接口把 {@code token} 列为必填 query 参数(新增订单、删除产品等均如此), + * 而新增 / 更新产品在请求体 schema 里又要求一份 {@code token}。 + * 这里统一两处都带:query 是文档的通用约定,body 由调用方按接口需要自行放入。
+ */ + public HttpRequest postJsonWithToken(String baseUrl, String path, String jsonBody, + String token, String operation) { + return HttpRequest.builder() + .method("POST") + .url(trimTrailingSlash(baseUrl) + path + "?" + urlEncode(XincangConstants.QUERY_TOKEN) + + "=" + urlEncode(requireText(token, "xincang requires a token; call login first"))) + .contentType("application/json") + .body(jsonBody) + .operation(operation) + .build(); + } + /** 集合 / 对象按 JSON 序列化,其余按字符串。 */ private String stringify(Object value) { if (value instanceof Collection || value instanceof Map) { diff --git a/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangAdapterTest.java b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangAdapterTest.java index 5dc13ad..52c605f 100644 --- a/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangAdapterTest.java +++ b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangAdapterTest.java @@ -15,6 +15,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.time.Duration; +import java.util.EnumSet; import static org.junit.jupiter.api.Assertions.*; @@ -113,12 +114,16 @@ class XincangAdapterTest { } @Test - void capabilitiesAreEmptyUntilBusinessApisLand() { + void declaresImplementedCapabilities() { XincangAdapter adapter = adapter(); assertEquals(WarehouseProvider.XINCANG, adapter.provider()); assertEquals(XincangConstants.ADAPTER_ID, adapter.adapterId()); - assertTrue(adapter.capabilities().isEmpty(), "本期只做登录,不声明任何能力位"); - assertFalse(adapter.supports("XC-CA-3790", WarehouseCapability.OUTBOUND)); + assertEquals(EnumSet.of(WarehouseCapability.PRODUCT, WarehouseCapability.OUTBOUND, + WarehouseCapability.TRANSFER, WarehouseCapability.SPLIT), adapter.capabilities()); + assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.PRODUCT)); + assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.OUTBOUND)); + // 库存 / 退货等未接入,仍是 false + assertFalse(adapter.supports("XC-CA-3790", WarehouseCapability.INVENTORY_QUERY)); } } diff --git a/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangOrderTest.java b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangOrderTest.java new file mode 100644 index 0000000..4349704 --- /dev/null +++ b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangOrderTest.java @@ -0,0 +1,178 @@ +package common.ecommerce.xincang.adapter; + +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.MutableClock; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.warehouse.enums.WarehouseCapability; +import common.ecommerce.warehouse.enums.WarehouseProvider; +import common.ecommerce.warehouse.enums.LabelMode; +import common.ecommerce.warehouse.model.OutboundCommand; +import common.ecommerce.warehouse.model.OutboundLine; +import common.ecommerce.warehouse.model.OutboundReceipt; +import common.ecommerce.warehouse.model.ShipTo; +import common.ecommerce.warehouse.sdk.WarehouseConnection; +import common.ecommerce.warehouse.sdk.WarehouseContext; +import common.ecommerce.xincang.XincangConstants; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.time.Clock; +import java.time.Duration; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * 信仓出库下单(一单多件)契约测试。 + */ +class XincangOrderTest { + + private static final String BASE = XincangConstants.TEST_BASE_URL; + private static final String APP_KEY = "ak-1"; + private static final String TOKEN = "{T-1}"; + + private RecordingTransport transport; + private MutableClock clock; + private XincangAdapter adapter; + + @BeforeEach + void setUp() { + transport = RecordingTransport.create(); + clock = MutableClock.atUtc("2026-11-10T00:00:00Z"); + transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( + "{\"rst\":{\"id\":\"c-1\",\"token\":\"" + TOKEN + "\",\"token_expire_time\":\"" + + java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), + XincangConstants.SYSTEM_ZONE) + .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + + "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); + adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), + new InMemoryTokenStore(), new InMemoryLockProvider(), clock); + } + + private static WarehouseContext ctx() { + return WarehouseContext.of("XC-CA-3790", WarehouseProvider.XINCANG, "CA-3790", + WarehouseConnection.of(BASE, ChannelSecret.builder() + .appKey(APP_KEY).appSecret("sk").build()), + "req-1", Clock.systemUTC()); + } + + private static OutboundCommand command(Boolean split) { + OutboundCommand.Builder b = OutboundCommand.builder() + .outboundRequestNo("OB-20261110-001") + .orderRef("SO-1") + .labelMode(LabelMode.WAREHOUSE_LABEL) + .salesPlatform(Platform.AMAZON_SC) + .carrierCode("FEDEX-G") + .warehouseId("CA-3790") + .shipTo(ShipTo.builder() + .name("Receiver") + .phone("5550000") + .countryCode("US") + .stateOrProvince("CA") + .city("Fontana") + .addressLine1("3790 DE FOREST CIRCLE, UNIT B, EXTRA LONG SUFFIX") + .postalCode("92337") + .build()) + .line(OutboundLine.builder().lineNo("1").omsSku("SKU-A").quantity(2).build()) + .line(OutboundLine.builder().lineNo("2").omsSku("SKU-B").providerSku("SKU-B-XC") + .quantity(1).build()); + if (split != null) { + b.splitOrder(split); + } + return b.build(); + } + + @Test + void createsMultiLineOrderAsMultipart() { + transport.route(XincangConstants.PATH_ORDER_ADD_MULTIPLE, req -> Responses.ok( + "{\"rst\":{\"order_no\":\"DS-B001-26101300025\",\"order_id\":\"125553878740636306\"}," + + "\"errno\":0,\"err\":\"\",\"trace_id\":\"t-order\"}")); + + OutboundReceipt receipt = adapter.create(ctx(), command(true)); + + assertEquals("OB-20261110-001", receipt.outboundRequestNo()); + assertEquals("DS-B001-26101300025", receipt.providerOrderId()); + + common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); + assertEquals("POST", req.method()); + assertTrue(req.url().contains("/api.add_order_multiple?token="), req.url()); + assertTrue(req.contentType().startsWith("multipart/form-data; boundary="), req.contentType()); + + String body = req.body(); + assertTrue(body.contains("name=\"ckh\"\r\n\r\nOB-20261110-001"), body); + assertTrue(body.contains("name=\"warehouse_code\"\r\n\r\nCA-3790"), body); + assertTrue(body.contains("name=\"logistics_type\"\r\n\r\nFEDEX-G"), body); + assertTrue(body.contains("name=\"order_type\"\r\n\r\ncommon"), body); + assertTrue(body.contains("name=\"is_split\"\r\n\r\n1"), body); + // 商品明细是一段 JSON 字符串 + assertTrue(body.contains("\"product_sku\":\"SKU-A\""), body); + assertTrue(body.contains("\"sku_count\":\"2\""), body); + // 仓侧 SKU 优先 + assertTrue(body.contains("\"product_sku\":\"SKU-B-XC\""), body); + // 地址超过 32 位走 address2(前 32 字符 = "3790 DE FOREST CIRCLE, UNIT B, E") + assertTrue(body.contains("name=\"address\"\r\n\r\n3790 DE FOREST CIRCLE, UNIT B, E\r\n"), body); + assertTrue(body.contains("name=\"address2\"\r\n\r\nXTRA LONG SUFFIX"), body); + } + + @Test + void splitFlagIsOmittedWhenCallerDidNotSetIt() { + transport.route(XincangConstants.PATH_ORDER_ADD_MULTIPLE, req -> Responses.ok( + "{\"rst\":{\"order_no\":\"DS-1\",\"order_id\":\"1\"},\"errno\":0,\"err\":\"\"}")); + + adapter.create(ctx(), command(null)); + + assertFalse(transport.lastDataRequest().body().contains("name=\"is_split\""), + "未显式指定时交给信仓默认(拆单)"); + } + + @Test + void missingShipToFieldFailsBeforeSending() { + transport.route(XincangConstants.PATH_ORDER_ADD_MULTIPLE, req -> Responses.ok("{}")); + OutboundCommand cmd = OutboundCommand.builder() + .outboundRequestNo("OB-2") + .salesPlatform(Platform.AMAZON_SC) + .carrierCode("FEDEX-G") + .warehouseId("CA-3790") + .shipTo(ShipTo.builder().name("R").countryCode("US").stateOrProvince("CA") + .city("Fontana").addressLine1("1 A St").postalCode("92337").build()) + .line(OutboundLine.builder().lineNo("1").omsSku("SKU-A").quantity(1).build()) + .build(); + + common.ecommerce.shared.error.ValidationException e = + assertThrows(common.ecommerce.shared.error.ValidationException.class, + () -> adapter.create(ctx(), cmd)); + assertTrue(e.getMessage().contains("shipTo.phone"), e.getMessage()); + // 登录后即失败,不应发出下单请求 + assertFalse(transport.recorded().stream().anyMatch( + r -> r.url().contains(XincangConstants.PATH_ORDER_ADD_MULTIPLE))); + } + + @Test + void missingProviderOrderNoIsNotSilentSuccess() { + transport.route(XincangConstants.PATH_ORDER_ADD_MULTIPLE, req -> Responses.ok( + "{\"rst\":null,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-x\"}")); + + common.ecommerce.warehouse.error.WarehouseException e = + assertThrows(common.ecommerce.warehouse.error.WarehouseException.class, + () -> adapter.create(ctx(), command(true))); + assertTrue(e.getMessage().contains("rst.order_no"), e.getMessage()); + } + + @Test + void queryAndCancelAreExplicitlyUnsupported() { + assertThrows(common.ecommerce.shared.error.ValidationException.class, + () -> adapter.get(ctx(), null)); + assertThrows(common.ecommerce.shared.error.ValidationException.class, + () -> adapter.query(ctx(), null)); + assertFalse(adapter.capabilities().contains(WarehouseCapability.INVENTORY_QUERY)); + } + + @Test + void outboundCapabilityIsDeclared() { + assertTrue(adapter.capabilities().contains(WarehouseCapability.OUTBOUND)); + assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.SPLIT)); + } +} diff --git a/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangProductTest.java b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangProductTest.java new file mode 100644 index 0000000..3d57653 --- /dev/null +++ b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangProductTest.java @@ -0,0 +1,252 @@ +package common.ecommerce.xincang.adapter; + +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.support.Money; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.MutableClock; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; +import common.ecommerce.warehouse.enums.WarehouseCapability; +import common.ecommerce.warehouse.enums.WarehouseProvider; +import common.ecommerce.warehouse.capability.WarehouseProduct; +import common.ecommerce.warehouse.capability.WarehouseProductCapable.ProductResult; +import common.ecommerce.warehouse.sdk.WarehouseConnection; +import common.ecommerce.warehouse.sdk.WarehouseContext; +import common.ecommerce.xincang.XincangConstants; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.time.Clock; +import java.time.Duration; +import java.util.Objects; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * 信仓商品建档契约测试。 + * + *覆盖:先查临时产品再决定 add / update、单位换算(cm→inch、g→lbs)、 + * token 在两处(query 与 body)、必填兜底与错误传播。
+ */ +class XincangProductTest { + + private static final String BASE = XincangConstants.TEST_BASE_URL; + private static final String APP_KEY = "ak-1"; + + private RecordingTransport transport; + private XincangAdapter adapter; + + @BeforeEach + void setUp() { + transport = RecordingTransport.create(); + MutableClock clock = MutableClock.atUtc("2026-11-09T00:00:00Z"); + transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( + "{\"rst\":{\"id\":\"c-1\",\"token\":\"{T-1}\",\"token_expire_time\":\"" + + java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), + XincangConstants.SYSTEM_ZONE) + .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + + "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); + adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), + new InMemoryTokenStore(), new InMemoryLockProvider(), clock); + } + + private static WarehouseContext ctx() { + return WarehouseContext.of("XC-CA-3790", WarehouseProvider.XINCANG, "CA-3790", + WarehouseConnection.of(BASE, ChannelSecret.builder() + .appKey(APP_KEY).appSecret("sk").build()), + "req-1", Clock.systemUTC()); + } + + private static WarehouseProduct product(String sku) { + return WarehouseProduct.builder() + .omsSku(sku) + .name("测试商品") + .nameEn("Test Product") + .barcode("BARCODE-1") + .packingType(0) + .lengthCm(30.48) + .widthCm(25.4) + .heightCm(10) + .weightGrams(1000) + .productType(1) + // 统一模型要求海关三项整组给(信仓不发送这三项,只取 declaredValue 作 amount) + .declaredValue(Money.of("30.49", "USD")) + .hsCode("9403600000") + .countryOfOrigin("US") + .remark("remark 1") + .build(); + } + + /** 产品列表:给定条目 JSON 数组内容。 */ + private void routeProductList(String dataJson) { + transport.route(XincangConstants.PATH_PRODUCT_LIST, req -> Responses.ok( + "{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":" + dataJson + ",\"count\":\"1\"}," + + "\"errno\":0,\"err\":\"\",\"trace_id\":\"t-list\"}")); + } + + @Test + void addsProductWhenSkuIsNew() { + routeProductList("[]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-add\"}")); + + ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST001")); + + assertEquals("APITEST001", result.providerSku()); + assertEquals("ADDED", result.status()); + assertEquals("0", result.rawStatus()); + + // 三个请求:登录 → 产品列表 → 新增 + assertEquals(3, transport.recorded().size()); + + String addBody = transport.lastDataRequest().body(); + assertTrue(addBody.contains("\"product_no\":\"APITEST001\""), addBody); + assertTrue(addBody.contains("\"chn_name\":\"测试商品\""), addBody); + assertTrue(addBody.contains("\"bar_code\":\"BARCODE-1\""), addBody); + assertTrue(addBody.contains("\"amount\":30.49"), addBody); + // 1000g → 2.2046 lbs;30.48cm → 12.0000 in + assertTrue(addBody.contains("\"weight_lbs\":2.2046"), addBody); + assertTrue(addBody.contains("\"size_l_ln\":12.0000"), addBody); + assertTrue(addBody.contains("\"size_w_ln\":10.0000"), addBody); + assertTrue(addBody.contains("\"size_h_ln\":3.9370"), addBody); + assertTrue(addBody.contains("\"packing_rate\":1"), addBody); + assertTrue(addBody.contains("\"product_type\":1"), addBody); + // token 在 body 与 query 两处 + assertTrue(addBody.contains("\"token\":\"{T-1}\""), addBody); + assertTrue(Objects.requireNonNull(transport.lastDataRequest()).url().endsWith("/api.add_product?token=%7BT-1%7D"), + Objects.requireNonNull(transport.lastDataRequest()).url()); + } + + @Test + void updatesProductWhenTemporaryAlreadyExists() { + routeProductList("[{\"product_no\":\"APITEST001\",\"state\":\"0\"}]"); + transport.route(XincangConstants.PATH_PRODUCT_UPDATE, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-upd\"}")); + + ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST001")); + + assertEquals("UPDATED", result.status()); + assertTrue(Objects.requireNonNull(transport.lastDataRequest()).url().contains("/api.update_product"), "应走更新接口"); + assertFalse(Objects.requireNonNull(transport.lastDataRequest()).url().contains("/api.add_product")); + } + + @Test + void listQueryUsesStateTemporaryAndSkuKey() { + routeProductList("[]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\"}")); + + adapter.createOrUpdate(ctx(), product("APITEST002")); + + // dataRequests() 会排除含 /oauth/access-token 的请求,但信仓登录路径是 /api.login, + // 需要按路径自己取业务请求 + String listUrl = null; + for (common.ecommerce.http.HttpRequest req : transport.recorded()) { + if (req.url().contains(XincangConstants.PATH_PRODUCT_LIST)) { + listUrl = req.url(); + } + } + assertNotNull(listUrl, "应调用产品列表"); + assertTrue(listUrl.contains("/api.productlist?"), listUrl); + assertTrue(listUrl.contains("state=0"), listUrl); + assertTrue(listUrl.contains("key=APITEST002"), listUrl); + assertTrue(listUrl.contains("token=%7BT-1%7D"), listUrl); + } + + @Test + void skuIsFilteredExactlySoSimilarSkuIsNotMistakenAsExisting() { + // 列表按 key 模糊返回了别的 SKU,必须再精确比对 + routeProductList("[{\"product_no\":\"APITEST003-OLD\",\"state\":\"0\"}]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\"}")); + + ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST003")); + + assertEquals("ADDED", result.status()); + } + + @Test + void formalProductIsNotTreatedAsUpdatable() { + // 正式产品(state=1)不在临时产品列表里;新增会让信仓报「SKU已存在」,原样抛出 + routeProductList("[]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":null,\"errno\":-1,\"err\":\"产品SKU已存在\",\"trace_id\":\"t-dup\"}")); + + common.ecommerce.shared.error.PlatformBusinessException e = + assertThrows(common.ecommerce.shared.error.PlatformBusinessException.class, + () -> adapter.createOrUpdate(ctx(), product("APITEST004"))); + + assertTrue(e.getMessage().contains("产品SKU已存在"), e.getMessage()); + assertEquals("t-dup", e.platformRequestId()); + } + + @Test + void barcodeFallsBackToSkuAndAmountToZeroWhenMissing() { + routeProductList("[]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\"}")); + WarehouseProduct noBarcode = WarehouseProduct.builder() + .omsSku("APITEST005") + .name("测试商品") + .nameEn("Test") + .packingType(0) + .lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) + .build(); + + adapter.createOrUpdate(ctx(), noBarcode); + + String body = Objects.requireNonNull(transport.lastDataRequest()).body(); + assertTrue(body.contains("\"bar_code\":\"APITEST005\""), body); + assertTrue(body.contains("\"amount\":0.00"), body); + // 未指定产品类型时不发该字段 + assertFalse(body.contains("product_type"), body); + } + + @Test + void nonUsdDeclaredValueIsRejectedBeforeSending() { + WarehouseProduct eur = WarehouseProduct.builder() + .omsSku("APITEST006") + .name("测试商品") + .nameEn("Test") + .barcode("B-6") + .packingType(0) + .lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) + .declaredValue(Money.of("10.00", "EUR")) + .hsCode("9403600000") + .countryOfOrigin("DE") + .build(); + + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, + () -> adapter.createOrUpdate(ctx(), eur)); + assertTrue(e.getMessage().contains("USD"), e.getMessage()); + } + + @Test + void providerSkuWinsWhenMapped() { + routeProductList("[]"); + transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\"}")); + WarehouseProduct mapped = WarehouseProduct.builder() + .omsSku("OMS-1") + .providerSku("XC-1") + .name("测试商品") + .nameEn("Test") + .barcode("B-1") + .packingType(0) + .lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) + .build(); + + ProductResult result = adapter.createOrUpdate(ctx(), mapped); + + assertEquals("XC-1", result.providerSku()); + assertTrue(transport.lastDataRequest().body().contains("\"product_no\":\"XC-1\"")); + } + + @Test + void productCapabilityIsDeclared() { + assertTrue(adapter.capabilities().contains(WarehouseCapability.PRODUCT)); + assertFalse(adapter.capabilities().contains(WarehouseCapability.INVENTORY_QUERY)); + assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.PRODUCT)); + } +} diff --git a/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangTransferTest.java b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangTransferTest.java new file mode 100644 index 0000000..c5f96e0 --- /dev/null +++ b/warehouse-sdk-xincang/src/test/java/common/ecommerce/xincang/adapter/XincangTransferTest.java @@ -0,0 +1,195 @@ +package common.ecommerce.xincang.adapter; + +import common.ecommerce.shared.error.ValidationException; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.MutableClock; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; +import common.ecommerce.warehouse.enums.WarehouseCapability; +import common.ecommerce.warehouse.enums.WarehouseProvider; +import common.ecommerce.warehouse.model.TransferCommand; +import common.ecommerce.warehouse.model.TransferOrder; +import common.ecommerce.warehouse.enums.TransferStatus; +import common.ecommerce.warehouse.model.ShipTo; +import common.ecommerce.warehouse.enums.TransferType; +import common.ecommerce.warehouse.sdk.WarehouseConnection; +import common.ecommerce.warehouse.sdk.WarehouseContext; +import common.ecommerce.xincang.XincangConstants; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.time.Clock; +import java.time.Duration; +import java.time.LocalDate; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * 信仓转运:新增({@code fba.do_fba})与审核({@code fba.do_approve})契约测试。 + */ +class XincangTransferTest { + + private static final String BASE = XincangConstants.TEST_BASE_URL; + private static final String APP_KEY = "ak-1"; + + private RecordingTransport transport; + private XincangAdapter adapter; + + @BeforeEach + void setUp() { + transport = RecordingTransport.create(); + MutableClock clock = MutableClock.atUtc("2026-11-10T00:00:00Z"); + transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( + "{\"rst\":{\"id\":\"c-1\",\"token\":\"{T-1}\",\"token_expire_time\":\"" + + java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), + XincangConstants.SYSTEM_ZONE) + .format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + + "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); + adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), + new InMemoryTokenStore(), new InMemoryLockProvider(), clock); + } + + private static WarehouseContext ctx() { + return WarehouseContext.of("XC-CA-3790", WarehouseProvider.XINCANG, "CA-3790", + WarehouseConnection.of(BASE, ChannelSecret.builder() + .appKey(APP_KEY).appSecret("sk").build()), + "req-1", Clock.systemUTC()); + } + + private static TransferCommand command() { + return TransferCommand.builder() + .transferRequestNo("TR-20261110-001") + .type(TransferType.OUTBOUND) + .fromWarehouseCode("CA-3790") + .toWarehouseCode("ONT8") + .po("PO-58016") + .orderType("FBA") + .deliveryMode("FBA") + .deliveryWay("Amazon(亚马逊卡车自提)") + .estimateOutboundDate(LocalDate.parse("2026-11-12")) + .estimateInboundDate(LocalDate.parse("2026-11-20")) + .shipTo(ShipTo.builder().name("FBA").countryCode("US").stateOrProvince("CA") + .city("San Bernardino").addressLine1("1 Amazon Way").postalCode("92408").build()) + .palletRequired(true) + .labelRequirement("产品贴") + .labelRequirement("外箱标签") + .productLabelCopies(4) + .cartonLabelCopies(2) + .remark("测试转运") + .line("LSS29ORANGE", 5) + .line("LSS29BLUE", 1) + .build(); + } + + @Test + void createsTransferWithJsonBody() { + transport.route(XincangConstants.PATH_TRANSFER_CREATE, req -> Responses.ok( + "{\"rst\":{\"order_no\":\"LTL26101500002\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-fba\"}")); + + TransferOrder order = adapter.create(ctx(), command()); + + assertEquals("TR-20261110-001", order.transferRequestNo()); + assertEquals("LTL26101500002", order.providerTransferNo()); + assertEquals(TransferStatus.PENDING_REVIEW, order.status()); + + common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); + assertEquals("POST", req.method()); + assertTrue(req.url().contains("/fba.do_fba?token="), req.url()); + String body = req.body(); + assertTrue(body.contains("\"fba_no\":\"TR-20261110-001\""), body); + assertTrue(body.contains("\"po\":\"PO-58016\""), body); + assertTrue(body.contains("\"from_warehouse_name\":\"CA-3790\""), body); + assertTrue(body.contains("\"dest_warehouse_name\":\"ONT8\""), body); + assertTrue(body.contains("\"delivery_mode\":\"FBA\""), body); + assertTrue(body.contains("\"delivery_way\":\"Amazon(亚马逊卡车自提)\""), body); + assertTrue(body.contains("\"pre_send_time\":\"2026-11-12\""), body); + assertTrue(body.contains("\"is_pallet\":\"是\""), body); + assertTrue(body.contains("\"label_requirement\":\"产品贴,外箱标签\""), body); + assertTrue(body.contains("\"product_print_copies\":\"4\""), body); + assertTrue(body.contains("\"ctn_print_copies\":\"2\""), body); + // products 是 JSON 字符串 + assertTrue(body.contains("\\\"product_no\\\":\\\"LSS29ORANGE\\\""), body); + assertTrue(body.contains("\\\"sku_count\\\":\\\"5\\\""), body); + } + + @Test + void approvePostsOrderNoInQueryWithoutBody() { + transport.route(XincangConstants.PATH_TRANSFER_APPROVE, req -> Responses.ok( + "{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-approve\"}")); + + adapter.approve(ctx(), "LTL26101500002"); + + common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); + assertEquals("POST", req.method()); + assertTrue(req.url().contains("/fba.do_approve?"), req.url()); + assertTrue(req.url().contains("order_no=LTL26101500002"), req.url()); + assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); + assertNull(req.body(), "转运审核无请求体"); + } + + @Test + void approveFailurePropagatesBusinessError() { + transport.route(XincangConstants.PATH_TRANSFER_APPROVE, req -> Responses.ok( + "{\"rst\":null,\"errno\":-1,\"err\":\"转运单状态不允许审核\",\"trace_id\":\"t-bad\"}")); + + common.ecommerce.shared.error.PlatformBusinessException e = + assertThrows(common.ecommerce.shared.error.PlatformBusinessException.class, + () -> adapter.approve(ctx(), "LTL1")); + assertTrue(e.getMessage().contains("不允许审核"), e.getMessage()); + } + + @Test + void nonOutboundTransferTypeIsRejected() { + TransferCommand cmd = TransferCommand.builder() + .transferRequestNo("TR-2") + .type(TransferType.WAREHOUSE_TO_WAREHOUSE) + .fromWarehouseCode("A").toWarehouseCode("B") + .estimateOutboundDate(LocalDate.now()).estimateInboundDate(LocalDate.now()) + .line("SKU", 1) + .build(); + + ValidationException e = assertThrows(ValidationException.class, + () -> adapter.create(ctx(), cmd)); + assertTrue(e.getMessage().contains("OUTBOUND"), e.getMessage()); + } + + @Test + void missingDictionaryFieldsFailBeforeSending() { + TransferCommand cmd = TransferCommand.builder() + .transferRequestNo("TR-3") + .type(TransferType.OUTBOUND) + .fromWarehouseCode("CA-3790").toWarehouseCode("ONT8") + .estimateOutboundDate(LocalDate.now()) + .estimateInboundDate(LocalDate.now().plusDays(1)) + .shipTo(ShipTo.builder().name("FBA").countryCode("US").stateOrProvince("CA") + .city("San Bernardino").addressLine1("1 Amazon Way").postalCode("92408").build()) + .line("SKU", 1) + .build(); + + ValidationException e = assertThrows(ValidationException.class, + () -> adapter.create(ctx(), cmd)); + assertTrue(e.getMessage().contains("deliveryMode"), e.getMessage()); + assertFalse(transport.recorded().stream() + .anyMatch(r -> r.url().contains(XincangConstants.PATH_TRANSFER_CREATE))); + } + + @Test + void missingTransferNoIsNotSilentSuccess() { + transport.route(XincangConstants.PATH_TRANSFER_CREATE, req -> Responses.ok( + "{\"rst\":null,\"errno\":0,\"err\":\"\"}")); + + common.ecommerce.warehouse.error.WarehouseException e = + assertThrows(common.ecommerce.warehouse.error.WarehouseException.class, + () -> adapter.create(ctx(), command())); + assertTrue(e.getMessage().contains("rst.order_no"), e.getMessage()); + } + + @Test + void transferCapabilityDeclared() { + assertTrue(adapter.capabilities().contains(WarehouseCapability.TRANSFER)); + assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.TRANSFER)); + } +}