Browse Source
冲突处理: 1. WarehouseDirectoryCapable(add/add) 两侧各建了一个同名接口:本地返回 WarehouseInfo,远端返回 WarehouseFacility 并多了 carriers()。合并为:统一用 WarehouseFacility(远端模型,含 providerWarehouseId / postcode 等字段),carriers() 保留但给默认实现 (没有承运商接口的仓抛不支持,不返回空列表)。删除本地 WarehouseInfo。 2. WarehouseCapability 两侧都加了「基础资料」能力位:本地 WAREHOUSE_DIRECTORY(230),远端 DIRECTORY(210)。统一为 DIRECTORY,删掉重复项;顺带修掉合并时产生的 枚举顺序错乱与重复注释。 3. InboundCommand 本地补了运去哪的 11 个字段(lineName / shipmentId / attachments / transportType 等),远端补了信仓的 10 个字段(shipmentType / cabinetType / deliveryRequirements 等)。两侧都保留——不同仓的字段并集。 4. InboundCapable 本地加了 printBoxLabel / printSkuLabel,远端加了 improve / submit。 两侧都保留。 运去哪适配器跟随改为返回 WarehouseFacility,映射 state→province 双写、 postal→postcode。 全量 505 个测试通过(新增信仓 17 个)。 Co-Authored-By: Claude <noreply@anthropic.com>feature/supplier-lingxing
23 changed files with 1701 additions and 123 deletions
@ -1,25 +1,40 @@
@@ -1,25 +1,40 @@
|
||||
package common.ecommerce.warehouse.capability; |
||||
|
||||
import common.ecommerce.warehouse.model.WarehouseInfo; |
||||
import common.ecommerce.warehouse.model.WarehouseFacility; |
||||
import common.ecommerce.warehouse.sdk.WarehouseAdapter; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 仓目录能力:查询仓方名下的可用仓库清单。 |
||||
* 仓方基础资料能力:列出账户下可用的仓库与承运商。 |
||||
* |
||||
* <p>只读主数据,无幂等。用于宿主初始化 / 定期同步本地仓档案; |
||||
* 不属于业务单据流,也不按单个仓过滤(一次返回组织下全部可用仓)。</p> |
||||
* <p>用途是让宿主在下单前拿到仓代码 / 物流方式,而不是把取值写死在配置里。 |
||||
* 只读,无幂等要求。</p> |
||||
*/ |
||||
public interface WarehouseDirectoryCapable extends WarehouseAdapter { |
||||
|
||||
/** |
||||
* 查仓方名下的仓库清单。 |
||||
* 客户名下所有仓库。 |
||||
* |
||||
* @return 仓库档案;仓方没有可用仓时为空列表(不是错误) |
||||
* @return 仓库列表;仓方返回空时为 empty list(不是错误) |
||||
* @throws common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException |
||||
* 该仓不声明 {@code WAREHOUSE_DIRECTORY} |
||||
* 该仓不声明 {@code DIRECTORY} |
||||
*/ |
||||
List<WarehouseInfo> warehouses(WarehouseContext ctx); |
||||
List<WarehouseFacility> warehouses(WarehouseContext ctx); |
||||
|
||||
/** |
||||
* 客户可用的承运商 / 物流方式代码。 |
||||
* |
||||
* <p>没有独立承运商接口的仓可以不实现;默认抛不支持,<b>不返回空列表</b>—— |
||||
* 空列表和「不支持」调用方分不清。</p> |
||||
* |
||||
* @return 物流方式码列表,如 {@code FEDEX-G} |
||||
* @throws common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException |
||||
* 该仓不声明 {@code DIRECTORY} 或没有承运商接口 |
||||
*/ |
||||
default List<String> carriers(WarehouseContext ctx) { |
||||
throw new common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException( |
||||
common.ecommerce.warehouse.enums.WarehouseCapability.DIRECTORY); |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,213 @@
@@ -0,0 +1,213 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.error.ChannelException; |
||||
import common.ecommerce.shared.error.ValidationException; |
||||
import common.ecommerce.shared.support.Page; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.enums.InboundStatus; |
||||
import common.ecommerce.warehouse.model.InboundCommand; |
||||
import common.ecommerce.warehouse.model.InboundLine; |
||||
import common.ecommerce.warehouse.model.InboundOrder; |
||||
import common.ecommerce.warehouse.model.InboundOrderLine; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.xincang.XincangConstants; |
||||
import common.ecommerce.xincang.dto.XincangDtos; |
||||
import common.ecommerce.xincang.enums.XincangForecastStatus; |
||||
|
||||
import java.time.Instant; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 头程预报报文映射(信仓 {@code forecast.*} 系列)。 |
||||
* |
||||
* <p>信仓把入库拆成两步:{@code do_forecast} 先建空单,{@code do_improve_forecast} |
||||
* 再补商品明细;统一模型里对应 {@code InboundCommand} 的 {@code create} 与 {@code improve}。</p> |
||||
* |
||||
* <p>时间字段按北京时间解析成 UTC。</p> |
||||
*/ |
||||
public final class XincangForecastMapper { |
||||
|
||||
private static final String YES = "1"; |
||||
private static final String NO = "0"; |
||||
|
||||
private XincangForecastMapper() { |
||||
} |
||||
|
||||
/** |
||||
* 统一命令 → 新增预报请求。 |
||||
* |
||||
* <p>信仓必填:目的仓、出运类型、柜型、柜号、参考发货 / 到港时间、发货需求、 |
||||
* 参考 SKU 种类数。缺一项在下发前就拒绝,避免仓返回难懂的 err。</p> |
||||
*/ |
||||
public static XincangDtos.ForecastCreateRequest toCreateRequest(InboundCommand cmd, |
||||
WarehouseContext ctx) { |
||||
XincangDtos.ForecastCreateRequest req = new XincangDtos.ForecastCreateRequest(); |
||||
req.destWarehouse = require(cmd.warehouseId(), "warehouseId (dest_warehouse)", ctx); |
||||
req.shipmentType = require(cmd.shipmentType(), "shipmentType", ctx); |
||||
req.cabinetType = require(cmd.cabinetType(), "cabinetType", ctx); |
||||
req.cabinetNo = require(cmd.containerNo(), "containerNo (cabinet_no)", ctx); |
||||
req.rfcEtd = requireDate(cmd.predictionShipDate(), "predictionShipDate (rfc_etd)", ctx); |
||||
req.rfcEta = requireDate(cmd.estimateArriveDate(), "estimateArriveDate (rfc_eta)", ctx); |
||||
req.deliveryRequirements = require(cmd.deliveryRequirements(), "deliveryRequirements", ctx); |
||||
// 参考 SKU 种类数:没有明细时按行数给,有明细时也按行数(信仓只要求一个估计值)
|
||||
req.rfcSkuCount = String.valueOf(cmd.lines().size()); |
||||
req.chnName = blankToNull(cmd.chnName()); |
||||
req.isOversize = cmd.oversize() == null ? null : (cmd.oversize() ? YES : NO); |
||||
req.oversizeVal = blankToNull(cmd.oversizeNote()); |
||||
req.remark = blankToNull(cmd.remark()); |
||||
req.shippingCompanyId = blankToNull(cmd.shippingCompanyId()); |
||||
req.forecastPalletQty = cmd.forecastPalletQty() == null |
||||
? null : String.valueOf(cmd.forecastPalletQty()); |
||||
return req; |
||||
} |
||||
|
||||
/** |
||||
* 统一命令 → 完善资料请求。 |
||||
* |
||||
* @param forecastNo 新增预报返回的 {@code order_no} |
||||
* @param productsJson 商品明细 JSON 字符串 |
||||
*/ |
||||
public static XincangDtos.ForecastImproveRequest toImproveRequest(InboundCommand cmd, |
||||
String forecastNo, |
||||
String productsJson, |
||||
WarehouseContext ctx) { |
||||
XincangDtos.ForecastImproveRequest req = new XincangDtos.ForecastImproveRequest(); |
||||
req.forecastNo = require(forecastNo, "forecastNo", ctx); |
||||
req.destWarehouse = require(cmd.warehouseId(), "warehouseId (dest_warehouse)", ctx); |
||||
req.shipmentType = require(cmd.shipmentType(), "shipmentType", ctx); |
||||
req.refNo = require(cmd.referenceNo(), "referenceNo (ref_no)", ctx); |
||||
if (req.refNo.length() > 32) { |
||||
throw validation(ctx, "referenceNo must not exceed 32 chars (信仓 ref_no)"); |
||||
} |
||||
req.cabinetType = require(cmd.cabinetType(), "cabinetType", ctx); |
||||
req.cabinetNo = require(cmd.containerNo(), "containerNo (cabinet_no)", ctx); |
||||
req.etd = requireDate(cmd.predictionShipDate(), "predictionShipDate (etd)", ctx); |
||||
req.eta = requireDate(cmd.estimateArriveDate(), "estimateArriveDate (eta)", ctx); |
||||
req.deliveryRequirements = require(cmd.deliveryRequirements(), "deliveryRequirements", ctx); |
||||
req.remark = blankToNull(cmd.remark()); |
||||
req.otherNeed = blankToNull(cmd.otherNeed()); |
||||
req.products = productsJson; |
||||
req.shippingCompanyId = blankToNull(cmd.shippingCompanyId()); |
||||
req.forecastPalletQty = cmd.forecastPalletQty() == null |
||||
? null : String.valueOf(cmd.forecastPalletQty()); |
||||
return req; |
||||
} |
||||
|
||||
/** |
||||
* 入库行 → 完善资料的产品明细。 |
||||
* |
||||
* <p>信仓要求 {@code box_count} 必填,统一模型没有独立箱数字段, |
||||
* 按「一箱一件」兜底({@code box_count = sku_count});装箱率不同的场景 |
||||
* 需要调用方在 {@code InboundCarton} 里显式给出,本轮不做更细的拆分。</p> |
||||
*/ |
||||
public static List<XincangDtos.ForecastProduct> products(InboundCommand cmd) { |
||||
List<XincangDtos.ForecastProduct> products = |
||||
new ArrayList<XincangDtos.ForecastProduct>(cmd.lines().size()); |
||||
for (InboundLine line : cmd.lines()) { |
||||
XincangDtos.ForecastProduct product = new XincangDtos.ForecastProduct(); |
||||
product.productNo = line.providerSku() == null ? line.omsSku() : line.providerSku(); |
||||
product.skuCount = String.valueOf(line.quantity()); |
||||
product.boxCount = String.valueOf(line.quantity()); |
||||
products.add(product); |
||||
} |
||||
return products; |
||||
} |
||||
|
||||
/** |
||||
* 预报详情 → {@link InboundOrder}。 |
||||
* |
||||
* <p>双号:{@code forecast_no} 既作仓侧单号也作业务单号兜底—— |
||||
* 信仓的 {@code ref_no} 可能为空。</p> |
||||
*/ |
||||
public static InboundOrder toOrder(XincangDtos.ForecastDetail detail, WarehouseContext ctx) { |
||||
InboundStatus status = XincangForecastStatus.toCore(detail.state); |
||||
List<InboundOrderLine> lines = new ArrayList<InboundOrderLine>(); |
||||
if (detail.products != null) { |
||||
for (XincangDtos.ForecastDetailProduct product : detail.products) { |
||||
if (product == null || blank(product.productNo)) { |
||||
continue; |
||||
} |
||||
lines.add(InboundOrderLine.builder() |
||||
.providerSku(product.productNo.trim()) |
||||
.plannedQuantity(intOf(product.skuCount)) |
||||
.packedQuantity(intOf(product.boxCount)) |
||||
.receivedQuantity(intOf(product.putOnSkuCount)) |
||||
.build()); |
||||
} |
||||
} |
||||
return InboundOrder.builder() |
||||
.inboundRequestNo(firstNonBlank(detail.refNo, detail.forecastNo)) |
||||
.providerInboundId(detail.forecastNo) |
||||
.warehouseCode(firstNonBlank(detail.destWarehouseName, ctx.providerWarehouseId())) |
||||
.status(status) |
||||
.rawStatus(detail.state) |
||||
.sourceProvider(WarehouseProvider.XINCANG) |
||||
.boxCount(intOf(detail.rfcSkuCount)) |
||||
.createdAt(parseTime(detail.gmtCreate)) |
||||
.receivedAt(parseTime(detail.receiveTime)) |
||||
.estimatedArrivalAt(parseTime(detail.rfcEta)) |
||||
.actualArrivalAt(parseTime(detail.eta)) |
||||
.remark(blankToNull(detail.remark)) |
||||
.lines(lines) |
||||
.build(); |
||||
} |
||||
|
||||
/** |
||||
* 详情分页:信仓详情是单条查询,没有列表接口。 |
||||
* |
||||
* <p>入参是单号,返回 0 或 1 条;{@code cursor} 恒为 null。</p> |
||||
*/ |
||||
public static Page<InboundOrder> singlePage(InboundOrder order) { |
||||
if (order == null) { |
||||
return Page.empty(); |
||||
} |
||||
return Page.last(java.util.Collections.singletonList(order)); |
||||
} |
||||
|
||||
// ---------------------------------------------------------------- internals
|
||||
|
||||
static Instant parseTime(String raw) { |
||||
return XincangOrderDetailMapper.parseTime(raw); |
||||
} |
||||
|
||||
static int intOf(String raw) { |
||||
return XincangOrderDetailMapper.parsePositiveInt(raw); |
||||
} |
||||
|
||||
private static String requireDate(java.time.LocalDate date, String field, WarehouseContext ctx) { |
||||
if (date == null) { |
||||
throw validation(ctx, field + " is required for xincang forecast"); |
||||
} |
||||
return date.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
||||
} |
||||
|
||||
private static String require(String value, String field, WarehouseContext ctx) { |
||||
if (blank(value)) { |
||||
throw validation(ctx, field + " is required for xincang forecast"); |
||||
} |
||||
return value.trim(); |
||||
} |
||||
|
||||
private static ValidationException validation(WarehouseContext ctx, String message) { |
||||
return new ValidationException(ChannelException.builder() |
||||
.message(message) |
||||
.operation("warehouse.inbound.create") |
||||
.provider(WarehouseProvider.XINCANG.name()) |
||||
.requestId(ctx.requestId()) |
||||
.retryable(false)); |
||||
} |
||||
|
||||
static String firstNonBlank(String a, String b) { |
||||
return XincangOrderDetailMapper.firstNonBlank(a, b); |
||||
} |
||||
|
||||
static String blankToNull(String v) { |
||||
return XincangOrderDetailMapper.blankToNull(v); |
||||
} |
||||
|
||||
static boolean blank(String v) { |
||||
return XincangOrderDetailMapper.blank(v); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,144 @@
@@ -0,0 +1,144 @@
|
||||
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.WarehouseFacility; |
||||
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.List; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 基础资料(客户仓库 / 承运商)契约测试。 |
||||
*/ |
||||
class XincangDirectoryTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
private static final String WAREHOUSES = "{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":[" |
||||
+ "{\"id\":\"84047962214173\",\"warehouse_code\":\"CA-3790\",\"country\":\"US\"," |
||||
+ "\"province\":\"CA\",\"city\":\"JURUPA VALLEY\"," |
||||
+ "\"street\":\"3790 DE FOREST CIRCLE, UNIT B\",\"postcode\":\"91752\"}," |
||||
+ "{\"id\":\"84047962479824\",\"warehouse_code\":\"NJ-2605\",\"country\":\"US\"," |
||||
+ "\"province\":\"NJ\",\"city\":\"Burlington Township\"," |
||||
+ "\"street\":\"2605 Rancocas Road\",\"postcode\":\"08016\"}" |
||||
+ "],\"count\":\"2\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-wh\"}"; |
||||
|
||||
private static final String LOGISTICS = "{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":[" |
||||
+ "{\"logistics_type\":\"FEDEX-HD\"},{\"logistics_type\":\"FEDEX-G\"}" |
||||
+ "],\"count\":\"2\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-lg\"}"; |
||||
|
||||
private RecordingTransport transport; |
||||
private XincangAdapter adapter; |
||||
|
||||
@BeforeEach |
||||
void setUp() { |
||||
transport = RecordingTransport.create(); |
||||
MutableClock clock = MutableClock.atUtc("2026-11-11T00: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-NJ-2605", WarehouseProvider.XINCANG, "NJ-2605", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
@Test |
||||
void listsWarehousesWithAddress() { |
||||
transport.route(XincangConstants.PATH_CUSTOMER_WAREHOUSES, req -> Responses.ok(WAREHOUSES)); |
||||
|
||||
List<WarehouseFacility> warehouses = adapter.warehouses(ctx()); |
||||
|
||||
String url = transport.lastDataRequest().url(); |
||||
assertTrue(url.contains("/api.get_customer_warehouses?token=%7BT-1%7D"), url); |
||||
|
||||
assertEquals(2, warehouses.size()); |
||||
WarehouseFacility first = warehouses.get(0); |
||||
assertEquals("CA-3790", first.warehouseCode()); |
||||
assertEquals("84047962214173", first.providerWarehouseId()); |
||||
assertEquals("US", first.country()); |
||||
assertEquals("CA", first.province()); |
||||
assertEquals("JURUPA VALLEY", first.city()); |
||||
assertEquals("3790 DE FOREST CIRCLE, UNIT B", first.street()); |
||||
assertEquals("91752", first.postcode()); |
||||
assertEquals("NJ-2605", warehouses.get(1).warehouseCode()); |
||||
} |
||||
|
||||
@Test |
||||
void listsCarriers() { |
||||
transport.route(XincangConstants.PATH_CUSTOMER_LOGISTICS, req -> Responses.ok(LOGISTICS)); |
||||
|
||||
List<String> carriers = adapter.carriers(ctx()); |
||||
|
||||
assertTrue(transport.lastDataRequest().url() |
||||
.contains("/api.get_customer_logistics?"), transport.lastDataRequest().url()); |
||||
assertEquals(2, carriers.size()); |
||||
assertEquals("FEDEX-HD", carriers.get(0)); |
||||
assertEquals("FEDEX-G", carriers.get(1)); |
||||
} |
||||
|
||||
@Test |
||||
void emptyDataYieldsEmptyListNotError() { |
||||
transport.route(XincangConstants.PATH_CUSTOMER_WAREHOUSES, req -> Responses.ok( |
||||
"{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":[],\"count\":\"0\"}," |
||||
+ "\"errno\":0,\"err\":\"\"}")); |
||||
transport.route(XincangConstants.PATH_CUSTOMER_LOGISTICS, req -> Responses.ok( |
||||
"{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":[],\"count\":\"0\"}," |
||||
+ "\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
assertTrue(adapter.warehouses(ctx()).isEmpty()); |
||||
assertTrue(adapter.carriers(ctx()).isEmpty()); |
||||
} |
||||
|
||||
@Test |
||||
void rowsWithoutWarehouseCodeAreSkipped() { |
||||
transport.route(XincangConstants.PATH_CUSTOMER_WAREHOUSES, req -> Responses.ok( |
||||
"{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":[" |
||||
+ "{\"id\":\"1\",\"warehouse_code\":\"\",\"country\":\"US\"}," |
||||
+ "{\"id\":\"2\",\"warehouse_code\":\"CA-3790\",\"country\":\"US\"}" |
||||
+ "],\"count\":\"2\"},\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
List<WarehouseFacility> warehouses = adapter.warehouses(ctx()); |
||||
|
||||
assertEquals(1, warehouses.size()); |
||||
assertEquals("CA-3790", warehouses.get(0).warehouseCode()); |
||||
} |
||||
|
||||
@Test |
||||
void missingRstIsNotSilentEmpty() { |
||||
transport.route(XincangConstants.PATH_CUSTOMER_LOGISTICS, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
assertThrows(ValidationException.class, () -> adapter.carriers(ctx())); |
||||
} |
||||
|
||||
@Test |
||||
void directoryCapabilityDeclared() { |
||||
assertTrue(adapter.capabilities().contains(WarehouseCapability.DIRECTORY)); |
||||
assertTrue(adapter.supports("XC-NJ-2605", WarehouseCapability.DIRECTORY)); |
||||
} |
||||
} |
||||
@ -0,0 +1,249 @@
@@ -0,0 +1,249 @@
|
||||
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.InboundStatus; |
||||
import common.ecommerce.warehouse.enums.WarehouseCapability; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.InboundCommand; |
||||
import common.ecommerce.warehouse.model.InboundLine; |
||||
import common.ecommerce.warehouse.model.InboundOrder; |
||||
import common.ecommerce.warehouse.model.InboundReceipt; |
||||
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.Instant; |
||||
import java.time.LocalDate; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 头程预报四个接口(新增 / 完善资料 / 提交 / 详情)契约测试。 |
||||
*/ |
||||
class XincangForecastTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
private static final String DETAIL_BODY = "{\"rst\":{" |
||||
+ "\"forecast_no\":\"OFCS2610150000325\"," |
||||
+ "\"dest_warehouse\":\"84047962479824\"," |
||||
+ "\"dest_warehouse_name\":\"NJ-2605\"," |
||||
+ "\"shipment_type\":\"1\"," |
||||
+ "\"ref_no\":\"ref-api-test-0002\"," |
||||
+ "\"cabinet_type\":\"40GP\"," |
||||
+ "\"cabinet_no\":\"cabinet-api-test-0002\"," |
||||
+ "\"rfc_etd\":\"2026-09-16 08:00:00\"," |
||||
+ "\"rfc_eta\":\"2026-10-14 08:00:00\"," |
||||
+ "\"etd\":\"2026-09-21 08:00:00\"," |
||||
+ "\"eta\":\"2026-10-22 08:00:00\"," |
||||
+ "\"rfc_sku_count\":\"3\"," |
||||
+ "\"remark\":\"kkkkkkksss\"," |
||||
+ "\"receive_time\":\"\"," |
||||
+ "\"gmt_create\":\"2026-10-15 15:40:33\"," |
||||
+ "\"state\":\"2\"," |
||||
+ "\"state_name\":\"预报完成\"," |
||||
+ "\"products\":[" |
||||
+ "{\"product_no\":\"HB-B2060-RED\",\"sku_count\":\"100\",\"box_count\":\"100\"," |
||||
+ "\"put_on_sku_count\":\"80\"}" |
||||
+ "]},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-detail\"}"; |
||||
|
||||
private RecordingTransport transport; |
||||
private XincangAdapter adapter; |
||||
|
||||
@BeforeEach |
||||
void setUp() { |
||||
transport = RecordingTransport.create(); |
||||
MutableClock clock = MutableClock.atUtc("2026-11-11T00: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-NJ-2605", WarehouseProvider.XINCANG, "NJ-2605", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
/** 信仓预报要求单头字段齐全。 */ |
||||
private static InboundCommand command() { |
||||
return InboundCommand.builder() |
||||
.inboundRequestNo("IN-20261111-001") |
||||
.warehouseId("NJ-2605") |
||||
// 出运类型 1 空运 / 2 海运
|
||||
.shipmentType("2") |
||||
// 柜型 1 = 40GP
|
||||
.cabinetType("1") |
||||
.containerNo("CAB-0001") |
||||
// 参考发货 / 到港
|
||||
.predictionShipDate(LocalDate.parse("2026-11-20")) |
||||
.estimateArriveDate(LocalDate.parse("2026-12-10")) |
||||
// 发货需求 1 一件代发
|
||||
.deliveryRequirements("1") |
||||
.referenceNo("ref-001") |
||||
.remark("备注") |
||||
.line(InboundLine.builder().omsSku("SKU-A").providerSku("SKU-A").quantity(100).build()) |
||||
.build(); |
||||
} |
||||
|
||||
@Test |
||||
void createSendsHeadOnlyAndReturnsForecastNo() { |
||||
transport.route(XincangConstants.PATH_FORECAST_CREATE, req -> Responses.ok( |
||||
"{\"rst\":{\"order_no\":\"OFCS2610150000325\"},\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
InboundReceipt receipt = adapter.create(ctx(), command()); |
||||
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertTrue(req.url().contains("/forecast.do_forecast?token=%7BT-1%7D"), req.url()); |
||||
String body = req.body(); |
||||
assertTrue(body.contains("\"dest_warehouse\":\"NJ-2605\""), body); |
||||
assertTrue(body.contains("\"shipment_type\":\"2\""), body); |
||||
assertTrue(body.contains("\"cabinet_type\":\"1\""), body); |
||||
assertTrue(body.contains("\"cabinet_no\":\"CAB-0001\""), body); |
||||
assertTrue(body.contains("\"rfc_etd\":\"2026-11-20\""), body); |
||||
assertTrue(body.contains("\"rfc_eta\":\"2026-12-10\""), body); |
||||
assertTrue(body.contains("\"delivery_requirements\":\"1\""), body); |
||||
assertTrue(body.contains("\"rfc_sku_count\":\"1\""), body); |
||||
// 创建阶段不带明细
|
||||
assertFalse(body.contains("products"), body); |
||||
|
||||
assertEquals("IN-20261111-001", receipt.inboundRequestNo()); |
||||
assertEquals("OFCS2610150000325", receipt.providerInboundId()); |
||||
} |
||||
|
||||
@Test |
||||
void createRejectsMissingHeadFieldBeforeSending() { |
||||
InboundCommand incomplete = InboundCommand.builder() |
||||
.inboundRequestNo("IN-2").warehouseId("NJ-2605") |
||||
.line(InboundLine.builder().omsSku("SKU-A").quantity(1).build()) |
||||
.build(); |
||||
|
||||
ValidationException e = assertThrows(ValidationException.class, |
||||
() -> adapter.create(ctx(), incomplete)); |
||||
assertTrue(e.getMessage().contains("shipmentType"), e.getMessage()); |
||||
assertFalse(transport.recorded().stream() |
||||
.anyMatch(r -> r.url().contains(XincangConstants.PATH_FORECAST_CREATE))); |
||||
} |
||||
|
||||
@Test |
||||
void improveSendsProductsAsJsonString() { |
||||
transport.route(XincangConstants.PATH_FORECAST_IMPROVE, req -> Responses.ok( |
||||
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
adapter.improve(ctx(), "OFCS2610150000325", command()); |
||||
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertTrue(req.url().contains("/forecast.do_improve_forecast?"), req.url()); |
||||
String body = req.body(); |
||||
assertTrue(body.contains("\"forecast_no\":\"OFCS2610150000325\""), body); |
||||
assertTrue(body.contains("\"ref_no\":\"ref-001\""), body); |
||||
assertTrue(body.contains("\"etd\":\"2026-11-20\""), body); |
||||
assertTrue(body.contains("\"eta\":\"2026-12-10\""), body); |
||||
// products 是 JSON 字符串
|
||||
assertTrue(body.contains("\\\"product_no\\\":\\\"SKU-A\\\""), body); |
||||
assertTrue(body.contains("\\\"sku_count\\\":\\\"100\\\""), body); |
||||
assertTrue(body.contains("\\\"box_count\\\":\\\"100\\\""), body); |
||||
} |
||||
|
||||
@Test |
||||
void improveRejectsTooLongReferenceNo() { |
||||
InboundCommand longRef = InboundCommand.builder() |
||||
.inboundRequestNo("IN-3").warehouseId("NJ-2605") |
||||
.shipmentType("2").cabinetType("1").containerNo("C") |
||||
.predictionShipDate(LocalDate.parse("2026-11-20")) |
||||
.estimateArriveDate(LocalDate.parse("2026-12-10")) |
||||
.deliveryRequirements("1") |
||||
.referenceNo("ref-ref-ref-ref-ref-ref-ref-ref-1234") |
||||
.line(InboundLine.builder().omsSku("SKU-A").quantity(1).build()) |
||||
.build(); |
||||
|
||||
ValidationException e = assertThrows(ValidationException.class, |
||||
() -> adapter.improve(ctx(), "OFCS-1", longRef)); |
||||
assertTrue(e.getMessage().contains("32"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void submitSendsForecastNoInBothQueryAndBody() { |
||||
transport.route(XincangConstants.PATH_FORECAST_SUBMIT, req -> Responses.ok( |
||||
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||
|
||||
adapter.submit(ctx(), "OFCS2610150000325"); |
||||
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertEquals("POST", req.method()); |
||||
assertTrue(req.url().contains("forecast_no=OFCS2610150000325"), req.url()); |
||||
assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); |
||||
assertTrue(req.body().contains("\"forecast_no\":\"OFCS2610150000325\""), req.body()); |
||||
} |
||||
|
||||
@Test |
||||
void submitRejectsBlankForecastNo() { |
||||
ValidationException e = assertThrows(ValidationException.class, |
||||
() -> adapter.submit(ctx(), " ")); |
||||
assertTrue(e.getMessage().contains("forecast_no"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void detailMapsToInboundOrder() { |
||||
transport.route(XincangConstants.PATH_FORECAST_DETAIL, req -> Responses.ok(DETAIL_BODY)); |
||||
|
||||
InboundOrder order = adapter.get(ctx(), "OFCS2610150000325"); |
||||
|
||||
String url = transport.lastDataRequest().url(); |
||||
assertTrue(url.contains("/forecast.forecast_detail?"), url); |
||||
assertTrue(url.contains("forecast_no=OFCS2610150000325"), url); |
||||
|
||||
assertEquals("ref-api-test-0002", order.inboundRequestNo()); |
||||
assertEquals("OFCS2610150000325", order.providerInboundId()); |
||||
assertEquals("NJ-2605", order.warehouseCode()); |
||||
assertEquals(InboundStatus.PENDING_SHIPMENT, order.status()); |
||||
assertEquals("2", order.rawStatus()); |
||||
assertEquals(WarehouseProvider.XINCANG, order.sourceProvider()); |
||||
// 北京时间 2026-10-15 15:40:33 → UTC 07:40:33
|
||||
assertEquals(Instant.parse("2026-10-15T07:40:33Z"), order.createdAt()); |
||||
assertNull(order.receivedAt(), "空串时间应为 null"); |
||||
|
||||
assertEquals(1, order.lines().size()); |
||||
assertEquals("HB-B2060-RED", order.lines().get(0).providerSku()); |
||||
assertEquals(100, order.lines().get(0).plannedQuantity()); |
||||
assertEquals(100, order.lines().get(0).packedQuantity()); |
||||
assertEquals(80, order.lines().get(0).receivedQuantity()); |
||||
} |
||||
|
||||
@Test |
||||
void queryWithoutCursorIsRejected() { |
||||
ValidationException e = assertThrows(ValidationException.class, |
||||
() -> adapter.query(ctx(), (String) null)); |
||||
assertTrue(e.getMessage().contains("no forecast list API"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void queryByCursorReturnsSinglePage() { |
||||
transport.route(XincangConstants.PATH_FORECAST_DETAIL, req -> Responses.ok(DETAIL_BODY)); |
||||
|
||||
assertEquals(1, adapter.query(ctx(), "OFCS2610150000325").size()); |
||||
} |
||||
|
||||
@Test |
||||
void inboundCapabilityDeclared() { |
||||
assertTrue(adapter.capabilities().contains(WarehouseCapability.INBOUND)); |
||||
assertTrue(adapter.supports("XC-NJ-2605", WarehouseCapability.INBOUND)); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue