Browse Source
- 订单详情 GET api.get_order:order_no 与 ckh 二选一(outboundRequestNo 走 ckh, providerOrderId 走 order_no),映射到 OutboundOrder - 转运详情 GET fba.fba_detail:token + order_no,映射到 TransferOrder 映射要点: - state 经 XincangOrderStatus / XincangTransferState → core 枚举,未知值归 UNKNOWN - 订单 order_type=wayfair → LabelMode.PLATFORM_LABEL,其余 WAREHOUSE_LABEL - 详情只回系统单号 order_no,outboundRequestNo 用它兜底,业务参考号进 orderRef - products[] 为空时退回 product_sku + sku_count 单值字段 - 时间按北京时间解析成 UTC;空串一律转 null - errno=0 但 rst 为空抛 ValidationException,不返回"查到了空单" core 只新增、不修改: - TransferCapable 增加 default getTransfer(ctx, providerTransferNo) - WarehouseOperations 增加 getTransfer,带 CallSupport.observe 方法名带 Transfer 后缀:InboundCapable 已有同签名的 get(ctx, String), 两者返回类型不同,同一适配器实现时无法区分(与既有 getReturn 同一手法)。 Co-Authored-By: Claude Code <noreply@anthropic.com>feature/supplier-lingxing
12 changed files with 1070 additions and 10 deletions
@ -0,0 +1,203 @@
@@ -0,0 +1,203 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.support.Money; |
||||
import common.ecommerce.warehouse.enums.LabelMode; |
||||
import common.ecommerce.warehouse.enums.OutboundStatus; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.OutboundLine; |
||||
import common.ecommerce.warehouse.model.OutboundOrder; |
||||
import common.ecommerce.warehouse.model.ShipTo; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.xincang.XincangConstants; |
||||
import common.ecommerce.xincang.dto.XincangDtos; |
||||
import common.ecommerce.xincang.enums.XincangOrderStatus; |
||||
|
||||
import java.time.Instant; |
||||
import java.time.LocalDate; |
||||
import java.time.LocalDateTime; |
||||
import java.time.format.DateTimeFormatter; |
||||
import java.time.format.DateTimeParseException; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 信仓订单详情报文 → 统一模型({@code GET api.get_order})。 |
||||
* |
||||
* <p>平台字段名只出现在本类与 {@link XincangDtos}。 |
||||
* 时间字段是北京时间 {@code yyyy-MM-dd HH:mm:ss},统一折算成 UTC。</p> |
||||
*/ |
||||
public final class XincangOrderDetailMapper { |
||||
|
||||
private static final DateTimeFormatter DATE_TIME = |
||||
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); |
||||
private static final DateTimeFormatter DATE = DateTimeFormatter.ofPattern("yyyy-MM-dd"); |
||||
private static final String CURRENCY_USD = "USD"; |
||||
|
||||
private XincangOrderDetailMapper() { |
||||
} |
||||
|
||||
/** |
||||
* 订单详情 → {@link OutboundOrder}。 |
||||
* |
||||
* @param detail 详情;调用方保证非 null |
||||
* @param ctx 本次调用上下文(仓编码兜底) |
||||
*/ |
||||
public static OutboundOrder toOrder(XincangDtos.OrderDetail detail, WarehouseContext ctx) { |
||||
OutboundStatus status = XincangOrderStatus.toCore(detail.state); |
||||
return OutboundOrder.builder() |
||||
.warehouseCode(firstNonBlank(detail.warehouseCode, ctx.providerWarehouseId())) |
||||
// 双号:信仓详情只回系统单号 order_no;
|
||||
// outboundRequestNo 用它兜底,业务侧参考号进 orderRef
|
||||
.outboundRequestNo(firstNonBlank(detail.orderNo, detail.ckh)) |
||||
.providerOrderId(blankToNull(detail.orderNo)) |
||||
.orderRef(blankToNull(detail.ckh)) |
||||
.labelMode(labelModeOf(detail.orderType)) |
||||
.status(status) |
||||
.rawStatus(detail.state) |
||||
.carrierCode(blankToNull(detail.logisticsType)) |
||||
.trackingNumber(blankToNull(detail.trackingNumber)) |
||||
.requestedAt(parseTime(detail.gmtCreate)) |
||||
.shippedAt(parseTime(detail.deliveredTime)) |
||||
.sourceProvider(WarehouseProvider.XINCANG) |
||||
.lines(toLines(detail)) |
||||
.shipTo(toShipTo(detail)) |
||||
.exceptionCode(blankToNull(detail.apiError)) |
||||
.estimatedShippingFee(parseMoney(detail.totalAmount)) |
||||
.currency(CURRENCY_USD) |
||||
.build(); |
||||
} |
||||
|
||||
/** |
||||
* 面单模式:{@code order_type=wayfair} 是自供面单,其余是仓自有面单。 |
||||
* |
||||
* <p>{@code LabelMode} 表达的正是「谁出面单」,与信仓 order_type 语义一致。</p> |
||||
*/ |
||||
static LabelMode labelModeOf(String orderType) { |
||||
return "wayfair".equalsIgnoreCase(orderType) ? LabelMode.PLATFORM_LABEL : LabelMode.WAREHOUSE_LABEL; |
||||
} |
||||
|
||||
/** |
||||
* 商品行。 |
||||
* |
||||
* <p>详情同时给了 {@code products[]}(一票多件)和 {@code product_sku} / {@code sku_count} |
||||
* 单值字段;前者非空时以它为准,为空才退回单值字段。数量缺失或非正的行直接跳过—— |
||||
* {@link OutboundLine} 要求数量为正,保留会在构造期抛异常。</p> |
||||
*/ |
||||
static List<OutboundLine> toLines(XincangDtos.OrderDetail detail) { |
||||
List<OutboundLine> lines = new ArrayList<OutboundLine>(); |
||||
if (detail.products != null && !detail.products.isEmpty()) { |
||||
int index = 0; |
||||
for (XincangDtos.OrderDetailProduct product : detail.products) { |
||||
if (product == null || blank(product.sku)) { |
||||
continue; |
||||
} |
||||
int qty = parsePositiveInt(product.qty); |
||||
if (qty <= 0) { |
||||
continue; |
||||
} |
||||
index++; |
||||
lines.add(OutboundLine.builder() |
||||
.lineNo(String.valueOf(index)) |
||||
.omsSku(product.sku.trim()) |
||||
.providerSku(product.sku.trim()) |
||||
.quantity(qty) |
||||
.declareName(blankToNull(product.nameZhCn)) |
||||
.build()); |
||||
} |
||||
return lines; |
||||
} |
||||
int qty = parsePositiveInt(detail.skuCount); |
||||
if (!blank(detail.productSku) && qty > 0) { |
||||
lines.add(OutboundLine.builder() |
||||
.lineNo("1") |
||||
.omsSku(detail.productSku.trim()) |
||||
.providerSku(detail.productSku.trim()) |
||||
.quantity(qty) |
||||
.declareName(blankToNull(detail.productName)) |
||||
.build()); |
||||
} |
||||
return lines; |
||||
} |
||||
|
||||
private static ShipTo toShipTo(XincangDtos.OrderDetail detail) { |
||||
if (blank(detail.country) && blank(detail.address) && blank(detail.receiveUser)) { |
||||
return null; |
||||
} |
||||
return ShipTo.builder() |
||||
.name(blankToNull(detail.receiveUser)) |
||||
.phone(blankToNull(detail.phone)) |
||||
.email(blankToNull(detail.email)) |
||||
.countryCode(blankToNull(detail.country)) |
||||
.stateOrProvince(blankToNull(detail.province)) |
||||
.city(blankToNull(detail.city)) |
||||
.addressLine1(blankToNull(detail.address)) |
||||
.addressLine2(blankToNull(detail.address2)) |
||||
.postalCode(blankToNull(detail.postcode)) |
||||
.build(); |
||||
} |
||||
|
||||
/** 北京时间 {@code yyyy-MM-dd HH:mm:ss} → UTC;空值 / 非法返回 null。 */ |
||||
static Instant parseTime(String raw) { |
||||
if (blank(raw)) { |
||||
return null; |
||||
} |
||||
try { |
||||
return LocalDateTime.parse(raw.trim(), DATE_TIME) |
||||
.atZone(XincangConstants.SYSTEM_ZONE).toInstant(); |
||||
} catch (DateTimeParseException e) { |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
/** 日期 {@code yyyy-MM-dd} → 北京时间当天 0 点的 UTC 时刻;空值 / 非法返回 null。 */ |
||||
static Instant parseDate(String raw) { |
||||
if (blank(raw)) { |
||||
return null; |
||||
} |
||||
try { |
||||
return LocalDate.parse(raw.trim(), DATE) |
||||
.atStartOfDay(XincangConstants.SYSTEM_ZONE).toInstant(); |
||||
} catch (DateTimeParseException e) { |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
/** 金额 → USD;空值 / 非法返回 null(负值保留,费用可能有冲抵)。 */ |
||||
static Money parseMoney(String raw) { |
||||
if (blank(raw)) { |
||||
return null; |
||||
} |
||||
try { |
||||
return Money.of(raw.trim(), CURRENCY_USD); |
||||
} catch (RuntimeException e) { |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
static int parsePositiveInt(String raw) { |
||||
if (blank(raw)) { |
||||
return 0; |
||||
} |
||||
try { |
||||
int v = Integer.parseInt(raw.trim()); |
||||
return v > 0 ? v : 0; |
||||
} catch (NumberFormatException e) { |
||||
return 0; |
||||
} |
||||
} |
||||
|
||||
static String firstNonBlank(String a, String b) { |
||||
if (!blank(a)) { |
||||
return a.trim(); |
||||
} |
||||
return blank(b) ? null : b.trim(); |
||||
} |
||||
|
||||
static String blankToNull(String v) { |
||||
return blank(v) ? null : v.trim(); |
||||
} |
||||
|
||||
static boolean blank(String v) { |
||||
return v == null || v.trim().isEmpty(); |
||||
} |
||||
} |
||||
@ -0,0 +1,57 @@
@@ -0,0 +1,57 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.warehouse.enums.TransferStatus; |
||||
import common.ecommerce.warehouse.enums.TransferType; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.TransferOrder; |
||||
import common.ecommerce.xincang.dto.XincangDtos; |
||||
import common.ecommerce.xincang.enums.XincangTransferState; |
||||
|
||||
/** |
||||
* 信仓转运详情报文 → 统一模型({@code GET fba.fba_detail})。 |
||||
* |
||||
* <p>信仓的转运 = 从信仓发往平台仓,统一模型里固定为 {@link TransferType#OUTBOUND}。</p> |
||||
*/ |
||||
public final class XincangTransferDetailMapper { |
||||
|
||||
private XincangTransferDetailMapper() { |
||||
} |
||||
|
||||
/** |
||||
* 转运详情 → {@link TransferOrder}。 |
||||
* |
||||
* @param detail 详情;调用方保证非 null |
||||
*/ |
||||
public static TransferOrder toOrder(XincangDtos.TransferDetail detail) { |
||||
TransferStatus status = XincangTransferState.toCore(detail.state); |
||||
return TransferOrder.builder() |
||||
// 双号:fba_no 是业务侧单号,order_no 是仓侧单号
|
||||
.transferRequestNo(XincangOrderDetailMapper.firstNonBlank( |
||||
detail.fbaNo, detail.orderNo)) |
||||
.providerTransferNo(XincangOrderDetailMapper.blankToNull(detail.orderNo)) |
||||
.fromWarehouseCode(XincangOrderDetailMapper.blankToNull(detail.fromWarehouseName)) |
||||
.toWarehouseCode(XincangOrderDetailMapper.blankToNull(detail.destWarehouseName)) |
||||
.type(TransferType.OUTBOUND) |
||||
.status(status) |
||||
.rawStatus(detail.state) |
||||
.sourceProvider(WarehouseProvider.XINCANG) |
||||
.totalQuantity(totalQuantityOf(detail)) |
||||
.estimatedOutboundAt(XincangOrderDetailMapper.parseDate(detail.preSendTime)) |
||||
.remark(XincangOrderDetailMapper.blankToNull(detail.remark)) |
||||
.build(); |
||||
} |
||||
|
||||
/** 明细件数合计;明细缺失时返回 0(未知,不猜)。 */ |
||||
static int totalQuantityOf(XincangDtos.TransferDetail detail) { |
||||
if (detail.products == null || detail.products.isEmpty()) { |
||||
return 0; |
||||
} |
||||
int total = 0; |
||||
for (XincangDtos.TransferDetailProduct product : detail.products) { |
||||
if (product != null) { |
||||
total += XincangOrderDetailMapper.parsePositiveInt(product.skuCount); |
||||
} |
||||
} |
||||
return total; |
||||
} |
||||
} |
||||
@ -0,0 +1,207 @@
@@ -0,0 +1,207 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.error.PlatformBusinessException; |
||||
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.LabelMode; |
||||
import common.ecommerce.warehouse.enums.OutboundStatus; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.OutboundOrder; |
||||
import common.ecommerce.warehouse.model.OutboundRef; |
||||
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 static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 订单详情({@code GET api.get_order})契约测试。 |
||||
*/ |
||||
class XincangOrderDetailTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
/** 文档「成功示例」原文。 */ |
||||
private static final String DETAIL = "{" |
||||
+ "\"id\":\"126508095093477568\"," |
||||
+ "\"order_no\":\"DS-BZY01-26101600001\"," |
||||
+ "\"state\":\"0\"," |
||||
+ "\"state_name\":\"待审核\"," |
||||
+ "\"api_error\":\"验证订单操作失败\"," |
||||
+ "\"gzh\":\"\"," |
||||
+ "\"face_url\":\"\"," |
||||
+ "\"ckh\":\"Ref26101601\"," |
||||
+ "\"order_type\":\"common\"," |
||||
+ "\"products\":[{\"product_id\":\"1\",\"sku\":\"LSS29BLACK\",\"qty\":\"1\"," |
||||
+ "\"name_zh_cn\":\"餐椅\"}]," |
||||
+ "\"sku_count\":\"1\"," |
||||
+ "\"dim_length\":\"25.9840\",\"dim_width\":\"18.8976\",\"dim_height\":\"16.9290\"," |
||||
+ "\"dim_divisor\":\"250.00\",\"weight_lbs\":\"23.5000\"," |
||||
+ "\"billing_weight_lbs\":\"34.00\",\"volume_weight_lbs\":\"34\"," |
||||
+ "\"product_sku\":\"LSS29BLACK\",\"product_name\":\"餐椅\",\"source_sku\":\"LSS29BLACK\"," |
||||
+ "\"warehouse_id\":\"84047962479824\",\"warehouse_code\":\"NJ-2605\"," |
||||
+ "\"country\":\"US\",\"province\":\"GA\",\"city\":\"STONE MOUNTAIN\"," |
||||
+ "\"address\":\"5039 LELAND DR\",\"address2\":\"\",\"postcode\":\"30083-6026\"," |
||||
+ "\"receive_user\":\"DARA\",\"phone\":\"+1 480-618-5344\",\"email\":\"\"," |
||||
+ "\"logistics_type\":\"FEDEX-G\",\"is_sign\":\"0\",\"zone\":\"5\"," |
||||
+ "\"total_amount\":\"0\",\"repair_amount\":\"0\"," |
||||
+ "\"approve_time\":\"2026-10-16 16:20:46\",\"delivered_time\":\"\"," |
||||
+ "\"shop_name\":\"BZY01-shop\",\"gmt_create\":\"2026-10-16 10:18:00\"," |
||||
+ "\"gmt_modify\":\"2026-10-16 10:18:00\",\"gmt_cancel\":\"\",\"intercept_time\":\"\"" |
||||
+ "}"; |
||||
|
||||
private static final String OK_BODY = "{\"rst\":" + DETAIL |
||||
+ ",\"errno\":0,\"err\":\"\",\"trace_id\":\"t-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-NJ-2605", WarehouseProvider.XINCANG, "NJ-2605", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
@Test |
||||
void getByProviderOrderIdMapsDetail() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(OK_BODY)); |
||||
|
||||
OutboundOrder order = adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-BZY01-26101600001")); |
||||
|
||||
// 请求:GET + query token + order_no
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertEquals("GET", req.method()); |
||||
assertTrue(req.url().contains("/api.get_order?"), req.url()); |
||||
assertTrue(req.url().contains("order_no=DS-BZY01-26101600001"), req.url()); |
||||
assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); |
||||
assertFalse(req.url().contains("ckh="), "给了 order_no 就不该再传 ckh"); |
||||
|
||||
// 映射
|
||||
assertEquals("NJ-2605", order.warehouseCode()); |
||||
assertEquals("DS-BZY01-26101600001", order.outboundRequestNo()); |
||||
assertEquals("DS-BZY01-26101600001", order.providerOrderId()); |
||||
assertEquals("Ref26101601", order.orderRef()); |
||||
assertEquals(OutboundStatus.PENDING_REVIEW, order.status()); |
||||
assertEquals("0", order.rawStatus()); |
||||
assertEquals(LabelMode.WAREHOUSE_LABEL, order.labelMode()); |
||||
assertEquals("FEDEX-G", order.carrierCode()); |
||||
assertEquals("验证订单操作失败", order.exceptionCode()); |
||||
assertEquals(WarehouseProvider.XINCANG, order.sourceProvider()); |
||||
// 北京时间 2026-10-16 10:18:00 → UTC 02:18:00
|
||||
assertEquals(Instant.parse("2026-10-16T02:18:00Z"), order.requestedAt()); |
||||
assertNull(order.shippedAt(), "空串的发货时间应为 null"); |
||||
|
||||
assertEquals(1, order.lines().size()); |
||||
assertEquals("LSS29BLACK", order.lines().get(0).omsSku()); |
||||
assertEquals(1, order.lines().get(0).quantity()); |
||||
assertEquals("餐椅", order.lines().get(0).declareName()); |
||||
|
||||
assertEquals("US", order.shipTo().countryCode()); |
||||
assertEquals("GA", order.shipTo().stateOrProvince()); |
||||
assertEquals("DARA", order.shipTo().name()); |
||||
assertNull(order.shipTo().addressLine2(), "空串地址2 应为 null"); |
||||
} |
||||
|
||||
@Test |
||||
void getFallsBackToReferenceNumber() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(OK_BODY)); |
||||
|
||||
adapter.get(ctx(), OutboundRef.ofRequestNo("Ref26101601")); |
||||
|
||||
String url = transport.lastDataRequest().url(); |
||||
assertTrue(url.contains("ckh=Ref26101601"), url); |
||||
assertFalse(url.contains("order_no="), "没有仓单号时只传 ckh"); |
||||
} |
||||
|
||||
@Test |
||||
void wayfairOrderMapsToPlatformLabel() { |
||||
String wayfair = OK_BODY.replace("\"order_type\":\"common\"", "\"order_type\":\"wayfair\""); |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(wayfair)); |
||||
|
||||
OutboundOrder order = adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-1")); |
||||
|
||||
assertEquals(LabelMode.PLATFORM_LABEL, order.labelMode()); |
||||
} |
||||
|
||||
@Test |
||||
void fallsBackToSingleSkuWhenProductsMissing() { |
||||
String single = OK_BODY.replace( |
||||
"\"products\":[{\"product_id\":\"1\",\"sku\":\"LSS29BLACK\",\"qty\":\"1\",\"name_zh_cn\":\"餐椅\"}]", |
||||
"\"products\":[]").replace("\"sku_count\":\"1\"", "\"sku_count\":\"3\""); |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(single)); |
||||
|
||||
OutboundOrder order = adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-1")); |
||||
|
||||
assertEquals(1, order.lines().size()); |
||||
assertEquals("LSS29BLACK", order.lines().get(0).omsSku()); |
||||
assertEquals(3, order.lines().get(0).quantity()); |
||||
} |
||||
|
||||
@Test |
||||
void unknownStateIsNotGuessed() { |
||||
String unknown = OK_BODY.replace("\"state\":\"0\"", "\"state\":\"99\""); |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(unknown)); |
||||
|
||||
OutboundOrder order = adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-1")); |
||||
|
||||
assertEquals(OutboundStatus.UNKNOWN, order.status()); |
||||
assertEquals("99", order.rawStatus()); |
||||
} |
||||
|
||||
@Test |
||||
void businessErrorPropagates() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":-1,\"err\":\"订单不存在\",\"trace_id\":\"t-err\"}")); |
||||
|
||||
PlatformBusinessException e = assertThrows(PlatformBusinessException.class, |
||||
() -> adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-NONE"))); |
||||
assertTrue(e.getMessage().contains("订单不存在"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void emptyRstIsNotSilentNull() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-empty\"}")); |
||||
|
||||
common.ecommerce.shared.error.ValidationException e = |
||||
assertThrows(common.ecommerce.shared.error.ValidationException.class, |
||||
() -> adapter.get(ctx(), OutboundRef.ofProviderOrderId("DS-1"))); |
||||
assertTrue(e.getMessage().contains("no rst"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void timeParsingIsBeijingToUtc() { |
||||
assertEquals(Instant.parse("2026-10-16T02:18:00Z"), |
||||
XincangOrderDetailMapper.parseTime("2026-10-16 10:18:00")); |
||||
assertNull(XincangOrderDetailMapper.parseTime("")); |
||||
assertNull(XincangOrderDetailMapper.parseTime("not-a-time")); |
||||
assertEquals(Instant.parse("2026-10-15T16:00:00Z"), |
||||
XincangOrderDetailMapper.parseDate("2026-10-16")); |
||||
} |
||||
} |
||||
@ -0,0 +1,178 @@
@@ -0,0 +1,178 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.error.PlatformBusinessException; |
||||
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.TransferStatus; |
||||
import common.ecommerce.warehouse.enums.TransferType; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.TransferOrder; |
||||
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 static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 转运详情({@code GET fba.fba_detail})契约测试。 |
||||
*/ |
||||
class XincangTransferDetailTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
/** 文档「成功示例」原文(截取与映射相关的字段)。 */ |
||||
private static final String DETAIL = "{" |
||||
+ "\"id\":\"128064084674485505\"," |
||||
+ "\"order_no\":\"LTL2610200000271\"," |
||||
+ "\"fba_no\":\"ZYDD20261020001\"," |
||||
+ "\"po\":\"ZYDD20261020001\"," |
||||
+ "\"from_warehouse\":\"84047962307416\"," |
||||
+ "\"from_warehouse_name\":\"CA-15950\"," |
||||
+ "\"dest_warehouse\":\"0\"," |
||||
+ "\"dest_warehouse_name\":\"123\"," |
||||
+ "\"pre_send_time\":\"2026-10-21\"," |
||||
+ "\"state\":\"6\"," |
||||
+ "\"state_name\":\"已发货\"," |
||||
+ "\"remark\":\"\"," |
||||
+ "\"is_pallet\":\"1\"," |
||||
+ "\"delivery_mode\":\"LTL\"," |
||||
+ "\"delivery_way\":\"卡车\"," |
||||
+ "\"label_requirement\":\"产品贴,外箱标签,托盘标签\"," |
||||
+ "\"total_amount\":\"84.25\"," |
||||
+ "\"products\":[" |
||||
+ "{\"product_no\":\"BOOK\",\"sku_count\":\"10\",\"box_count\":\"5\",\"packing_rate\":\"2\"}," |
||||
+ "{\"product_no\":\"FHCP006\",\"sku_count\":\"10\",\"box_count\":\"5\",\"packing_rate\":\"2\"}" |
||||
+ "]" |
||||
+ "}"; |
||||
|
||||
private static final String OK_BODY = "{\"rst\":" + DETAIL |
||||
+ ",\"errno\":0,\"err\":\"\",\"trace_id\":\"t-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-15950", WarehouseProvider.XINCANG, "CA-15950", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
@Test |
||||
void getMapsTransferDetail() { |
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok(OK_BODY)); |
||||
|
||||
TransferOrder order = adapter.getTransfer(ctx(), "LTL2610200000271"); |
||||
|
||||
// 请求
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertEquals("GET", req.method()); |
||||
assertTrue(req.url().contains("/fba.fba_detail?"), req.url()); |
||||
assertTrue(req.url().contains("order_no=LTL2610200000271"), req.url()); |
||||
assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); |
||||
|
||||
// 双号:fba_no 是业务单号,order_no 是仓单号
|
||||
assertEquals("ZYDD20261020001", order.transferRequestNo()); |
||||
assertEquals("LTL2610200000271", order.providerTransferNo()); |
||||
assertEquals("CA-15950", order.fromWarehouseCode()); |
||||
assertEquals("123", order.toWarehouseCode()); |
||||
assertEquals(TransferType.OUTBOUND, order.type()); |
||||
assertEquals(TransferStatus.SHIPPED, order.status()); |
||||
assertEquals("6", order.rawStatus()); |
||||
assertEquals(WarehouseProvider.XINCANG, order.sourceProvider()); |
||||
assertEquals(20, order.totalQuantity(), "10 + 10"); |
||||
// pre_send_time 2026-10-21 北京时间 0 点 → UTC 前一天 16:00
|
||||
assertEquals(Instant.parse("2026-10-20T16:00:00Z"), order.estimatedOutboundAt()); |
||||
assertNull(order.remark(), "空串备注应为 null"); |
||||
} |
||||
|
||||
@Test |
||||
void unknownTransferStateIsNotGuessed() { |
||||
String unknown = OK_BODY.replace("\"state\":\"6\"", "\"state\":\"99\""); |
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok(unknown)); |
||||
|
||||
TransferOrder order = adapter.getTransfer(ctx(), "LTL-1"); |
||||
|
||||
assertEquals(TransferStatus.UNKNOWN, order.status()); |
||||
assertEquals("99", order.rawStatus()); |
||||
} |
||||
|
||||
@Test |
||||
void outputStateMapsToShipped() { |
||||
// 信仓 state=6「已发货」→ core SHIPPED,不是 COMPLETED
|
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok(OK_BODY)); |
||||
|
||||
TransferOrder order = adapter.getTransfer(ctx(), "LTL-1"); |
||||
|
||||
assertEquals(TransferStatus.SHIPPED, order.status()); |
||||
assertFalse(order.completed(), "已发货不等于已完成"); |
||||
} |
||||
|
||||
@Test |
||||
void missingProductsMeansUnknownQuantity() { |
||||
String noProducts = OK_BODY.replace( |
||||
",\"products\":[" |
||||
+ "{\"product_no\":\"BOOK\",\"sku_count\":\"10\",\"box_count\":\"5\",\"packing_rate\":\"2\"}," |
||||
+ "{\"product_no\":\"FHCP006\",\"sku_count\":\"10\",\"box_count\":\"5\",\"packing_rate\":\"2\"}" |
||||
+ "]", ""); |
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok(noProducts)); |
||||
|
||||
assertEquals(0, adapter.getTransfer(ctx(), "LTL-1").totalQuantity()); |
||||
} |
||||
|
||||
@Test |
||||
void blankOrderNoIsRejectedBeforeSending() { |
||||
common.ecommerce.shared.error.ValidationException e = |
||||
assertThrows(common.ecommerce.shared.error.ValidationException.class, |
||||
() -> adapter.getTransfer(ctx(), " ")); |
||||
assertTrue(e.getMessage().contains("providerTransferNo"), e.getMessage()); |
||||
assertFalse(transport.recorded().stream() |
||||
.anyMatch(r -> r.url().contains(XincangConstants.PATH_TRANSFER_DETAIL))); |
||||
} |
||||
|
||||
@Test |
||||
void businessErrorPropagates() { |
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":-1,\"err\":\"转运单不存在\",\"trace_id\":\"t-err\"}")); |
||||
|
||||
PlatformBusinessException e = assertThrows(PlatformBusinessException.class, |
||||
() -> adapter.getTransfer(ctx(), "LTL-NONE")); |
||||
assertTrue(e.getMessage().contains("转运单不存在"), e.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void emptyRstIsNotSilentNull() { |
||||
transport.route(XincangConstants.PATH_TRANSFER_DETAIL, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-empty\"}")); |
||||
|
||||
common.ecommerce.shared.error.ValidationException e = |
||||
assertThrows(common.ecommerce.shared.error.ValidationException.class, |
||||
() -> adapter.getTransfer(ctx(), "LTL-1")); |
||||
assertTrue(e.getMessage().contains("no rst"), e.getMessage()); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue