Browse Source

feat(yqn): 补齐订单详情的附件 / SN / 行金额等字段

订单详情(POST /v1/saleOrder/findOne)仓方一直给了这些字段,模型没接、
mapper 没读。按「仓方有、我们没有就加,并标注来源字段」补齐:

新增通用模型:
- WarehouseAttachment:单据附件(name / type / url / packageNo)。acc
  type 保留仓方原值,不做跨仓归一(装箱单与发货计划归一会混)
- SerialNumber:序列号(snCode / lineNo / providerProductId /
  deliverOrderItemId),售后追溯与召回靠它

OutboundOrder 新增(均标注运去哪来源字段):
- attachments ← enclosure[]
  —— 之前 PackageResult.labelRef 恒为 null 的根因就是这里没映射
- serialNumbers ← orderSnInfo[].snList[]
- signatureRequired ← isSignature(null 表示仓方未给,不是「否」)
- insured ← isInsure
- thirdPartyAccount ← thirdPartyAccount

OutboundLine 新增:
- totalAmount ← skuAmount(行总金额,与请求侧的单价×数量对称)
- insuredAmount ← insureAmount
- platformOrderItemIds ← ordList[].skuOrdList[](按 SKU 关联)
- batchNos ← batchInfo(计划与出库批次按 key=value 去重)

PackageResult 新增:
- cost ← shipmentPackages[].cost

仓储层 WarehouseReturn.Attachment 与新的 WarehouseAttachment 结构重复,
下一轮合并。

新增 YqnOrderDetailExtrasTest(8 个)。全量 477 个测试通过。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 1 week ago
parent
commit
9b6f1bf7c6
  1. 76
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundLine.java
  2. 92
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundOrder.java
  3. 19
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/PackageResult.java
  4. 89
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/SerialNumber.java
  5. 91
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/WarehouseAttachment.java
  6. 110
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java
  7. 163
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOrderDetailExtrasTest.java

76
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundLine.java

@ -2,6 +2,8 @@ package common.ecommerce.warehouse.model;
import common.ecommerce.shared.support.Money; import common.ecommerce.shared.support.Money;
import java.util.List;
import java.util.Objects; import java.util.Objects;
/** /**
@ -21,6 +23,30 @@ public final class OutboundLine {
private final String declareNameEn; private final String declareNameEn;
private final String hsCode; private final String hsCode;
private final String countryOfOrigin; private final String countryOfOrigin;
/**
* 行总金额(单价 × 数量)。
*
* <p>运去哪字段:{@code productItems[].skuAmount}(API 128 findOne)。</p>
*/
private final Money totalAmount;
/**
* 保价金额。
*
* <p>运去哪字段:{@code productItems[].insureAmount}(API 128 findOne)。</p>
*/
private final Money insuredAmount;
/**
* 平台侧订单行号(如亚马逊 Order Item ID)。
*
* <p>运去哪字段:{@code ordList[].skuOrdList[]}(API 128 findOne,按 SKU 聚合)。</p>
*/
private final List<String> platformOrderItemIds;
/**
* 批次号;出库按批次发货时回填。
*
* <p>运去哪字段:{@code productItems[].batchInfo}(API 128 findOne)。</p>
*/
private final List<String> batchNos;
private OutboundLine(Builder b) { private OutboundLine(Builder b) {
this.lineNo = requireText(b.lineNo, "lineNo"); this.lineNo = requireText(b.lineNo, "lineNo");
@ -35,6 +61,12 @@ public final class OutboundLine {
this.declareNameEn = b.declareNameEn; this.declareNameEn = b.declareNameEn;
this.hsCode = b.hsCode; this.hsCode = b.hsCode;
this.countryOfOrigin = b.countryOfOrigin; this.countryOfOrigin = b.countryOfOrigin;
this.totalAmount = b.totalAmount;
this.insuredAmount = b.insuredAmount;
this.platformOrderItemIds = java.util.Collections.unmodifiableList(
new java.util.ArrayList<String>(b.platformOrderItemIds));
this.batchNos = java.util.Collections.unmodifiableList(
new java.util.ArrayList<String>(b.batchNos));
} }
public static Builder builder() { public static Builder builder() {
@ -88,6 +120,26 @@ public final class OutboundLine {
return countryOfOrigin; return countryOfOrigin;
} }
/** 行总金额(单价 × 数量);仓方未给为 null。 */
public Money totalAmount() {
return totalAmount;
}
/** 保价金额;未保价为 null。 */
public Money insuredAmount() {
return insuredAmount;
}
/** 平台侧订单行号;不可变。 */
public List<String> platformOrderItemIds() {
return platformOrderItemIds;
}
/** 批次号;不可变。 */
public List<String> batchNos() {
return batchNos;
}
private static String requireText(String value, String name) { private static String requireText(String value, String name) {
if (value == null || value.trim().isEmpty()) { if (value == null || value.trim().isEmpty()) {
throw new IllegalArgumentException(name + " must not be blank"); throw new IllegalArgumentException(name + " must not be blank");
@ -106,6 +158,10 @@ public final class OutboundLine {
private String declareNameEn; private String declareNameEn;
private String hsCode; private String hsCode;
private String countryOfOrigin; private String countryOfOrigin;
private Money totalAmount;
private Money insuredAmount;
private final List<String> platformOrderItemIds = new java.util.ArrayList<String>();
private final List<String> batchNos = new java.util.ArrayList<String>();
public Builder lineNo(String lineNo) { public Builder lineNo(String lineNo) {
this.lineNo = lineNo; this.lineNo = lineNo;
@ -152,6 +208,26 @@ public final class OutboundLine {
return this; return this;
} }
public Builder totalAmount(Money v) {
this.totalAmount = v;
return this;
}
public Builder insuredAmount(Money v) {
this.insuredAmount = v;
return this;
}
public Builder platformOrderItemId(String v) {
this.platformOrderItemIds.add(v);
return this;
}
public Builder batchNo(String v) {
this.batchNos.add(v);
return this;
}
public OutboundLine build() { public OutboundLine build() {
return new OutboundLine(this); return new OutboundLine(this);
} }

92
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/OutboundOrder.java

@ -57,6 +57,36 @@ public final class OutboundOrder {
private final String carrierCode; private final String carrierCode;
/** 下单币种。 */ /** 下单币种。 */
private final String currency; private final String currency;
/**
* 仓方附件(面单 / 装箱单 / BOL 等)。
*
* <p>运去哪字段:{@code enclosure[]}(API 128 findOne)。</p>
*/
private final List<WarehouseAttachment> attachments;
/**
* 仓方采集的序列号。
*
* <p>运去哪字段:{@code orderSnInfo[].snList[]}(API 128 findOne)。</p>
*/
private final List<SerialNumber> serialNumbers;
/**
* 是否要求签收:null 未知 / true 需要 / false 不需要。
*
* <p>运去哪字段:{@code isSignature}(1 需要,0/缺省不需要)。</p>
*/
private final Boolean signatureRequired;
/**
* 是否保价:null 未知 / true 保价 / false 不保价。
*
* <p>运去哪字段:{@code isInsure}(1 保价,0/缺省不保价)。</p>
*/
private final Boolean insured;
/**
* 第三方支付账号。
*
* <p>运去哪字段:{@code thirdPartyAccount}(API 128 findOne)。</p>
*/
private final String thirdPartyAccount;
private OutboundOrder(Builder b) { private OutboundOrder(Builder b) {
this.warehouseCode = requireText(b.warehouseCode, "warehouseCode"); this.warehouseCode = requireText(b.warehouseCode, "warehouseCode");
@ -79,6 +109,13 @@ public final class OutboundOrder {
this.paidAt = b.paidAt; this.paidAt = b.paidAt;
this.carrierCode = b.carrierCode; this.carrierCode = b.carrierCode;
this.currency = b.currency; this.currency = b.currency;
this.attachments = b.attachments == null ? Collections.<WarehouseAttachment>emptyList()
: Collections.unmodifiableList(new ArrayList<WarehouseAttachment>(b.attachments));
this.serialNumbers = b.serialNumbers == null ? Collections.<SerialNumber>emptyList()
: Collections.unmodifiableList(new ArrayList<SerialNumber>(b.serialNumbers));
this.signatureRequired = b.signatureRequired;
this.insured = b.insured;
this.thirdPartyAccount = b.thirdPartyAccount;
} }
public static Builder builder() { public static Builder builder() {
@ -168,6 +205,31 @@ public final class OutboundOrder {
return currency; return currency;
} }
/** 仓方附件(面单 / 装箱单 / BOL 等);不可变。 */
public List<WarehouseAttachment> attachments() {
return attachments;
}
/** 仓方采集的序列号;不可变。 */
public List<SerialNumber> serialNumbers() {
return serialNumbers;
}
/** 是否要求签收;null 表示仓方未给。 */
public Boolean signatureRequired() {
return signatureRequired;
}
/** 是否保价;null 表示仓方未给。 */
public Boolean insured() {
return insured;
}
/** 第三方支付账号;未给为 null。 */
public String thirdPartyAccount() {
return thirdPartyAccount;
}
/** 是否带仓方异常。 */ /** 是否带仓方异常。 */
public boolean hasException() { public boolean hasException() {
return exceptionCode != null && !exceptionCode.trim().isEmpty(); return exceptionCode != null && !exceptionCode.trim().isEmpty();
@ -201,6 +263,11 @@ public final class OutboundOrder {
private Instant paidAt; private Instant paidAt;
private String carrierCode; private String carrierCode;
private String currency; private String currency;
private List<WarehouseAttachment> attachments = new ArrayList<WarehouseAttachment>();
private List<SerialNumber> serialNumbers = new ArrayList<SerialNumber>();
private Boolean signatureRequired;
private Boolean insured;
private String thirdPartyAccount;
public Builder warehouseCode(String warehouseCode) { public Builder warehouseCode(String warehouseCode) {
this.warehouseCode = warehouseCode; this.warehouseCode = warehouseCode;
@ -292,6 +359,31 @@ public final class OutboundOrder {
return this; return this;
} }
public Builder attachment(WarehouseAttachment v) {
this.attachments.add(v);
return this;
}
public Builder serialNumber(SerialNumber v) {
this.serialNumbers.add(v);
return this;
}
public Builder signatureRequired(Boolean v) {
this.signatureRequired = v;
return this;
}
public Builder insured(Boolean v) {
this.insured = v;
return this;
}
public Builder thirdPartyAccount(String v) {
this.thirdPartyAccount = v;
return this;
}
public Builder currency(String currency) { public Builder currency(String currency) {
this.currency = currency; this.currency = currency;
return this; return this;

19
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/PackageResult.java

@ -27,6 +27,13 @@ public final class PackageResult {
private final String erpSku; private final String erpSku;
/** 该 SKU 的发货数量;未知时为 null。 */ /** 该 SKU 的发货数量;未知时为 null。 */
private final Integer shippedQuantity; private final Integer shippedQuantity;
/**
* 包裹成本(仓方给出的预付/估算)。
*
* <p>运去哪字段:{@code shipmentPackages[].cost}(API 128 findOne)。
* 实际费用以结算账单为准。</p>
*/
private final Money cost;
private PackageResult(Builder b) { private PackageResult(Builder b) {
this.packageId = requireText(b.packageId, "packageId"); this.packageId = requireText(b.packageId, "packageId");
@ -40,6 +47,7 @@ public final class PackageResult {
this.carrierServiceCode = b.carrierServiceCode; this.carrierServiceCode = b.carrierServiceCode;
this.erpSku = b.erpSku; this.erpSku = b.erpSku;
this.shippedQuantity = b.shippedQuantity; this.shippedQuantity = b.shippedQuantity;
this.cost = b.cost;
} }
public static Builder builder() { public static Builder builder() {
@ -96,6 +104,11 @@ public final class PackageResult {
return shippedQuantity; return shippedQuantity;
} }
/** 包裹成本;仓方未给为 null。 */
public Money cost() {
return cost;
}
private static String requireText(String value, String name) { private static String requireText(String value, String name) {
if (value == null || value.trim().isEmpty()) { if (value == null || value.trim().isEmpty()) {
throw new IllegalArgumentException(name + " must not be blank"); throw new IllegalArgumentException(name + " must not be blank");
@ -116,6 +129,7 @@ public final class PackageResult {
private String carrierServiceCode; private String carrierServiceCode;
private String erpSku; private String erpSku;
private Integer shippedQuantity; private Integer shippedQuantity;
private Money cost;
public Builder packageId(String packageId) { public Builder packageId(String packageId) {
this.packageId = packageId; this.packageId = packageId;
@ -167,6 +181,11 @@ public final class PackageResult {
return this; return this;
} }
public Builder cost(Money v) {
this.cost = v;
return this;
}
public Builder shippedQuantity(Integer v) { public Builder shippedQuantity(Integer v) {
this.shippedQuantity = v; this.shippedQuantity = v;
return this; return this;

89
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/SerialNumber.java

@ -0,0 +1,89 @@
package common.ecommerce.warehouse.model;
/**
* 仓方采集的序列号(SN)。
*
* <p>出库 / 入库时仓会按 SKU 扫序列号。售后追溯(这台设备是哪个订单发的、
* 召回范围、质保定责)全靠它,不能丢。</p>
*/
public final class SerialNumber {
private final String providerSku;
/** 序列号本体。 */
private final String snCode;
/** 对应的行号;仓方未给时为 null。 */
private final String lineNo;
/** 仓方产品 id;未给时为 null。 */
private final String providerProductId;
/** 仓侧明细行 id;可用于与单据行对齐。 */
private final Long deliverOrderItemId;
private SerialNumber(Builder b) {
this.providerSku = b.providerSku;
this.snCode = b.snCode;
this.lineNo = b.lineNo;
this.providerProductId = b.providerProductId;
this.deliverOrderItemId = b.deliverOrderItemId;
}
public static Builder builder() {
return new Builder();
}
public String providerSku() {
return providerSku;
}
public String snCode() {
return snCode;
}
public String lineNo() {
return lineNo;
}
public String providerProductId() {
return providerProductId;
}
public Long deliverOrderItemId() {
return deliverOrderItemId;
}
public static final class Builder {
private String providerSku;
private String snCode;
private String lineNo;
private String providerProductId;
private Long deliverOrderItemId;
public Builder providerSku(String v) {
this.providerSku = v;
return this;
}
public Builder snCode(String v) {
this.snCode = v;
return this;
}
public Builder lineNo(String v) {
this.lineNo = v;
return this;
}
public Builder providerProductId(String v) {
this.providerProductId = v;
return this;
}
public Builder deliverOrderItemId(Long v) {
this.deliverOrderItemId = v;
return this;
}
public SerialNumber build() {
return new SerialNumber(this);
}
}
}

91
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/WarehouseAttachment.java

@ -0,0 +1,91 @@
package common.ecommerce.warehouse.model;
/**
* 单据附件(面单 / 装箱单 / BOL / 图片等)。
*
* <p>各仓对附件的分类口径不同,{@link #type()} 保留仓方原值,SDK 不做跨仓归一——
* 归一会把「装箱单」和「发货计划」这类相近但不同的类型混掉。</p>
*
* <p>SDK 不落文件、不访问对象存储:{@link #url()} 原样给出,下载由宿主负责。</p>
*/
public final class WarehouseAttachment {
private final String name;
/** 仓方附件类型原值,如 {@code ShippingLabel} / {@code BOL}。 */
private final String type;
private final String url;
/** 关联包裹号;不区分包裹的仓为 null。 */
private final String packageNo;
private final String remark;
private WarehouseAttachment(Builder b) {
this.name = b.name;
this.type = b.type;
this.url = b.url;
this.packageNo = b.packageNo;
this.remark = b.remark;
}
public static Builder builder() {
return new Builder();
}
public String name() {
return name;
}
/** 仓方附件类型原值。 */
public String type() {
return type;
}
public String url() {
return url;
}
/** 关联包裹号;不区分包裹的仓为 null。 */
public String packageNo() {
return packageNo;
}
public String remark() {
return remark;
}
public static final class Builder {
private String name;
private String type;
private String url;
private String packageNo;
private String remark;
public Builder name(String v) {
this.name = v;
return this;
}
public Builder type(String v) {
this.type = v;
return this;
}
public Builder url(String v) {
this.url = v;
return this;
}
public Builder packageNo(String v) {
this.packageNo = v;
return this;
}
public Builder remark(String v) {
this.remark = v;
return this;
}
public WarehouseAttachment build() {
return new WarehouseAttachment(this);
}
}
}

110
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java

@ -304,14 +304,62 @@ public final class YqnOutboundMapper {
.currency(detail.currency) .currency(detail.currency)
.paidAt(parseTime(detail.paidAt, zone)) .paidAt(parseTime(detail.paidAt, zone))
.shippedAt(firstShipmentTime(shippedPackages, zone)) .shippedAt(firstShipmentTime(shippedPackages, zone))
.lines(toLines(detail.productItems)) .lines(toLines(detail.productItems, detail.ordList, detail.currency))
.signatureRequired(flagOf(detail.isSignature))
.insured(flagOf(detail.isInsure))
.thirdPartyAccount(detail.thirdPartyAccount)
.shipTo(toShipTo(detail)) .shipTo(toShipTo(detail))
.exceptionCode(exceptionOf(detail.errorCode)) .exceptionCode(exceptionOf(detail.errorCode))
.estimatedShippingFee(moneyOrNull(detail.estimatedShippingFee, detail.currency)) .estimatedShippingFee(moneyOrNull(detail.estimatedShippingFee, detail.currency))
.sourceProvider(WarehouseProvider.YQN); .sourceProvider(WarehouseProvider.YQN);
addEnclosures(builder, detail.enclosure);
addSerialNumbers(builder, detail.orderSnInfo);
return builder.build(); return builder.build();
} }
/** 附件:面单 / 装箱单 / BOL 等;{@code packageNo} 仓方不区分包裹时为 null。 */
private static void addEnclosures(OutboundOrder.Builder builder,
List<YqnOrderDetailDtos.OrderDetail.Enclosure> enclosure) {
if (enclosure == null) {
return;
}
for (YqnOrderDetailDtos.OrderDetail.Enclosure e : enclosure) {
builder.attachment(common.ecommerce.warehouse.model.WarehouseAttachment.builder()
.name(e.name)
.type(e.type)
.url(e.url)
.build());
}
}
/** 序列号:每个 SN 一条,带 SKU 与行号便于关联。 */
private static void addSerialNumbers(OutboundOrder.Builder builder,
List<YqnOrderDetailDtos.OrderDetail.SnInfo> snInfos) {
if (snInfos == null) {
return;
}
for (YqnOrderDetailDtos.OrderDetail.SnInfo info : snInfos) {
if (info.snList == null) {
continue;
}
for (YqnOrderDetailDtos.OrderDetail.SnItem sn : info.snList) {
builder.serialNumber(common.ecommerce.warehouse.model.SerialNumber.builder()
.providerSku(hasText(sn.sku) ? sn.sku : info.sku)
.snCode(sn.snCode)
.lineNo(sn.lineNo)
.providerProductId(info.productId)
.deliverOrderItemId(sn.deliverOrderItemId == null ? null
: sn.deliverOrderItemId.longValue())
.build());
}
}
}
/** 0/1 标记 → Boolean;缺省为 null(表示仓方未给,不是「否」)。 */
private static Boolean flagOf(Integer flag) {
return flag == null ? null : flag != 0;
}
/** /**
* 发货包裹 → 统一包裹列表(API 128)。 * 发货包裹 → 统一包裹列表(API 128)。
* *
@ -356,6 +404,7 @@ public final class YqnOutboundMapper {
.erpSku(pkg.erpSku) .erpSku(pkg.erpSku)
.shippedQuantity(pkg.shipedQuantity) .shippedQuantity(pkg.shipedQuantity)
.shippedAt(parseTime(pkg.shipmentDate, DEFAULT_ZONE)) .shippedAt(parseTime(pkg.shipmentDate, DEFAULT_ZONE))
.cost(moneyOrNull(pkg.cost, null))
.build()); .build());
} }
@ -408,25 +457,78 @@ public final class YqnOutboundMapper {
return null; return null;
} }
private static List<OutboundLine> toLines(List<YqnOrderDetailDtos.OrderDetail.DetailProductItem> items) { private static List<OutboundLine> toLines(List<YqnOrderDetailDtos.OrderDetail.DetailProductItem> items,
List<YqnOrderDetailDtos.OrderDetail.OrdItem> ordList,
String currency) {
if (items == null || items.isEmpty()) { if (items == null || items.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();
} }
// 平台行号按 SKU 聚合在 ordList 里,行上只有 sku,所以要按 sku 关联
java.util.Map<String, List<String>> ordBySku = new java.util.HashMap<String, List<String>>();
if (ordList != null) {
for (YqnOrderDetailDtos.OrderDetail.OrdItem ord : ordList) {
if (hasText(ord.sku) && ord.skuOrdList != null) {
ordBySku.put(ord.sku.trim(), ord.skuOrdList);
}
}
}
List<OutboundLine> lines = new ArrayList<OutboundLine>(items.size()); List<OutboundLine> lines = new ArrayList<OutboundLine>(items.size());
for (YqnOrderDetailDtos.OrderDetail.DetailProductItem item : items) { for (YqnOrderDetailDtos.OrderDetail.DetailProductItem item : items) {
if (!hasText(item.sku)) { if (!hasText(item.sku)) {
continue; continue;
} }
lines.add(OutboundLine.builder() String sku = item.sku.trim();
OutboundLine.Builder line = OutboundLine.builder()
.lineNo(firstNonBlank(item.lineNo, item.sku)) .lineNo(firstNonBlank(item.lineNo, item.sku))
.omsSku(item.sku) .omsSku(item.sku)
.providerSku(item.sku) .providerSku(item.sku)
.quantity(item.quantity == null ? 0 : item.quantity) .quantity(item.quantity == null ? 0 : item.quantity)
.build()); .totalAmount(moneyOrNull(item.skuAmount, currency))
.insuredAmount(moneyOrNull(item.insureAmount, currency));
List<String> ords = ordBySku.get(sku);
if (ords != null) {
for (String ord : ords) {
line.platformOrderItemId(ord);
}
}
collectBatchNos(line, item.batchInfo);
lines.add(line.build());
} }
return lines; return lines;
} }
/** 批次号:计划批次与出库批次都收,去重后挂到行上。 */
private static void collectBatchNos(OutboundLine.Builder line,
YqnOrderDetailDtos.OrderDetail.BatchInfo batchInfo) {
if (batchInfo == null) {
return;
}
java.util.LinkedHashSet<String> seen = new java.util.LinkedHashSet<String>();
addBatchNos(seen, batchInfo.planBatchItems);
addBatchNos(seen, batchInfo.outboundBatchItems);
for (String no : seen) {
line.batchNo(no);
}
}
private static void addBatchNos(java.util.Set<String> out,
List<YqnOrderDetailDtos.OrderDetail.BatchItem> items) {
if (items == null) {
return;
}
for (YqnOrderDetailDtos.OrderDetail.BatchItem item : items) {
if (item.batchParam != null) {
for (YqnOrderDetailDtos.OrderDetail.BatchParam p : item.batchParam) {
// 批次号在 key/value 里,取值非空的拼进去;运去哪用 LotCode / ProductionDateNumber
if (hasText(p.batchAttriKey) && hasText(p.batchAttriValue)) {
out.add(p.batchAttriKey + "=" + p.batchAttriValue);
}
}
}
}
}
/** 详情里没有任何地址字段时返回 null,避免把「空地址」当成真实地址回传给业务。 */ /** 详情里没有任何地址字段时返回 null,避免把「空地址」当成真实地址回传给业务。 */
private static ShipTo toShipTo(YqnOrderDetailDtos.OrderDetail detail) { private static ShipTo toShipTo(YqnOrderDetailDtos.OrderDetail detail) {
if (!hasText(detail.shipToCountry) && !hasText(detail.shipToAddress1) if (!hasText(detail.shipToCountry) && !hasText(detail.shipToAddress1)

163
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnOrderDetailExtrasTest.java

@ -0,0 +1,163 @@
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.WarehouseProvider;
import common.ecommerce.warehouse.model.OutboundLine;
import common.ecommerce.warehouse.model.OutboundOrder;
import common.ecommerce.warehouse.model.PackageResult;
import common.ecommerce.warehouse.model.SerialNumber;
import common.ecommerce.warehouse.model.WarehouseAttachment;
import common.ecommerce.warehouse.sdk.WarehouseConnection;
import common.ecommerce.warehouse.sdk.WarehouseContext;
import common.ecommerce.yqn.YqnConstants;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
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.assertTrue;
/**
* 订单详情(API 128)的扩展字段:附件 / SN / 行金额 / 平台行号 / 包裹成本。
*
* <p>这些字段仓方一直有,只是之前模型没接、mapper 没读。</p>
*/
class YqnOrderDetailExtrasTest {
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-11T00:00:00Z"), ZoneOffset.UTC);
private static WarehouseContext ctx() {
return WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, "RF_NY_US",
WarehouseConnection.of(YqnConstants.PR_BASE_URL,
ChannelSecret.builder().appSecret("key-1").build()),
"req-detail", CLOCK);
}
private static final String BODY =
"{\"code\":200,\"message\":\"ok\",\"data\":{"
+ "\"orderNo\":\"OB-1\",\"orderStatusEnum\":\"shipped\",\"currency\":\"USD\","
+ "\"isSignature\":1,\"isInsure\":0,"
+ "\"thirdPartyAccount\":\"TP-ACCT\","
+ "\"productItems\":["
+ "{\"sku\":\"DM00001\",\"quantity\":2,\"lineNo\":\"1\","
+ "\"skuAmount\":20.00,\"insureAmount\":5.00,"
+ "\"batchInfo\":{"
+ "\"planBatchItems\":[{\"qty\":2,\"batchParam\":["
+ "{\"batchAttriKey\":\"LotCode\",\"batchAttriValue\":\"L001\"}]}],"
+ "\"outboundBatchItems\":[{\"qty\":2,\"batchParam\":["
+ "{\"batchAttriKey\":\"LotCode\",\"batchAttriValue\":\"L001\"}]}]}}],"
+ "\"ordList\":[{\"sku\":\"DM00001\","
+ "\"skuOrdList\":[\"ORD-1\",\"ORD-2\"]}],"
+ "\"enclosure\":["
+ "{\"type\":\"ShippingLabel\",\"name\":\"面单\","
+ "\"url\":\"https://files/label.pdf\"},"
+ "{\"type\":\"BOL\",\"name\":\"提单\",\"url\":\"https://files/bol.pdf\"}],"
+ "\"orderSnInfo\":[{\"sku\":\"DM00001\",\"productId\":\"P1\",\"snList\":["
+ "{\"sku\":\"DM00001\",\"snCode\":\"SN0001\",\"lineNo\":\"1\","
+ "\"productId\":1,\"deliverOrderItemId\":1001}]}],"
+ "\"shipmentPackages\":[{\"trackingNo\":\"TRK1\",\"carrier\":\"FEDEX\","
+ "\"cost\":8.5,\"packageFlag\":0}]}}";
private static OutboundOrder query() {
RecordingTransport transport = RecordingTransport.create()
.route(YqnConstants.PATH_ORDER_FIND_ONE, req -> Responses.ok(BODY));
return new YqnAdapter(transport, new JacksonJsonCodec())
.get(ctx(), common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("OB-1"));
}
@Test
void mapsAttachments() {
List<WarehouseAttachment> attachments = query().attachments();
assertEquals(2, attachments.size());
assertEquals("面单", attachments.get(0).name());
assertEquals("ShippingLabel", attachments.get(0).type());
assertEquals("https://files/label.pdf", attachments.get(0).url());
assertEquals("BOL", attachments.get(1).type());
}
@Test
void mapsSerialNumbers() {
List<SerialNumber> sns = query().serialNumbers();
assertEquals(1, sns.size());
SerialNumber sn = sns.get(0);
assertEquals("DM00001", sn.providerSku());
assertEquals("SN0001", sn.snCode());
assertEquals("1", sn.lineNo());
assertEquals("P1", sn.providerProductId());
assertEquals(Long.valueOf(1001L), sn.deliverOrderItemId());
}
@Test
void mapsLineAmounts() {
OutboundLine line = query().lines().get(0);
assertEquals(new BigDecimal("20.0"), line.totalAmount().amount());
assertEquals(new BigDecimal("5.0"), line.insuredAmount().amount());
}
@Test
void mapsPlatformOrderItemIds() {
OutboundLine line = query().lines().get(0);
assertEquals(2, line.platformOrderItemIds().size());
assertEquals("ORD-1", line.platformOrderItemIds().get(0));
assertEquals("ORD-2", line.platformOrderItemIds().get(1));
}
/** 计划批次与出库批次同一个批次号只保留一条。 */
@Test
void mapsBatchNosWithoutDuplicates() {
OutboundLine line = query().lines().get(0);
assertEquals(1, line.batchNos().size());
assertEquals("LotCode=L001", line.batchNos().get(0));
}
@Test
void mapsSignatureAndInsureFlags() {
OutboundOrder order = query();
assertEquals(Boolean.TRUE, order.signatureRequired());
assertEquals(Boolean.FALSE, order.insured());
assertEquals("TP-ACCT", order.thirdPartyAccount());
}
/** 缺省时是 null,不是 false——不能把「仓方没给」当成「不需要签收」。 */
@Test
void missingFlagsStayNull() {
String minimal = "{\"code\":200,\"data\":{\"orderNo\":\"OB-2\","
+ "\"orderStatusEnum\":\"shipped\",\"currency\":\"USD\"}}";
RecordingTransport transport = RecordingTransport.create()
.route(YqnConstants.PATH_ORDER_FIND_ONE, req -> Responses.ok(minimal));
OutboundOrder order = new YqnAdapter(transport, new JacksonJsonCodec())
.get(ctx(), common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("OB-2"));
assertNull(order.signatureRequired());
assertNull(order.insured());
assertTrue(order.attachments().isEmpty());
assertTrue(order.serialNumbers().isEmpty());
}
@Test
void mapsPackageCost() {
List<PackageResult> packages;
RecordingTransport transport = RecordingTransport.create()
.route(YqnConstants.PATH_ORDER_FIND_ONE, req -> Responses.ok(BODY));
packages = new YqnAdapter(transport, new JacksonJsonCodec())
.packages(ctx(), common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("OB-1"));
assertEquals(1, packages.size());
assertEquals(new BigDecimal("8.5"), packages.get(0).cost().amount());
}
}
Loading…
Cancel
Save