Browse Source
冲突处理:远端新增的信仓代码沿用旧的枚举位置 (common.ecommerce.warehouse.WarehouseCapability / …model.TransferStatus 等), 本地已把枚举下沉到 warehouse.enums,故按新包名改写以下文件的 import: - TransferCapable(新增 approve 默认方法) - XincangOrderMapper / XincangTransferMapper / XincangUnsupportedOutbound - XincangAdapter(合并 import 段,保留两侧新增能力) - XincangOrderTest / XincangProductTest / XincangTransferTest TransferCommand 冲突只是 import 顺序,两侧合并即可。 Co-Authored-By: Claude <noreply@anthropic.com>feature/supplier-lingxing
18 changed files with 2065 additions and 26 deletions
@ -0,0 +1,179 @@ |
|||||||
|
package common.ecommerce.xincang.adapter; |
||||||
|
|
||||||
|
import common.ecommerce.http.JsonCodec; |
||||||
|
import common.ecommerce.shared.error.ChannelException; |
||||||
|
import common.ecommerce.shared.error.ValidationException; |
||||||
|
import common.ecommerce.shared.model.Platform; |
||||||
|
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.WarehouseContext; |
||||||
|
import common.ecommerce.xincang.XincangConstants; |
||||||
|
import common.ecommerce.xincang.dto.XincangDtos; |
||||||
|
|
||||||
|
import java.time.Instant; |
||||||
|
import java.time.LocalDateTime; |
||||||
|
import java.time.format.DateTimeFormatter; |
||||||
|
import java.util.ArrayList; |
||||||
|
import java.util.LinkedHashMap; |
||||||
|
import java.util.List; |
||||||
|
import java.util.Map; |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓出库下单报文映射({@code POST api.add_order_multiple})。 |
||||||
|
* |
||||||
|
* <p>该接口是 {@code multipart/form-data},{@code products} 字段本身是一段 JSON 字符串。 |
||||||
|
* 平台字段名只出现在本类与 {@link XincangDtos}。</p> |
||||||
|
* |
||||||
|
* <p>文档没有对应字段的就不发:申报信息(HS / 原产国 / 申报价值)、包裹尺寸等 |
||||||
|
* 统一模型里有,但信仓这版接口不收,硬塞只会被忽略或报错。</p> |
||||||
|
*/ |
||||||
|
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 Map<String, String> toForm(WarehouseContext ctx, OutboundCommand cmd, JsonCodec json) { |
||||||
|
ShipTo shipTo = cmd.shipTo(); |
||||||
|
requireText(shipTo.name(), "shipTo.name", ctx); |
||||||
|
requireText(shipTo.phone(), "shipTo.phone", ctx); |
||||||
|
requireText(shipTo.countryCode(), "shipTo.countryCode", ctx); |
||||||
|
requireText(shipTo.stateOrProvince(), "shipTo.stateOrProvince", ctx); |
||||||
|
requireText(shipTo.city(), "shipTo.city", ctx); |
||||||
|
requireText(shipTo.postalCode(), "shipTo.postalCode", ctx); |
||||||
|
requireText(shipTo.addressLine1(), "shipTo.addressLine1", ctx); |
||||||
|
|
||||||
|
String warehouseCode = firstNonBlank(cmd.warehouseId(), ctx.providerWarehouseId()); |
||||||
|
requireText(warehouseCode, "warehouseCode", ctx); |
||||||
|
// 信仓 logistics_type 是必填的物流方式字典值,这里用 carrierCode 承载
|
||||||
|
requireText(cmd.carrierCode(), "carrierCode (信仓 logistics_type)", ctx); |
||||||
|
|
||||||
|
Map<String, String> form = new LinkedHashMap<String, String>(); |
||||||
|
form.put("order_type", orderTypeOf(cmd.salesPlatform())); |
||||||
|
form.put("warehouse_code", warehouseCode); |
||||||
|
// ckh = 参考号,信仓要求唯一;用 OMS 出库单号,便于回查
|
||||||
|
form.put("ckh", cmd.outboundRequestNo()); |
||||||
|
|
||||||
|
Address address = splitAddress(shipTo.addressLine1()); |
||||||
|
form.put("country", shipTo.countryCode().trim()); |
||||||
|
form.put("province", shipTo.stateOrProvince().trim()); |
||||||
|
form.put("city", shipTo.city().trim()); |
||||||
|
form.put("address", address.line1); |
||||||
|
putIfPresent(form, "address2", address.line2); |
||||||
|
form.put("postcode", shipTo.postalCode().trim()); |
||||||
|
form.put("receive_user", shipTo.name().trim()); |
||||||
|
form.put("phone", shipTo.phone().trim()); |
||||||
|
putIfPresent(form, "email", shipTo.email()); |
||||||
|
form.put("logistics_type", cmd.carrierCode().trim()); |
||||||
|
form.put("is_sign", SIGN_NOT_REQUIRED); |
||||||
|
form.put("products", productsJson(cmd.lines(), json)); |
||||||
|
|
||||||
|
// 不传 is_split 时信仓默认 1(拆单);只有调用方显式给值才下发
|
||||||
|
if (cmd.splitOrder() != null) { |
||||||
|
form.put("is_split", cmd.splitOrder() ? "1" : "0"); |
||||||
|
} |
||||||
|
Instant latest = cmd.latestShipDate(); |
||||||
|
if (latest != null) { |
||||||
|
form.put("required_delivery_time", REQUIRED_DELIVERY_TIME.format( |
||||||
|
LocalDateTime.ofInstant(latest, XincangConstants.SYSTEM_ZONE))); |
||||||
|
} |
||||||
|
putIfPresent(form, "remark", cmd.remark()); |
||||||
|
return form; |
||||||
|
} |
||||||
|
|
||||||
|
/** 商品明细:{@code [{"product_sku":"...","sku_count":"1"}, ...]}。 */ |
||||||
|
static String productsJson(List<OutboundLine> lines, JsonCodec json) { |
||||||
|
List<XincangDtos.OrderProduct> products = new ArrayList<XincangDtos.OrderProduct>(lines.size()); |
||||||
|
for (OutboundLine line : lines) { |
||||||
|
XincangDtos.OrderProduct product = new XincangDtos.OrderProduct(); |
||||||
|
product.productSku = skuOf(line); |
||||||
|
product.skuCount = String.valueOf(line.quantity()); |
||||||
|
products.add(product); |
||||||
|
} |
||||||
|
return json.toJson(products); |
||||||
|
} |
||||||
|
|
||||||
|
/** 仓侧 SKU 优先;没有映射时用 OMS 主 SKU。 */ |
||||||
|
static String skuOf(OutboundLine line) { |
||||||
|
String providerSku = line.providerSku(); |
||||||
|
if (providerSku != null && !providerSku.trim().isEmpty()) { |
||||||
|
return providerSku.trim(); |
||||||
|
} |
||||||
|
return line.omsSku(); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓订单类型只接受 {@code common} / {@code wayfair}。 |
||||||
|
* |
||||||
|
* <p>Wayfair 渠道走 {@code wayfair};其余平台走 {@code common}。 |
||||||
|
* 信仓不区分其它平台,不做臆造映射。</p> |
||||||
|
*/ |
||||||
|
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<String, String> form, String key, String value) { |
||||||
|
if (value != null && !value.trim().isEmpty()) { |
||||||
|
form.put(key, value.trim()); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
private static String requireText(String value, String field, WarehouseContext ctx) { |
||||||
|
if (value == null || value.trim().isEmpty()) { |
||||||
|
throw new ValidationException(ChannelException.builder() |
||||||
|
.message("xincang outbound requires " + field) |
||||||
|
.operation("warehouse.outbound.create") |
||||||
|
.provider(WarehouseProvider.XINCANG.name()) |
||||||
|
.requestId(ctx.requestId()) |
||||||
|
.retryable(false)); |
||||||
|
} |
||||||
|
return value.trim(); |
||||||
|
} |
||||||
|
|
||||||
|
private static String firstNonBlank(String a, String b) { |
||||||
|
if (a != null && !a.trim().isEmpty()) { |
||||||
|
return a.trim(); |
||||||
|
} |
||||||
|
return b == null ? null : b.trim(); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,114 @@ |
|||||||
|
package common.ecommerce.xincang.adapter; |
||||||
|
|
||||||
|
import common.ecommerce.shared.support.Money; |
||||||
|
import common.ecommerce.warehouse.capability.WarehouseProduct; |
||||||
|
import common.ecommerce.xincang.XincangConstants; |
||||||
|
import common.ecommerce.xincang.dto.XincangDtos; |
||||||
|
|
||||||
|
import java.math.BigDecimal; |
||||||
|
import java.math.RoundingMode; |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓商品报文映射({@code POST api.add_product} / {@code api.update_product})。 |
||||||
|
* |
||||||
|
* <p>平台字段名只出现在本类与 {@link XincangDtos}。单位换算也在这里: |
||||||
|
* 统一模型用 cm / g,信仓用 inch / lbs,按 {@link XincangConstants} 里的常量换算并保留 4 位小数 |
||||||
|
* (文档「最长四位小数」)。</p> |
||||||
|
* |
||||||
|
* <p>文档未定义「包装方式 / 是否 SN / 客退处理 / 海关信息」等字段,这些统一模型字段 |
||||||
|
* <b>不发送</b>,避免自行编造平台不认的键。</p> |
||||||
|
*/ |
||||||
|
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。 |
||||||
|
* |
||||||
|
* <p>信仓把 {@code bar_code} 列为必填且查重(重复会报「产品条形码已存在」), |
||||||
|
* 用 SKU 兜底可以保证单次建档能通过;调用方应尽量显式给真实条码。</p> |
||||||
|
*/ |
||||||
|
public static String barcodeOf(WarehouseProduct product) { |
||||||
|
String barcode = product.barcode(); |
||||||
|
if (barcode != null && !barcode.trim().isEmpty()) { |
||||||
|
return barcode.trim(); |
||||||
|
} |
||||||
|
return skuOf(product); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 金额:取申报价值。 |
||||||
|
* |
||||||
|
* <p>信仓 {@code amount} 固定美元且最多两位小数,其他币种直接拒绝,避免静默按美元记错价。 |
||||||
|
* 未给申报价值时按 0.00 发送(文档必填项)。</p> |
||||||
|
*/ |
||||||
|
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; |
||||||
|
} |
||||||
|
} |
||||||
@ -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})。 |
||||||
|
* |
||||||
|
* <p>信仓的「转运」= 从信仓发货到平台仓(FBA / 其它),在统一模型里对应 |
||||||
|
* {@link TransferType#OUTBOUND}:发货仓是信仓自己,目的仓是平台仓。</p> |
||||||
|
* |
||||||
|
* <p>字典字段({@code order_type} / {@code delivery_mode} / {@code delivery_way} / |
||||||
|
* {@code label_requirement})信仓只认它自己字典的原值,调用方需从字典接口取; |
||||||
|
* SDK 不做枚举归一,也不猜测取值。</p> |
||||||
|
*/ |
||||||
|
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<XincangDtos.TransferProduct> products(TransferCommand cmd) { |
||||||
|
List<XincangDtos.TransferProduct> products = |
||||||
|
new ArrayList<XincangDtos.TransferProduct>(cmd.lines().size()); |
||||||
|
for (TransferCommand.TransferLine line : cmd.lines()) { |
||||||
|
XincangDtos.TransferProduct product = new XincangDtos.TransferProduct(); |
||||||
|
product.productNo = line.providerSku(); |
||||||
|
product.skuCount = String.valueOf(line.quantity()); |
||||||
|
products.add(product); |
||||||
|
} |
||||||
|
return products; |
||||||
|
} |
||||||
|
|
||||||
|
/** 打托:true → 是 / false → 否 / null → 不传。 */ |
||||||
|
private static String booleanText(Boolean value) { |
||||||
|
if (value == null) { |
||||||
|
return null; |
||||||
|
} |
||||||
|
return value ? "是" : "否"; |
||||||
|
} |
||||||
|
|
||||||
|
private static String copies(Integer copies) { |
||||||
|
return copies == null ? null : String.valueOf(copies); |
||||||
|
} |
||||||
|
|
||||||
|
private static String formatDate(LocalDate date) { |
||||||
|
return date == null ? null : DATE.format(date); |
||||||
|
} |
||||||
|
|
||||||
|
private static String join(List<String> values) { |
||||||
|
StringBuilder sb = new StringBuilder(); |
||||||
|
for (String value : values) { |
||||||
|
if (sb.length() > 0) { |
||||||
|
sb.append(LABEL_SEPARATOR); |
||||||
|
} |
||||||
|
sb.append(value); |
||||||
|
} |
||||||
|
return sb.toString(); |
||||||
|
} |
||||||
|
|
||||||
|
private static String require(String value, String field, WarehouseContext ctx) { |
||||||
|
if (value == null || value.trim().isEmpty()) { |
||||||
|
throw validation(ctx, field + " is required for xincang transfer"); |
||||||
|
} |
||||||
|
return value.trim(); |
||||||
|
} |
||||||
|
|
||||||
|
private static String firstNonBlank(String a, String fallback) { |
||||||
|
if (a != null && !a.trim().isEmpty()) { |
||||||
|
return a.trim(); |
||||||
|
} |
||||||
|
return fallback; |
||||||
|
} |
||||||
|
|
||||||
|
private static String blankToNull(String v) { |
||||||
|
return v == null || v.trim().isEmpty() ? null : v.trim(); |
||||||
|
} |
||||||
|
|
||||||
|
private static ValidationException validation(WarehouseContext ctx, String message) { |
||||||
|
return new ValidationException(ChannelException.builder() |
||||||
|
.message(message) |
||||||
|
.operation("warehouse.transfer.create") |
||||||
|
.provider(WarehouseProvider.XINCANG.name()) |
||||||
|
.requestId(ctx.requestId()) |
||||||
|
.retryable(false)); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,49 @@ |
|||||||
|
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.sdk.WarehouseContext; |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓暂时不支持的出库 / 调拨能力。 |
||||||
|
* |
||||||
|
* <p>本轮只接入「新增订单」与「转运创建 / 审核」,查询、取消、包裹都还没接。 |
||||||
|
* 这里统一抛 {@link ValidationException}({@code retryable=false}),<b>不返回空集合</b>—— |
||||||
|
* 静默返回 {@code null} / 空会让调用方以为「仓说没有这单」。</p> |
||||||
|
*/ |
||||||
|
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)); |
||||||
|
} |
||||||
|
} |
||||||
@ -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 请求体构造。 |
||||||
|
* |
||||||
|
* <p>信仓「新增订单一单多件」要求 {@code multipart/form-data},字段值里的 |
||||||
|
* {@code products} 本身就是一段 JSON 字符串。这里用固定 boundary, |
||||||
|
* 保证同一份入参生成的报文每次都一样,便于契约测试断言。</p> |
||||||
|
*/ |
||||||
|
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<String, String> form, |
||||||
|
String token, String operation) { |
||||||
|
return HttpRequest.builder() |
||||||
|
.method("POST") |
||||||
|
.url(trimTrailingSlash(baseUrl) + path |
||||||
|
+ "?token=" + urlEncode(token)) |
||||||
|
.contentType(CONTENT_TYPE) |
||||||
|
.body(body(form)) |
||||||
|
.operation(operation) |
||||||
|
.build(); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 字段按 key 升序输出(信仓文档不要求顺序,固定顺序只为可断言)。 |
||||||
|
* |
||||||
|
* <p>值为 null 的字段跳过——可选字段没给就不发,避免把空串误当成业务值。</p> |
||||||
|
*/ |
||||||
|
static String body(Map<String, String> form) { |
||||||
|
StringBuilder sb = new StringBuilder(); |
||||||
|
Map<String, String> sorted = new TreeMap<String, String>(); |
||||||
|
if (form != null) { |
||||||
|
for (Map.Entry<String, String> e : form.entrySet()) { |
||||||
|
if (e.getValue() != null) { |
||||||
|
sorted.put(e.getKey(), e.getValue()); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
for (Map.Entry<String, String> e : sorted.entrySet()) { |
||||||
|
sb.append("--").append(BOUNDARY).append("\r\n") |
||||||
|
.append("Content-Disposition: form-data; name=\"").append(e.getKey()).append("\"\r\n") |
||||||
|
.append("\r\n") |
||||||
|
.append(e.getValue()).append("\r\n"); |
||||||
|
} |
||||||
|
sb.append("--").append(BOUNDARY).append("--\r\n"); |
||||||
|
return sb.toString(); |
||||||
|
} |
||||||
|
|
||||||
|
private static String trimTrailingSlash(String url) { |
||||||
|
String trimmed = url.trim(); |
||||||
|
int end = trimmed.length(); |
||||||
|
while (end > 0 && trimmed.charAt(end - 1) == '/') { |
||||||
|
end--; |
||||||
|
} |
||||||
|
return trimmed.substring(0, end); |
||||||
|
} |
||||||
|
|
||||||
|
private static String urlEncode(String v) { |
||||||
|
try { |
||||||
|
return URLEncoder.encode(v == null ? "" : v, "UTF-8"); |
||||||
|
} catch (UnsupportedEncodingException e) { |
||||||
|
throw new IllegalStateException(e); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -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)); |
||||||
|
} |
||||||
|
} |
||||||
@ -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.*; |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓商品建档契约测试。 |
||||||
|
* |
||||||
|
* <p>覆盖:先查临时产品再决定 add / update、单位换算(cm→inch、g→lbs)、 |
||||||
|
* token 在两处(query 与 body)、必填兜底与错误传播。</p> |
||||||
|
*/ |
||||||
|
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)); |
||||||
|
} |
||||||
|
} |
||||||
@ -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)); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue