@ -19,7 +19,9 @@ import java.time.format.DateTimeFormatter;
@@ -19,7 +19,9 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException ;
import java.util.ArrayList ;
import java.util.Collections ;
import java.util.LinkedHashMap ;
import java.util.List ;
import java.util.Map ;
/ * *
* 运去哪报文 → 统一模型 。
@ -164,49 +166,180 @@ public final class YqnOutboundMapper {
@@ -164,49 +166,180 @@ public final class YqnOutboundMapper {
return instant = = null ? null : TIME_FORMAT . format ( instant . atZone ( DEFAULT_ZONE ) ) ;
}
/** 运去哪出库单 → 统一模型。 */
public static OutboundOrder toOrder ( YqnDtos . OrderInfo info , String warehouseCode , ZoneId zone ) {
/** 订单详情 → 统一出库单(API 128)。 */
public static OutboundOrder toOrder ( YqnDtos . OrderDetail detail , String warehouseCode , ZoneId zone ) {
List < YqnDtos . OrderDetail . ShipmentPackage > shippedPackages = shippedPackagesOf ( detail ) ;
return OutboundOrder . builder ( )
. warehouseCode ( warehouseCode )
. outboundRequestNo ( firstNonBlank ( info . customerOrderNo , info . orderNo ) )
. providerOrderId ( info . orderNo )
. orderRef ( info . referenceNo )
. labelMode ( null ) // 查询结果不含面单模式,由 OMS 侧记录
. status ( toStatus ( info . status ) )
. rawStatus ( info . status )
. carrier ( info . carrier )
. trackingNumber ( info . trackingNumber )
. requestedAt ( parseTime ( info . createTime , zone ) )
. shippedAt ( parseTime ( info . shipTime , zone ) )
. warehouseCode ( firstNonBlank ( detail . warehouseCode , warehouseCode ) )
. outboundRequestNo ( firstNonBlank ( detail . orderNo , null ) )
. orderRef ( null ) // API 128 不返回平台单号
. status ( toStatus ( detail . orderStatusEnum ) )
. rawStatus ( detail . orderStatusEnum )
. carrier ( packagesCarrierOf ( shippedPackages , detail . carrierCode ) )
. trackingNumber ( firstTrackingOf ( shippedPackages ) )
. carrierCode ( detail . carrierCode )
. currency ( detail . currency )
. paidAt ( parseTime ( detail . paidAt , zone ) )
. shippedAt ( firstShipmentTime ( shippedPackages , zone ) )
. lines ( toLines ( detail . productItems ) )
. shipTo ( toShipTo ( detail ) )
. exceptionCode ( exceptionOf ( detail . errorCode ) )
. estimatedShippingFee ( moneyOrNull ( detail . estimatedShippingFee , detail . currency ) )
. sourceProvider ( WarehouseProvider . YQN )
. build ( ) ;
}
/** 出库单 → 包裹列表;一单多包裹时逐个返回。 */
public static List < PackageResult > toPackages ( YqnDtos . OrderInfo info ) {
if ( info . packages = = null | | info . packages . isEmpty ( ) ) {
if ( info . trackingNumber = = null ) {
return Collections . emptyList ( ) ;
/ * *
* 发货包裹 → 统一包裹列表 ( API 128 ) 。
*
* < p > { @code shipmentPackages } 里 { @code packageFlag = 1 } 是面单信息行 ,
* 同一个 trackingNo 可能与实际包裹重复出现 ; 按 trackingNo 去重 ,
* 面单行没有 trackingNo 时跳过 , 避免虚增包裹数 。 < / p >
* /
public static List < PackageResult > toPackages ( YqnDtos . OrderDetail detail ) {
if ( detail . shipmentPackages = = null | | detail . shipmentPackages . isEmpty ( ) ) {
return Collections . emptyList ( ) ;
}
// 两遍:先放实际包裹(packageFlag=0),再补面单信息行(packageFlag=1),
// 同一个 trackingNo 只保留一条,且以实际包裹为准
Map < String , PackageResult > byKey = new LinkedHashMap < String , PackageResult > ( ) ;
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : detail . shipmentPackages ) {
if ( isActualPackage ( pkg ) ) {
putPackage ( byKey , pkg , detail . orderNo ) ;
}
return Collections . singletonList ( PackageResult . builder ( )
. packageId ( firstNonBlank ( info . orderNo , info . customerOrderNo ) )
. outboundRequestNo ( firstNonBlank ( info . customerOrderNo , info . orderNo ) )
. trackingNumber ( info . trackingNumber )
. carrier ( info . carrier )
. labelRef ( info . labelUrl )
. build ( ) ) ;
}
List < PackageResult > out = new ArrayList < PackageResult > ( info . packages . size ( ) ) ;
for ( YqnDtos . Package pkg : info . packages ) {
out . add ( PackageResult . builder ( )
. packageId ( firstNonBlank ( pkg . packageNo , info . orderNo ) )
. outboundRequestNo ( firstNonBlank ( info . customerOrderNo , info . orderNo ) )
. trackingNumber ( pkg . trackingNumber )
. carrier ( pkg . carrier )
. labelRef ( pkg . labelUrl )
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : detail . shipmentPackages ) {
if ( ! isActualPackage ( pkg ) ) {
putPackage ( byKey , pkg , detail . orderNo ) ;
}
}
return new ArrayList < PackageResult > ( byKey . values ( ) ) ;
}
private static void putPackage ( Map < String , PackageResult > byKey ,
YqnDtos . OrderDetail . ShipmentPackage pkg , String orderNo ) {
String tracking = pkg . trackingNo = = null ? null : pkg . trackingNo . trim ( ) ;
String key = hasText ( tracking ) ? tracking : "SKU-" + pkg . erpSku ;
if ( byKey . containsKey ( key ) ) {
return ;
}
byKey . put ( key , PackageResult . builder ( )
. packageId ( key )
. outboundRequestNo ( orderNo )
. trackingNumber ( tracking )
. carrier ( pkg . carrier )
. carrierServiceCode ( pkg . carrierServiceCode )
. erpSku ( pkg . erpSku )
. shippedQuantity ( pkg . shipedQuantity )
. shippedAt ( parseTime ( pkg . shipmentDate , DEFAULT_ZONE ) )
. build ( ) ) ;
}
/** 是否实际包裹(packageFlag=0 或缺失)。 */
private static boolean isActualPackage ( YqnDtos . OrderDetail . ShipmentPackage pkg ) {
return pkg . packageFlag = = null | | pkg . packageFlag = = 0 ;
}
/** 实际包裹优先;只用于取顶层承运商与跟踪号。 */
static List < YqnDtos . OrderDetail . ShipmentPackage > shippedPackagesOf ( YqnDtos . OrderDetail detail ) {
if ( detail . shipmentPackages = = null ) {
return Collections . emptyList ( ) ;
}
List < YqnDtos . OrderDetail . ShipmentPackage > actual =
new ArrayList < YqnDtos . OrderDetail . ShipmentPackage > ( ) ;
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : detail . shipmentPackages ) {
if ( isActualPackage ( pkg ) ) {
actual . add ( pkg ) ;
}
}
return actual . isEmpty ( ) ? detail . shipmentPackages : actual ;
}
private static String packagesCarrierOf ( List < YqnDtos . OrderDetail . ShipmentPackage > packages ,
String fallbackCarrierCode ) {
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : packages ) {
if ( hasText ( pkg . carrier ) ) {
return pkg . carrier ;
}
}
return fallbackCarrierCode ;
}
private static String firstTrackingOf ( List < YqnDtos . OrderDetail . ShipmentPackage > packages ) {
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : packages ) {
if ( hasText ( pkg . trackingNo ) ) {
return pkg . trackingNo ;
}
}
return null ;
}
private static Instant firstShipmentTime ( List < YqnDtos . OrderDetail . ShipmentPackage > packages , ZoneId zone ) {
for ( YqnDtos . OrderDetail . ShipmentPackage pkg : packages ) {
Instant time = parseTime ( pkg . shipmentDate , zone ) ;
if ( time ! = null ) {
return time ;
}
}
return null ;
}
private static List < OutboundLine > toLines ( List < YqnDtos . OrderDetail . DetailProductItem > items ) {
if ( items = = null | | items . isEmpty ( ) ) {
return Collections . emptyList ( ) ;
}
List < OutboundLine > lines = new ArrayList < OutboundLine > ( items . size ( ) ) ;
for ( YqnDtos . OrderDetail . DetailProductItem item : items ) {
if ( ! hasText ( item . sku ) ) {
continue ;
}
lines . add ( OutboundLine . builder ( )
. lineNo ( firstNonBlank ( item . lineNo , item . sku ) )
. omsSku ( item . sku )
. providerSku ( item . sku )
. quantity ( item . quantity = = null ? 0 : item . quantity )
. build ( ) ) ;
}
return out ;
return lines ;
}
/** 详情里没有任何地址字段时返回 null,避免把「空地址」当成真实地址回传给业务。 */
private static ShipTo toShipTo ( YqnDtos . OrderDetail detail ) {
if ( ! hasText ( detail . shipToCountry ) & & ! hasText ( detail . shipToAddress1 )
& & ! hasText ( detail . shipToCity ) & & ! hasText ( detail . shipToContact ) ) {
return null ;
}
return ShipTo . builder ( )
. name ( detail . shipToContact )
. phone ( detail . shipToTelephone )
. countryCode ( detail . shipToCountry )
. stateOrProvince ( detail . shipToState )
. city ( detail . shipToCity )
. addressLine1 ( detail . shipToAddress1 )
. addressLine2 ( detail . shipToAddress2 )
. addressLine3 ( detail . shipToAddress3 )
. postalCode ( detail . shipToPostal )
. build ( ) ;
}
/** {@code unexception} 或空视为无异常。 */
private static String exceptionOf ( String errorCode ) {
if ( ! hasText ( errorCode ) | | "unexception" . equalsIgnoreCase ( errorCode . trim ( ) ) ) {
return null ;
}
return errorCode . trim ( ) ;
}
private static Money moneyOrNull ( Double amount , String currency ) {
if ( amount = = null ) {
return null ;
}
return Money . of ( java . math . BigDecimal . valueOf ( amount ) ,
currency = = null | | currency . trim ( ) . isEmpty ( ) ? "USD" : currency . trim ( ) ) ;
}
private static boolean hasText ( String v ) {
return v ! = null & & ! v . trim ( ) . isEmpty ( ) ;
}
/** 运去哪状态 → 统一状态;未知按 {@link OutboundStatus#SUBMITTED}。待打样核对映射表。 */