You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

112 lines
6.2 KiB

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))
feat(warehouse): 详情类模型补齐仓方原始字段,并消除一处歧义映射 调用方查完详情只能拿到归一化后的少数几个字段,仓方返回的其余信息(面单链接、 计费重、柜号、托盘数、时间节点等)全被丢弃,只能自己去翻原始报文。 新增字段(全部只增,未改动任何已有字段名与构造签名): - OutboundOrder:补齐 44 个信仓订单详情字段里的剩余 23 个 含 labelUrl(face_url,面单下载地址)、shopName、skuCount、 zone、dimLength/Width/Height、dimDivisor、weightLbs、billingWeightLbs、 volumeWeightLbs、totalAmount、repairAmount、approvedAt/modifiedAt/ cancelledAt/interceptedAt、providerId、rawStatusName 等 - TransferOrder:补齐 39 个字段 + 新增 TransferLine 明细模型 含 po、deliveryMode/deliveryWay/orderType、labelRequirement、各类贴标标记、 picking/picked/palletized/send/approve 时间节点、shippingId、totalAmount - InboundOrder:补齐 28 个字段 含 cabinetType/cabinetNo、shipmentType、deliveryRequirements、 四类托盘数、unlade/check/putaway/leave 时间节点、内外箱贴标记 - InboundOrderLine:补 productName/productNameCn/checkedBoxCount/ palletizedQuantity/packingRate/volumeCm 字段注释统一写明「对应哪家仓的哪个原字段」与中文含义; 模型本身不绑定单一仓,其余仓不填即为 null。 消除歧义: 信仓 forecast_detail 的 box_count 是「预报箱数」,而统一模型 packedQuantity 的语义是「装箱时实际装进去的件数」,此前直接映射属语义错位。改为不映射到 packedQuantity,只保留在 checkedBoxCount 与仓方原字段中。 Co-Authored-By: Claude Code <noreply@anthropic.com>
1 week ago
// ---- 仓方原始字段 ----
.providerId(XincangOrderDetailMapper.blankToNull(detail.id))
.po(XincangOrderDetailMapper.blankToNull(detail.po))
.customerId(XincangOrderDetailMapper.blankToNull(detail.customerId))
.customerNo(XincangOrderDetailMapper.blankToNull(detail.customerNo))
.fromWarehouseId(XincangOrderDetailMapper.blankToNull(detail.fromWarehouseId))
.destWarehouseId(XincangOrderDetailMapper.blankToNull(detail.destWarehouseId))
.rawStatusName(XincangOrderDetailMapper.blankToNull(detail.stateName))
.deliveryMode(XincangOrderDetailMapper.blankToNull(detail.deliveryMode))
.deliveryWay(XincangOrderDetailMapper.blankToNull(detail.deliveryWay))
.orderType(XincangOrderDetailMapper.blankToNull(detail.orderType))
.otherWarehouse(XincangOrderDetailMapper.blankToNull(detail.otherWarehouse))
.labelRequirement(XincangOrderDetailMapper.blankToNull(detail.labelRequirement))
.isProductLabel(XincangOrderDetailMapper.blankToNull(detail.isProductLabel))
.isCtnLabel(XincangOrderDetailMapper.blankToNull(detail.isCtnLabel))
.isPalletLabel(XincangOrderDetailMapper.blankToNull(detail.isPalletLabel))
.isPallet(XincangOrderDetailMapper.blankToNull(detail.isPallet))
.pickingStartedAt(XincangOrderDetailMapper.parseTime(detail.pickingTime))
.pickedAt(XincangOrderDetailMapper.parseTime(detail.pickedTime))
.palletizedAt(XincangOrderDetailMapper.parseTime(detail.palletedTime))
.sentAt(XincangOrderDetailMapper.parseTime(detail.sendTime))
.approvedAt(XincangOrderDetailMapper.parseTime(detail.approveTime))
.shippingId(XincangOrderDetailMapper.blankToNull(detail.shippingId))
.totalAmount(XincangOrderDetailMapper.parseMoney(detail.totalAmount))
.createdAt(XincangOrderDetailMapper.parseTime(detail.gmtCreate))
.modifiedAt(XincangOrderDetailMapper.parseTime(detail.gmtModify))
.lines(toLines(detail))
.build();
}
feat(warehouse): 详情类模型补齐仓方原始字段,并消除一处歧义映射 调用方查完详情只能拿到归一化后的少数几个字段,仓方返回的其余信息(面单链接、 计费重、柜号、托盘数、时间节点等)全被丢弃,只能自己去翻原始报文。 新增字段(全部只增,未改动任何已有字段名与构造签名): - OutboundOrder:补齐 44 个信仓订单详情字段里的剩余 23 个 含 labelUrl(face_url,面单下载地址)、shopName、skuCount、 zone、dimLength/Width/Height、dimDivisor、weightLbs、billingWeightLbs、 volumeWeightLbs、totalAmount、repairAmount、approvedAt/modifiedAt/ cancelledAt/interceptedAt、providerId、rawStatusName 等 - TransferOrder:补齐 39 个字段 + 新增 TransferLine 明细模型 含 po、deliveryMode/deliveryWay/orderType、labelRequirement、各类贴标标记、 picking/picked/palletized/send/approve 时间节点、shippingId、totalAmount - InboundOrder:补齐 28 个字段 含 cabinetType/cabinetNo、shipmentType、deliveryRequirements、 四类托盘数、unlade/check/putaway/leave 时间节点、内外箱贴标记 - InboundOrderLine:补 productName/productNameCn/checkedBoxCount/ palletizedQuantity/packingRate/volumeCm 字段注释统一写明「对应哪家仓的哪个原字段」与中文含义; 模型本身不绑定单一仓,其余仓不填即为 null。 消除歧义: 信仓 forecast_detail 的 box_count 是「预报箱数」,而统一模型 packedQuantity 的语义是「装箱时实际装进去的件数」,此前直接映射属语义错位。改为不映射到 packedQuantity,只保留在 checkedBoxCount 与仓方原字段中。 Co-Authored-By: Claude Code <noreply@anthropic.com>
1 week ago
/** 转运明细行 → 统一模型。 */
static java.util.List<TransferOrder.TransferLine> toLines(XincangDtos.TransferDetail detail) {
if (detail.products == null || detail.products.isEmpty()) {
return java.util.Collections.emptyList();
}
java.util.List<TransferOrder.TransferLine> out =
new java.util.ArrayList<TransferOrder.TransferLine>(detail.products.size());
for (XincangDtos.TransferDetailProduct product : detail.products) {
if (product == null || XincangOrderDetailMapper.blank(product.productNo)) {
continue;
}
out.add(TransferOrder.TransferLine.builder()
.providerSku(product.productNo.trim())
.productName(XincangOrderDetailMapper.blankToNull(product.productName))
.productNameCn(XincangOrderDetailMapper.blankToNull(product.chnName))
.plannedQuantity(XincangOrderDetailMapper.parsePositiveInt(product.skuCount))
.boxCount(XincangOrderDetailMapper.parsePositiveInt(product.boxCount))
.checkedBoxCount(XincangOrderDetailMapper.parsePositiveInt(product.checkBoxQty))
.palletizedQuantity(XincangOrderDetailMapper.parsePositiveInt(product.palletSkuCount))
.storedQuantity(XincangOrderDetailMapper.parsePositiveInt(product.putOnSkuCount))
.packingRate(XincangOrderDetailMapper.blankToNull(product.packingRate))
.remark(XincangOrderDetailMapper.blankToNull(product.remark))
.build());
}
return out;
}
/** 明细件数合计;明细缺失时返回 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;
}
}