Browse Source
新增 TrackEvent 之外的运单级模型 TrackingInfo(最新状态 / 承运商 / 签收人 / 预计妥投 / 公开轨迹页),events() 与既有 track() 返回一致。 TrackingCapable 增加 trackShipment(),门面同步暴露。 两处接口特性与仓接口不同,单独处理: - 主机不同:轨迹在 pr-ship-api.yqn.com,仓接口在 pr-hwc-open-api.yqn.com。 WarehouseConnection 增加可选 auxEndpointBaseUrl,调用方显式传入; 没传时抛 WarehouseUnsupportedCapabilityException,不静默退回主基址 (否则轨迹请求会打到仓接口上,拿到的是看不懂的业务错误) - 成功码不同:文档响应示例是 code=1,不是仓接口的 200。走独立的 YqnConstants.TRACK_SUCCESS_CODE 判定,不复用 YqnEnvelope 状态值保持运去哪原话,不做跨仓归一——承运商的节点状态词汇差异大, 「派送失败 / 退回中」这类区分归一会丢信息。 JacksonJsonCodec 补 intAt(json, pointer, missing):nodeAt + 类型判断, 避免适配器自己持有 ObjectMapper。 Co-Authored-By: Claude <noreply@anthropic.com>feature/supplier-lingxing
12 changed files with 737 additions and 10 deletions
@ -0,0 +1,156 @@
@@ -0,0 +1,156 @@
|
||||
package common.ecommerce.warehouse.model; |
||||
|
||||
import java.time.Instant; |
||||
import java.util.ArrayList; |
||||
import java.util.Collections; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 运单物流轨迹查询结果。 |
||||
* |
||||
* <p>由 {@code TrackingCapable.trackShipment()} 返回:整体是<b>一个运单</b>的当前状态 + |
||||
* 若干节点,比 {@link TrackEvent}(单条事件)多出承运商、最新状态、签收人与预计妥投。</p> |
||||
* |
||||
* <p>状态值保持仓方原始字符串,见 {@link #status()};不做跨仓归一——各承运商的节点 |
||||
* 状态词汇差异太大,强行归一会丢失「派送失败 / 退回中」这类关键区分。</p> |
||||
*/ |
||||
public final class TrackingInfo { |
||||
|
||||
private final String trackingNumber; |
||||
private final String carrier; |
||||
/** 物流服务,如 {@code FedEx_FEDEX_GROUND};仓方未给时为 null。 */ |
||||
private final String carrierService; |
||||
/** 最新状态(仓方原值)。 */ |
||||
private final String status; |
||||
/** 最新状态的详细描述。 */ |
||||
private final String statusDetail; |
||||
/** 预计妥投时间(UTC);仓方未给时为 null。 */ |
||||
private final Instant estimatedDeliveryAt; |
||||
/** 签收人;未签收为 null。 */ |
||||
private final String signedBy; |
||||
/** 承运商侧可公开查询的轨迹页地址。 */ |
||||
private final String publicUrl; |
||||
private final List<TrackEvent> events; |
||||
|
||||
private TrackingInfo(Builder b) { |
||||
this.trackingNumber = require(b.trackingNumber, "trackingNumber"); |
||||
this.carrier = b.carrier; |
||||
this.carrierService = b.carrierService; |
||||
this.status = b.status; |
||||
this.statusDetail = b.statusDetail; |
||||
this.estimatedDeliveryAt = b.estimatedDeliveryAt; |
||||
this.signedBy = b.signedBy; |
||||
this.publicUrl = b.publicUrl; |
||||
this.events = Collections.unmodifiableList(new ArrayList<TrackEvent>(b.events)); |
||||
} |
||||
|
||||
public static Builder builder() { |
||||
return new Builder(); |
||||
} |
||||
|
||||
public String trackingNumber() { |
||||
return trackingNumber; |
||||
} |
||||
|
||||
public String carrier() { |
||||
return carrier; |
||||
} |
||||
|
||||
public String carrierService() { |
||||
return carrierService; |
||||
} |
||||
|
||||
/** 最新状态(仓方原值)。 */ |
||||
public String status() { |
||||
return status; |
||||
} |
||||
|
||||
public String statusDetail() { |
||||
return statusDetail; |
||||
} |
||||
|
||||
public Instant estimatedDeliveryAt() { |
||||
return estimatedDeliveryAt; |
||||
} |
||||
|
||||
public String signedBy() { |
||||
return signedBy; |
||||
} |
||||
|
||||
public String publicUrl() { |
||||
return publicUrl; |
||||
} |
||||
|
||||
/** 轨迹节点,按仓方返回顺序;不可变。 */ |
||||
public List<TrackEvent> events() { |
||||
return events; |
||||
} |
||||
|
||||
private static String require(String v, String name) { |
||||
if (v == null || v.trim().isEmpty()) { |
||||
throw new IllegalArgumentException(name + " must not be blank"); |
||||
} |
||||
return v.trim(); |
||||
} |
||||
|
||||
public static final class Builder { |
||||
private String trackingNumber; |
||||
private String carrier; |
||||
private String carrierService; |
||||
private String status; |
||||
private String statusDetail; |
||||
private Instant estimatedDeliveryAt; |
||||
private String signedBy; |
||||
private String publicUrl; |
||||
private final List<TrackEvent> events = new ArrayList<TrackEvent>(); |
||||
|
||||
public Builder trackingNumber(String v) { |
||||
this.trackingNumber = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder carrier(String v) { |
||||
this.carrier = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder carrierService(String v) { |
||||
this.carrierService = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder status(String v) { |
||||
this.status = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder statusDetail(String v) { |
||||
this.statusDetail = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder estimatedDeliveryAt(Instant v) { |
||||
this.estimatedDeliveryAt = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder signedBy(String v) { |
||||
this.signedBy = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder publicUrl(String v) { |
||||
this.publicUrl = v; |
||||
return this; |
||||
} |
||||
|
||||
public Builder event(TrackEvent v) { |
||||
this.events.add(v); |
||||
return this; |
||||
} |
||||
|
||||
public TrackingInfo build() { |
||||
return new TrackingInfo(this); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,143 @@
@@ -0,0 +1,143 @@
|
||||
package common.ecommerce.yqn.adapter; |
||||
|
||||
import common.ecommerce.warehouse.model.TrackEvent; |
||||
import common.ecommerce.warehouse.model.TrackingInfo; |
||||
import common.ecommerce.yqn.dto.YqnDtos; |
||||
|
||||
import java.time.Instant; |
||||
import java.time.LocalDateTime; |
||||
import java.time.ZoneId; |
||||
import java.time.ZoneOffset; |
||||
import java.time.format.DateTimeFormatter; |
||||
import java.time.format.DateTimeParseException; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 运去哪物流轨迹映射(API 189)。 |
||||
* |
||||
* <p>状态值一律保持运去哪原话,不做归一:承运商的节点状态词汇差异大, |
||||
* 「派送失败 / 退回中」这类区分归一会丢信息。</p> |
||||
*/ |
||||
public final class YqnTrackingMapper { |
||||
|
||||
/** 仓方给的节点时间没带时区,按目的地习惯优先解析;解析不出再看其它格式。 */ |
||||
private static final DateTimeFormatter[] DATETIME_FORMATS = { |
||||
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"), |
||||
DateTimeFormatter.ISO_LOCAL_DATE_TIME, |
||||
}; |
||||
|
||||
private YqnTrackingMapper() { |
||||
} |
||||
|
||||
/** 响应 → 运单级轨迹。 */ |
||||
public static TrackingInfo toTrackingInfo(YqnDtos.ShipmentTrack track, String requestedTrackingNo, |
||||
ZoneId zone) { |
||||
String trackingNo = hasText(track.trackingCode) ? track.trackingCode.trim() : requestedTrackingNo; |
||||
YqnDtos.ShipmentTrack.CarrierDetail carrierDetail = track.carrierDetail; |
||||
TrackingInfo.Builder builder = TrackingInfo.builder() |
||||
.trackingNumber(trackingNo) |
||||
.carrier(track.carrier) |
||||
.carrierService(carrierDetail == null ? null : carrierDetail.service) |
||||
.status(track.status) |
||||
.statusDetail(track.statusDetail) |
||||
.estimatedDeliveryAt(parseTime(track.estDeliveryDate, zone)) |
||||
.signedBy(track.signedBy) |
||||
.publicUrl(track.publicUrl); |
||||
|
||||
List<YqnDtos.ShipmentTrack.TrackDetail> details = track.trackingDetails; |
||||
if (details != null) { |
||||
for (YqnDtos.ShipmentTrack.TrackDetail detail : details) { |
||||
builder.event(toTrackEvent(detail, trackingNo, track.carrier, zone)); |
||||
} |
||||
} |
||||
return builder.build(); |
||||
} |
||||
|
||||
/** 只取节点明细。 */ |
||||
public static List<TrackEvent> toTrackEvents(YqnDtos.ShipmentTrack track, String requestedTrackingNo, |
||||
ZoneId zone) { |
||||
return toTrackingInfo(track, requestedTrackingNo, zone).events(); |
||||
} |
||||
|
||||
private static TrackEvent toTrackEvent(YqnDtos.ShipmentTrack.TrackDetail detail, String trackingNo, |
||||
String carrier, ZoneId zone) { |
||||
return TrackEvent.builder() |
||||
.trackingNumber(trackingNo) |
||||
.carrier(carrier) |
||||
.status(detail.status) |
||||
.description(hasText(detail.message) ? detail.message : detail.statusDetail) |
||||
.location(locationOf(detail.trackingLocation)) |
||||
.occurredAt(parseTime(detail.datetime, zone)) |
||||
.build(); |
||||
} |
||||
|
||||
/** 位置拼成一行,如 {@code New York, NY, US, 10001};全空返回 null。 */ |
||||
private static String locationOf(YqnDtos.ShipmentTrack.TrackingLocation loc) { |
||||
if (loc == null) { |
||||
return null; |
||||
} |
||||
List<String> parts = new ArrayList<String>(4); |
||||
addIfText(parts, loc.city); |
||||
addIfText(parts, loc.state); |
||||
addIfText(parts, loc.country); |
||||
addIfText(parts, loc.zip); |
||||
return parts.isEmpty() ? null : join(parts); |
||||
} |
||||
|
||||
private static void addIfText(List<String> parts, String v) { |
||||
if (hasText(v)) { |
||||
parts.add(v.trim()); |
||||
} |
||||
} |
||||
|
||||
private static String join(List<String> parts) { |
||||
StringBuilder sb = new StringBuilder(); |
||||
for (int i = 0; i < parts.size(); i++) { |
||||
if (i > 0) { |
||||
sb.append(", "); |
||||
} |
||||
sb.append(parts.get(i)); |
||||
} |
||||
return sb.toString(); |
||||
} |
||||
|
||||
/** |
||||
* 解析仓方时间;失败返回 null,不因时间格式阻断轨迹展示。 |
||||
* |
||||
* <p>文档未给出 {@code datetime} 的格式,因此按「带时区 ISO → 常见本地格式」依次尝试; |
||||
* 都不带时区时按调用方给的 {@code zone} 解释。</p> |
||||
*/ |
||||
static Instant parseTime(String value, ZoneId zone) { |
||||
if (!hasText(value)) { |
||||
return null; |
||||
} |
||||
String v = value.trim(); |
||||
try { |
||||
return Instant.parse(v); |
||||
} catch (DateTimeParseException ignored) { |
||||
// 试本地格式
|
||||
} |
||||
try { |
||||
return java.time.OffsetDateTime.parse(v).toInstant(); |
||||
} catch (DateTimeParseException ignored) { |
||||
// 试本地格式
|
||||
} |
||||
for (DateTimeFormatter fmt : DATETIME_FORMATS) { |
||||
try { |
||||
return LocalDateTime.parse(v, fmt).atZone(zone == null ? ZoneOffset.UTC : zone).toInstant(); |
||||
} catch (DateTimeParseException ignored) { |
||||
// 下一个格式
|
||||
} |
||||
} |
||||
try { |
||||
return java.time.LocalDate.parse(v).atStartOfDay(zone == null ? ZoneOffset.UTC : zone).toInstant(); |
||||
} catch (DateTimeParseException ignored) { |
||||
return null; |
||||
} |
||||
} |
||||
|
||||
private static boolean hasText(String v) { |
||||
return v != null && !v.trim().isEmpty(); |
||||
} |
||||
} |
||||
@ -0,0 +1,178 @@
@@ -0,0 +1,178 @@
|
||||
package common.ecommerce.yqn.adapter; |
||||
|
||||
import common.ecommerce.http.JacksonJsonCodec; |
||||
import common.ecommerce.shared.spi.ChannelSecret; |
||||
import common.ecommerce.shared.testkit.RecordingTransport; |
||||
import common.ecommerce.shared.testkit.Responses; |
||||
import common.ecommerce.warehouse.enums.WarehouseCapability; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.TrackEvent; |
||||
import common.ecommerce.warehouse.model.TrackingInfo; |
||||
import common.ecommerce.warehouse.sdk.WarehouseConnection; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.warehouse.sdk.WarehouseAdapter; |
||||
import java.util.EnumSet; |
||||
import common.ecommerce.yqn.YqnConstants; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import java.time.Clock; |
||||
import java.time.Instant; |
||||
import java.time.ZoneOffset; |
||||
import java.util.List; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals; |
||||
import static org.junit.jupiter.api.Assertions.assertNull; |
||||
import static org.junit.jupiter.api.Assertions.assertThrows; |
||||
import static org.junit.jupiter.api.Assertions.assertTrue; |
||||
|
||||
/** |
||||
* 物流轨迹(API 189)契约测试。 |
||||
* |
||||
* <p>注意这个接口在<b>另一个主机</b>,且成功码是 {@code 1} 而不是 {@code 200}。</p> |
||||
*/ |
||||
class YqnTrackingTest { |
||||
|
||||
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-10T00:00:00Z"), ZoneOffset.UTC); |
||||
|
||||
private static ChannelSecret secret() { |
||||
return ChannelSecret.builder().appSecret("key-1").build(); |
||||
} |
||||
|
||||
/** 主基址 + 辅助基址。 */ |
||||
private static WarehouseContext ctx() { |
||||
return WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, "RF_NY_US", |
||||
WarehouseConnection.of(YqnConstants.PR_BASE_URL, YqnConstants.AUX_BASE_URL_PR, secret()), |
||||
"req-track", CLOCK); |
||||
} |
||||
|
||||
/** 只有主基址。 */ |
||||
private static WarehouseContext ctxWithoutAux() { |
||||
return WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, "RF_NY_US", |
||||
WarehouseConnection.of(YqnConstants.PR_BASE_URL, secret()), "req-track", CLOCK); |
||||
} |
||||
|
||||
private static final String OK_BODY = |
||||
"{\"code\":1,\"message\":\"success\",\"data\":{" |
||||
+ "\"id\":9527,\"carrier\":\"FEDEX\",\"trackingCode\":\"TRK123\"," |
||||
+ "\"status\":\"DELIVERED\",\"statusDetail\":\"已签收\"," |
||||
+ "\"estDeliveryDate\":\"2026-11-12T10:00:00Z\"," |
||||
+ "\"signedBy\":\"J SMITH\",\"publicUrl\":\"https://track.example/TRK123\"," |
||||
+ "\"trackingDetails\":[" |
||||
+ "{\"status\":\"IN_TRANSIT\",\"message\":\"已离开分拨中心\"," |
||||
+ "\"datetime\":\"2026-11-09 08:30:00\",\"timeZone\":\"America/New_York\"," |
||||
+ "\"trackingLocation\":{\"city\":\"Newark\",\"state\":\"NJ\"," |
||||
+ "\"country\":\"US\",\"zip\":\"07102\"}}," |
||||
+ "{\"status\":\"DELIVERED\",\"message\":\"delivered\"," |
||||
+ "\"datetime\":\"2026-11-10T15:20:00Z\",\"signedBy\":null}]," |
||||
+ "\"carrierDetail\":{\"service\":\"FedEx_FEDEX_GROUND\"}}}"; |
||||
|
||||
@Test |
||||
void callsAuxiliaryHostNotWarehouseHost() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok(OK_BODY)); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).trackShipment(ctx(), "TRK123"); |
||||
|
||||
String url = transport.lastDataRequest().url(); |
||||
assertTrue(url.startsWith(YqnConstants.AUX_BASE_URL_PR), url); |
||||
assertTrue(url.contains("/api/v2/orderShipment/track/TRK123"), url); |
||||
} |
||||
|
||||
@Test |
||||
void missingAuxEndpointIsRejectedNotSilentlyRetargeted() { |
||||
RecordingTransport transport = RecordingTransport.create(); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
assertThrows(common.ecommerce.warehouse.error.WarehouseUnsupportedCapabilityException.class, |
||||
() -> adapter.trackShipment(ctxWithoutAux(), "TRK123")); |
||||
assertTrue(transport.recorded().isEmpty(), "不应该发出任何请求"); |
||||
} |
||||
|
||||
@Test |
||||
void mapsShipmentLevelFields() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok(OK_BODY)); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
TrackingInfo info = adapter.trackShipment(ctx(), "TRK123"); |
||||
|
||||
assertEquals("TRK123", info.trackingNumber()); |
||||
assertEquals("FEDEX", info.carrier()); |
||||
assertEquals("FedEx_FEDEX_GROUND", info.carrierService()); |
||||
assertEquals("DELIVERED", info.status()); |
||||
assertEquals("已签收", info.statusDetail()); |
||||
assertEquals(Instant.parse("2026-11-12T10:00:00Z"), info.estimatedDeliveryAt()); |
||||
assertEquals("J SMITH", info.signedBy()); |
||||
assertEquals("https://track.example/TRK123", info.publicUrl()); |
||||
assertEquals(2, info.events().size()); |
||||
} |
||||
|
||||
@Test |
||||
void mapsTrackingDetailsAndLocation() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok(OK_BODY)); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
TrackingInfo info = adapter.trackShipment(ctx(), "TRK123"); |
||||
TrackEvent first = info.events().get(0); |
||||
|
||||
assertEquals("IN_TRANSIT", first.status()); |
||||
assertEquals("已离开分拨中心", first.description()); |
||||
assertEquals("Newark, NJ, US, 07102", first.location()); |
||||
assertEquals("TRK123", first.trackingNumber()); |
||||
assertEquals("FEDEX", first.carrier()); |
||||
// 带时区的直接解析;本地格式按调用时区解释
|
||||
assertEquals(Instant.parse("2026-11-10T15:20:00Z"), info.events().get(1).occurredAt()); |
||||
|
||||
TrackEvent second = info.events().get(1); |
||||
assertEquals("DELIVERED", second.status()); |
||||
assertNull(second.location()); |
||||
} |
||||
|
||||
@Test |
||||
void trackReturnsSameEventsAsTrackShipment() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok(OK_BODY)); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
List<TrackEvent> events = adapter.track(ctx(), "TRK123"); |
||||
|
||||
assertEquals(2, events.size()); |
||||
assertEquals("IN_TRANSIT", events.get(0).status()); |
||||
} |
||||
|
||||
/** 成功码是 1;返回 200 之类要按失败处理,不能当成成功去解析 data。 */ |
||||
@Test |
||||
void nonOneCodeIsFailure() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok( |
||||
"{\"code\":200,\"message\":\"ok\",\"data\":{\"trackingCode\":\"TRK123\"}}")); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
RuntimeException ex = assertThrows(RuntimeException.class, |
||||
() -> adapter.trackShipment(ctx(), "TRK123")); |
||||
assertTrue(ex.getMessage().contains("code=200"), ex.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void missingCodeIsFailure() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK123", req -> Responses.ok( |
||||
"{\"message\":\"oops\"}")); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
assertThrows(RuntimeException.class, () -> adapter.trackShipment(ctx(), "TRK123")); |
||||
} |
||||
|
||||
@Test |
||||
void declaresTrackingCapability() { |
||||
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec()); |
||||
assertTrue(adapter.capabilities().contains(WarehouseCapability.TRACKING)); |
||||
} |
||||
|
||||
@Test |
||||
void blankTrackingNumberRejected() { |
||||
YqnAdapter adapter = new YqnAdapter(RecordingTransport.create(), new JacksonJsonCodec()); |
||||
assertThrows(IllegalArgumentException.class, () -> adapter.trackShipment(ctx(), " ")); |
||||
assertThrows(IllegalArgumentException.class, () -> adapter.trackShipment(ctx(), null)); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue